diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java
index 688f565e..bd087326 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java
@@ -67,7 +67,13 @@ public class StudyExamServiceImpl implements IStudyExamService{
 
 		//用于计算考试成绩
 		CourseExam cexam=cexamDao.get(exam.getTestId());
-		int prog=exam.getScore().intValue()>=exam.getPassLine()?100:exam.getScore().intValue();
+		Integer passLine = 0;
+		if( exam.getPassLine() !=null){
+			passLine = exam.getPassLine();
+		}
+
+		int prog=exam.getScore().intValue()>= passLine?100:exam.getScore().intValue();
+//		int prog=exam.getScore().intValue()>=exam.getPassLine()?100:exam.getScore().intValue();
 		//完成处理，判断是否已存在
 		Object obj=scItemDao.findField("id", FieldFilters.eq("studyId", exam.getStudyId()), FieldFilters.eq("contentId", exam.getContentId()));
 		int status=exam.getScore()>=exam.getPassLine()?StudyCourseItem.STATUS_FINISH:StudyCourseItem.STATUS_STUDYING;