Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r17005 -r17021
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 17005)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 17021)
@@ -1495,8 +1495,9 @@
 				// 如果是灭菌中断  找到相关的中断信息 记录继续灭菌时间和中断后操作类型
 				updateInterruptRecordFinishType(id,SterilizationInterruptRecord.ITERRUPT_FINISH_FAILEURE);
 			}
-			sterilizationRecord
-					.setStatus(SterilizationRecord.STERILIZATION_STATUS_FAILURE);
+			sterilizationRecord.setStatus(SterilizationRecord.STERILIZATION_STATUS_FAILURE);  //把状态设为“灭菌失败”
+			sterilizationRecord.setPhysicsResult(SterilizationRecord.MONITOR_RESULT_UNQUALIFIED);  //把物理监测结果设为“不合格”
+			sterilizationRecord.setChemistryResult(SterilizationRecord.MONITOR_RESULT_UNQUALIFIED);  //把化学监测结果设为“不合格”
 			// 如果灭菌目的为每天例行监测并且是第一炉时
 			if (SterilizationRecord.STERILIZATIONPURPOSE_TYPE
 					.equals(sterilizationRecord.getSterilizationPurpose())
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r16939 -r17021
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 16939)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 17021)
@@ -2970,62 +2970,50 @@
 		method : 'GET',
 		waitMsg : '正在加载数据，请稍候',
 		success : function(form, action) {
-			if(id == 0) {
+			var sr = action.result.data;  //此灭菌记录对象
+			
+			if(!id) {  //新加的记录
 				setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'startDate');  //（设置开始时间，取服务器时间cjr）
+				if(scanUser == true){
+					top.Ext.getCmp('sterilizationUser').setValue('');
+				}
 			} else {
-				top.Ext.getCmp('startDate').setValue(formatDateYear(action.result.data.startDate));
-				top.Ext.getCmp('endDate').setValue(formatDateYear(action.result.data.endDate));
-				top.Ext.getCmp('srSituationComfirmer').setValue(action.result.data.srSituationComfirmer);
+				top.Ext.getCmp('startDate').setValue(formatDateYear(sr.startDate));
+				top.Ext.getCmp('endDate').setValue(formatDateYear(sr.endDate));
+				top.Ext.getCmp('srSituationComfirmer').setValue(sr.srSituationComfirmer);
+				
+				top.Ext.getCmp('typeTotalAmount').setText("篮筐:"+sr.reviewedBasketAmount+" ,器械包:"+sr.tousseAmount+" ,敷料包:"+sr.dressingTousseAmount+" ,外来器械包:"+sr.foreignTousseAmount+", 代理灭菌包:"+sr.proxyTousseAmount);
 			}
-			var frequency = action.result.data.frequency;
-			if(reSterilization){
-				 SterilizationRecordTableManager.getMaxFrequency(action.result.data.sterilizerName,0,function(result){
+			
+			if(reSterilization){  //重新灭菌
+				 SterilizationRecordTableManager.getMaxFrequency(sr.sterilizerName,0,function(result){
 					 top.Ext.getCmp('frequency').setValue(result);
 				 });
-				 SterilizationRecordTableManager.getNextCycleCounter(action.result.data.sterilizerName,0,function(result){
-					 if(result == 0)
-					 {
-						 top.Ext.getCmp('cycleCounter').setValue(1);
-					 }else
-					 {
-						 top.Ext.getCmp('cycleCounter').setValue(result);
-					 }
+				 SterilizationRecordTableManager.getNextCycleCounter(sr.sterilizerName,0,function(result){
+					 top.Ext.getCmp('cycleCounter').setValue(result == 0 ? 1 : result);
 				 });
 			}
-			SterilizationRecordTableManager.isDefineDeviceInterface(action.result.data.sterilizerName,function(result){
-				 if(result == true)
-				 {
-					 top.Ext.getCmp('cycleCounterId').show();
-				 }else
-				 {
-					 top.Ext.getCmp('cycleCounterId').hide();
-				 }
-			 });
 			
-			if(frequency == 1){//每天第一炉
+			SterilizationRecordTableManager.isDefineDeviceInterface(sr.sterilizerName,function(result){
+				result == true ? top.Ext.getCmp('cycleCounterId').show() :
+					top.Ext.getCmp('cycleCounterId').hide();
+			});
+			
+			if(sr.frequency == 1){//每天第一炉
 				top.Ext.getCmp('sterilizationPurpose').disable();
 			}
+			
 			//加载灭菌参数
-			SterilizationRecordTableManager.getParameter(action.result.data.sterilizationType,function(result){
+			SterilizationRecordTableManager.getParameter(sr.sterilizationType,function(result){
 				if(result != null && result.length > 0){
 					top.Ext.getCmp('parameter').setValue(result);
 				}
 			});
 			
-			if(id != null && id > 0){
-				var t_amount = action.result.data.tousseAmount;
-				var f_amount = action.result.data.foreignTousseAmount;
-				var d_amount = action.result.data.dressingTousseAmount;
-				var p_amount = action.result.data.proxyTousseAmount;
-				var r_amount = action.result.data.reviewedBasketAmount;
-				
-				top.Ext.getCmp('typeTotalAmount').setText("篮筐:"+r_amount+" ,器械包:"+t_amount+" ,敷料包:"+d_amount+" ,外来器械包:"+f_amount+", 代理灭菌包:"+p_amount);
-			}
-			
-			if(action.result.data.status != statusEnd){  //这里有四种情况：灭菌中、灭菌中断、灭菌失败，新加的记录
-				top.Ext.getCmp('physicsResult').setValue("无");
-				top.Ext.getCmp('chemistryResult').setValue("无");
-				top.Ext.getCmp('biologyResult').setValue("无");
+			if(sr.status != statusEnd){  //这里有四种情况：新加的记录、灭菌中、灭菌中断、灭菌失败
+				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();
@@ -3039,37 +3027,29 @@
 				top.Ext.getCmp('monitorAuditorBarcode').disable();
 				top.Ext.getCmp('monitorAuditor').disable();
 				
-				if(action.result.data.status == statusFailure && reSterilization == false){
+				if(sr.status == statusFailure && reSterilization == false){
 					top.Ext.getCmp('monitorBtn').show();
 					top.Ext.getCmp('saveBtn').hide();
 					top.Ext.getCmp('inputBarcode').setDisabled(true);
 					top.Ext.getCmp('biologicalMonitoringStartDate').setDisabled(true);
 					disableItems();
 				}
-				if(action.result.data.status == statusInterrupt && reSterilization == false){
+				if(sr.status == statusInterrupt && reSterilization == false){
 					top.Ext.getCmp('monitorBtn').show();
 					top.Ext.getCmp('saveBtn').hide();
 					top.Ext.getCmp('inputBarcode').setDisabled(true);
 					disableItems();
 				}
 			}else{  //灭菌完成
-				var sterilizationRecord = action.result.data;  //此灭菌记录对象
-				_biologicalMonitoringTime = sterilizationRecord.sterilizer.biologicalMonitoringTime*60*1000;  //此灭菌炉的生物监测持续时间
-				var biologicalMonitoringStartDate = sterilizationRecord.biologicalMonitoringStartDate;  //生物监测的开始时间
-				var biologicalMonitoringEndDate = sterilizationRecord.biologicalMonitoringEndDate;  //生物监测的结束时间
+				_biologicalMonitoringTime = sr.sterilizer.biologicalMonitoringTime*60*1000;  //此灭菌炉的生物监测持续时间
+				top.Ext.getCmp('biologicalMonitoringStartDate').setValue(formatDateYear(sr.biologicalMonitoringStartDate));  //生物监测的开始时间
+				top.Ext.getCmp('biologicalMonitoringEndDate').setValue(formatDateYear(sr.biologicalMonitoringEndDate));  //生物监测的结束时间
 				
-				top.Ext.getCmp('biologicalMonitoringStartDate').setValue(formatDateYear(biologicalMonitoringStartDate));
-				top.Ext.getCmp('biologicalMonitoringEndDate').setValue(formatDateYear(biologicalMonitoringEndDate));
-				
 				top.Ext.getCmp('monitorBtn').show();
 				top.Ext.getCmp('saveBtn').hide();
 				disableItems();
 			}
-			if(id == 0) {
-				if(scanUser == true){
-					top.Ext.getCmp('sterilizationUser').setValue('');
-				}
-			}
+			
 			// 初始化中断记录列表
 			var items = action.result.interruptRecords;
 			for(var i = 0;items && i < items.length; i++){