Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java =================================================================== diff -u -r16703 -r16711 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 16703) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 16711) @@ -328,7 +328,11 @@ try { //生物监测结束时间 biologicalMonitoringEndDate = new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(biologicalMonitoringEndDateString); - if (biologicalMonitoringEndDate.after(new Date())) { //进行中 + if (biologicalMonitoringEndDate.after(new Date()) + && StringUtils.isNotBlank(monitorChecker) + && !SterilizationRecord.MONITOR_RESULT_NO.equals(biologyResult)) { //进行中,并且有核对员,并且生物监测结果不为“无”,这时就把状态设置为“已确认” + record.setBiologicalMonitoringStatus(SterilizationRecord.BIOLOGICALMONITORING_STATUS_CHECK); + } else if (biologicalMonitoringEndDate.after(new Date())) { //进行中 record.setBiologicalMonitoringStatus(SterilizationRecord.BIOLOGICALMONITORING_STATUS_BEGIN); } else if (biologicalMonitoringEndDate.before(new Date()) && StringUtils.isNotBlank(monitorChecker)