Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r32667 -r32752
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 32667)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 32752)
@@ -2878,6 +2878,16 @@
                             .equals(sr.getStatus())) {
                 continue;
             }
+            if(sr.getSterilizer() != null){
+            	String sql = String
+                        .format(" select count(*) from %s where STERILIZER_ID=%s and STATUS='%s' ",
+                                SterilizationRecord.class.getSimpleName(),
+                                sr.getSterilizer().getId(),
+                                SterilizationRecord.STERILIZATION_STATUS_BEGIN);
+            	if(objectDao.countBySql(sql) > 0){
+            		throw new RuntimeException(sr.getSterilizer().getName() + "正在灭菌中，不能继续灭菌");
+            	}
+            }
             // 找到相关的中断信息 记录继续灭菌时间
             updateInterruptRecordFinishType(id,SterilizationInterruptRecord.ITERRUPT_FINISH_CONTIUNE);
             sr.setStatus(SterilizationRecord.STERILIZATION_STATUS_BEGIN);
@@ -3426,10 +3436,12 @@
     @Override
     public boolean isAllSterilizationEnd(String sterilizerName) {
         if (StringUtils.isNotBlank(sterilizerName)) {
+        	boolean enableTheSterilizationResultJudgmentFunction = CssdUtils.getSystemSetConfigByNameBool("enableTheSterilizationResultJudgmentFunction", false);
             String sql = String
                     .format("where po.sterilizer.name = '%s'"
-                            + " and (po.status = '%s' or po.status = '%s')", sterilizerName,
-                            SterilizationRecord.STERILIZATION_STATUS_BEGIN,SterilizationRecord.STERILIZATION_STATUS_INTERRUPT);
+                            + " and (po.status = '%s')", sterilizerName,
+                            SterilizationRecord.STERILIZATION_STATUS_BEGIN
+                            ,enableTheSterilizationResultJudgmentFunction?"":" or po.status = '"+ SterilizationRecord.STERILIZATION_STATUS_INTERRUPT +"' ");
             List<SterilizationRecord> list = objectDao.findBySql(
                     SterilizationRecord.class.getSimpleName(), sql);
             if (list != null && list.size() > 0) {