Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r16420 -r16423 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 16420) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 16423) @@ -2646,6 +2646,7 @@ var biologicalMonitoringEndDateString = Ext.util.Format.date(biologicalMonitoringEndDate, 'Y-m-d H:i'); var monitorUser = top.Ext.getCmp('monitorUser').getValue(); var monitorChecker = top.Ext.getCmp('monitorChecker').getValue(); + var endDate = top.Ext.getCmp('endDate').getValue(); if (sstsConfig.monitorCheckerMustFill) { //保存时,监测核对员也要填写 if (biologyResult != '无' && (!biologicalMonitoringStartDateString || !biologicalMonitoringEndDateString || !monitorUser || !monitorChecker)) { @@ -2659,7 +2660,12 @@ } } - if (biologicalMonitoringStartDateString && biologicalMonitoringEndDateString) { + if (biologicalMonitoringStartDateString) { + if (biologicalMonitoringStartDate < endDate) { + showResult('生物监测开始时间不能小于灭菌结束时间!'); + return false; + } + } else if (biologicalMonitoringStartDateString && biologicalMonitoringEndDateString) { if (biologicalMonitoringStartDate > biologicalMonitoringEndDate) { showResult('生物监测开始时间不能大于结束时间!'); return false; @@ -2668,6 +2674,8 @@ + + // 验证循环计数器是否已经存在,一个灭菌炉的一个循环次数应是唯一的。 { DWREngine.setAsync(false);