Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
===================================================================
diff -u -r32621 -r32648
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js	(.../sterilizationRecordView.js)	(revision 32621)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js	(.../sterilizationRecordView.js)	(revision 32648)
@@ -905,7 +905,7 @@
 		return false;
 	}
 	var data = records[0].data;
-	addAndEditSterilizationRecord(data['id'], data['status'], b, data['includeImplant']);
+	addAndEditSterilizationRecord(data['id'], data['status'], b, data['includeImplant'], data['sterilizationResult']);
 };
 
 function callModifyFunction(b) {
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r32620 -r32648
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 32620)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 32648)
@@ -2601,7 +2601,7 @@
  * @param reSterilization   是否为重新灭菌
  * @param includeImplant    是否植入物
  */
-function addAndEditSterilizationRecord(id, currentStatus, reSterilization, includeImplant) {
+function addAndEditSterilizationRecord(id, currentStatus, reSterilization, includeImplant, sterilizationResult) {
     //将存放条码的数组初始化
     myBarcodes = [];
     myFixedBarcodes = [];
@@ -4660,7 +4660,9 @@
             id: 'monitorBtn',
             text: '保存',
             hidden: true,
-            handler: saveMonitor
+            handler: function(){
+                saveMonitorHandle(sterilizationResult);
+            }
         }, {
             id: 'save2',
             text: '暂存',
@@ -4877,6 +4879,38 @@
                     top.Ext.getCmp('inputBarcode').setDisabled(true);
                     disableItems();
                 }
+            } else if ((sr.status == statusEnd) && sstsConfig.enableTheSterilizationResultJudgmentFunction) {
+                if(!reSterilization){
+                    if (sr.sterilizer.allowSelectBiologicalResult == "否") {
+                        top.Ext.getCmp('biologyResult').disable();
+                    }
+                    _biologicalMonitoringTime = sr.sterilizer.biologicalMonitoringTime * 60 * 1000;  //此灭菌炉的生物监测持续时间
+                    top.Ext.getCmp('biologicalObserveDate').setValue(formatDateYear(sr.biologicalObserveDate));  //生物监测的观察时间
+                    top.Ext.getCmp('biologicalMonitoringStartDate').setValue(formatDateYear(sr.biologicalMonitoringStartDate));  //生物监测的开始时间
+                    top.Ext.getCmp('biologicalMonitoringEndDate').setValue(formatDateYear(sr.biologicalMonitoringEndDate));  //生物监测的结束时间
+
+                    top.Ext.getCmp('monitorBtn').show();
+                    top.Ext.getCmp('saveBtn').hide();
+                    disableItems();
+                    if(sterilizationResult == '不合格'){
+                        top.Ext.getCmp('physicsResult').setValue(sr.physicsResult ? sr.physicsResult : "无");
+                        top.Ext.getCmp('chemistryResult').setValue(sr.chemistryResult ? sr.chemistryResult : "无");
+                        top.Ext.getCmp('biologyResult').setValue(sr.biologyResult ? sr.biologyResult : "无");
+                        top.Ext.getCmp('physicsResult').disable();
+                        top.Ext.getCmp('chemistryResult').disable();
+                        top.Ext.getCmp('biologyResult').disable();
+
+                        top.Ext.getCmp('biologicalObserveDate').disable();
+                        top.Ext.getCmp('biologicalMonitoringStartDate').disable();
+                        top.Ext.getCmp('biologicalMonitoringEndDate').disable();
+                        top.Ext.getCmp('monitorCheckerBarcode').disable();
+                        top.Ext.getCmp('monitorChecker').disable();
+                        top.Ext.getCmp('monitorUserBarcode').disable();
+                        top.Ext.getCmp('monitorUser').disable();
+                        top.Ext.getCmp('monitorAuditorBarcode').disable();
+                        top.Ext.getCmp('monitorAuditor').disable();
+                    }
+                }
             } else {  //灭菌完成
                 //是否允许手动选择生物监测结果”选择为选否时，生物监测结果不允许手动选择，只能从生物阅读器接口获取结果写入。 
                 if (sr.sterilizer.allowSelectBiologicalResult == "否") {
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationMonitoring.js
===================================================================
diff -u -r32561 -r32648
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationMonitoring.js	(.../sterilizationMonitoring.js)	(revision 32561)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationMonitoring.js	(.../sterilizationMonitoring.js)	(revision 32648)
@@ -119,16 +119,36 @@
 				}
 			}
 		}else{
-			showResult("保存失败！");
+			showResult(result.Msg);
 		}
 	});
 }
+//监测结果合格改为不合格后提示
+function saveMonitorHandle(sterilizatioResult){
+	if(sstsConfig.enableTheSterilizationResultJudgmentFunction){
+		var physicsResult = top.Ext.getCmp('physicsResult').getValue();
+		var chemistryResult = top.Ext.getCmp('chemistryResult').getValue();
+		var biologyResult = top.Ext.getCmp('biologyResult').getValue();
+		if((physicsResult == '不合格' || chemistryResult == '不合格' || biologyResult == '不合格') && sterilizatioResult == '合格'){
+			top.Ext.Msg.confirm("确认", "监测结果为“不合格”后就不能再改为“合格”，是否确认？", function (btn) {
+				if (btn == 'yes') {
+					saveMonitor();
+				}
+			})
+		}else {
+			saveMonitor();
+		}
+	}else {
+		saveMonitor();
+	}
+}
+//保存
 function saveMonitor(){
 	if(sstsConfig.enableScanSterilizationMonitoringPackage){
 		var monitorPackageBarcode = top.Ext.getCmp('monitorPackageBarcode').getValue();
-        var chemistryPackageBarcode = top.Ext.getCmp('chemistryPackageBarcode').getValue();
-        var sterilizerName = top.Ext.getCmp('sterilizerName').getValue();
-        if(sstsConfig.enableSterilizerBioMonitoringIntervalReminder){
+		var chemistryPackageBarcode = top.Ext.getCmp('chemistryPackageBarcode').getValue();
+		var sterilizerName = top.Ext.getCmp('sterilizerName').getValue();
+		if(sstsConfig.enableSterilizerBioMonitoringIntervalReminder){
 			var params = {
 				sterilizerName:sterilizerName,
 				isSave:true,
@@ -140,7 +160,7 @@
 		}else {
 			saveMonitorData();
 		}
-    }else {
-        saveMonitorData();
-    }
+	}else {
+		saveMonitorData();
+	}
 }
\ No newline at end of file