Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r15710 -r15949
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 15710)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 15949)
@@ -451,11 +451,10 @@
 				sterilizationRecord.setFinishComfirmer(finishComfirmer);
 			}
 			
-			sterilizationRecord
-					.setStatus(SterilizationRecord.STERILIZATION_STATUS_END);
-			sterilizationRecord.setPhysicsResult(SterilizationRecord.MONITOR_RESULT_QUALIFIED);
-			sterilizationRecord.setChemistryResult(SterilizationRecord.MONITOR_RESULT_QUALIFIED);
-			sterilizationRecord.setBiologyResult(SterilizationRecord.MONITOR_RESULT_QUALIFIED);
+			sterilizationRecord.setStatus(SterilizationRecord.STERILIZATION_STATUS_END);
+//			sterilizationRecord.setPhysicsResult(SterilizationRecord.MONITOR_RESULT_QUALIFIED);  //没做的结果应该为"无"，怎么会给一个"合格"的结果给他呢？（cjr）
+//			sterilizationRecord.setChemistryResult(SterilizationRecord.MONITOR_RESULT_QUALIFIED);
+//			sterilizationRecord.setBiologyResult(SterilizationRecord.MONITOR_RESULT_QUALIFIED);
 			// 灭菌记录的的温度压力数据条数
 			int count = getSterilerRecordsCount(sterilizer.getDeviceInterfaceId(),
 					sterilizer.getMachineNumber(),
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
===================================================================
diff -u -r15921 -r15949
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 15921)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 15949)
@@ -1656,7 +1656,28 @@
 			    		  value : '否',
 			    		  mode : 'local',
 			    		  triggerAction : 'all',
-			    		  anchor : '100%'
+			    		  anchor : '100%',
+			    		  listeners : {
+								select : function (combo, record, index ){
+									if(combo.getRawValue() == '是'){
+										setFieldsHide(true);
+										top.Ext.getCmp('isPacking').setValue("是");
+										top.Ext.getCmp('isPacking').disable();
+										top.Ext.getCmp('isReview').setValue("是");
+										top.Ext.getCmp('isReview').disable();
+										top.Ext.getCmp('isTraceable').setValue("是");
+										top.Ext.getCmp('isTraceable').disable();
+										
+										top.Ext.getCmp('isPrint').enable();  //启用"是否打印标签"
+										top.Ext.getCmp('autoOutStockForPacking').enable();  //启用"自动扣包内材料"
+									}else{
+										top.Ext.getCmp('isPacking').enable();
+										top.Ext.getCmp('isReview').enable();
+										top.Ext.getCmp('isTraceable').enable();
+										setFieldsHide(false);
+									}
+								}
+							}
 			    	  }]
 			      },{
 	        	  columnWidth : .7,
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
===================================================================
diff -u -r15680 -r15949
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java	(.../SterilizationRecordTableManager.java)	(revision 15680)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java	(.../SterilizationRecordTableManager.java)	(revision 15949)
@@ -302,9 +302,9 @@
 	public boolean saveMonitorResult(String recordID, String physicsResult,
 			String chemistryResult, String biologyResult,long cycleCounter,
 			String biologicalMonitoringStartDateString, String biologicalMonitoringEndDateString, String monitorUser,String monitorChecker) {
+		
 		if (StringUtils.isNotBlank(recordID)) {
-			SterilizationRecord record = sterilizationRecordManager
-					.getSterilizationRecordById(Long.valueOf(recordID));
+			SterilizationRecord record = sterilizationRecordManager.getSterilizationRecordById(Long.valueOf(recordID));
 			if (record != null) {
 				try {
 					Date biologicalMonitoringStartDate = new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(biologicalMonitoringStartDateString);
@@ -314,9 +314,7 @@
 					record.setMonitorUser(monitorUser);  //监测员
 					record.setMonitorChecker(monitorChecker);  //监测核对人
 				} catch (ParseException e) {
-					// TODO Auto-generated catch block
 					System.out.println("输入的时间格式不对，就不更新这个结束时间了");
-					//e.printStackTrace();
 				}
 				record.setPhysicsResult(physicsResult);
 				record.setChemistryResult(chemistryResult);
@@ -330,6 +328,7 @@
 			}
 		}
 		return false;
+		
 	}
 
 	/**