Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r16035 -r16041
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 16035)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 16041)
@@ -243,7 +243,9 @@
 	return node;
 }
 
-//扫描灭菌架条码
+/**
+ * 扫描灭菌架条码
+ */
 function loadSterilizationShelf(barcode){
 	if(barcode != null && barcode.length > 0){
 		SterilizationRecordTableManager.getSterilizationShelfByBarcode(barcode,function(sterilizationShelfName) {
@@ -427,7 +429,9 @@
 	DWREngine.setAsync(true);
 	return canAddTousse;
 }
-// 扫描器械包，先校验位置
+/**
+ * 扫描器械包，先校验位置
+ */
 function loadTousseInstanceCheckPosition(barcodeStr,sterilizationRecordId){
 	if(sstsConfig.hasOwnProperty('stRecordScanPosition') && sstsConfig.stRecordScanPosition){
 		if((sstsConfig.hasOwnProperty('haveSterilizerPosition')) && sstsConfig.haveSterilizerPosition){
@@ -452,7 +456,7 @@
 //		showResult("例行监测不能灭菌物品！");
 //		return;
 //	}
-	var canAddTousse = sterilizationCanAddTousse();
+	var canAddTousse = sterilizationCanAddTousse();  //当前灭菌程序是否可以添加灭菌物品
 	
 	if(!canAddTousse){
 		showResult("当前灭菌程序不能灭菌物品！");
@@ -1110,20 +1114,23 @@
 
 /**
  * 不做监测目前只关心"生物监测"其实还有"物理监测"和"化学监测"
+ * @param disable	是否禁用表单上登记监测的区域
  */
-function notDoMonitor() {
+function notDoMonitor(disable) {
 	top.Ext.getCmp('physicsResult').setValue("无");
 	top.Ext.getCmp('chemistryResult').setValue("无");
 	top.Ext.getCmp('biologyResult').setValue("无");
-	top.Ext.getCmp('physicsResult').disable();
-	top.Ext.getCmp('chemistryResult').disable();
-	top.Ext.getCmp('biologyResult').disable();
-	
-	top.Ext.getCmp('biologicalMonitoringStartDate').disable();
-	top.Ext.getCmp('biologicalMonitoringEndDate').disable();
-	top.Ext.getCmp('monitorCheckerCode').disable();
-	top.Ext.getCmp('monitorChecker').disable();
-	top.Ext.getCmp('monitorUser').disable();
+	if (disable) {
+		top.Ext.getCmp('physicsResult').disable();
+		top.Ext.getCmp('chemistryResult').disable();
+		top.Ext.getCmp('biologyResult').disable();
+		
+		top.Ext.getCmp('biologicalMonitoringStartDate').disable();
+		top.Ext.getCmp('biologicalMonitoringEndDate').disable();
+		top.Ext.getCmp('monitorCheckerCode').disable();
+		top.Ext.getCmp('monitorChecker').disable();
+		top.Ext.getCmp('monitorUser').disable();
+	}
 }
 
 //参数reSterilization true:重新灭菌
@@ -1754,7 +1761,7 @@
 																	showResult("请输入正确的条码！");
 																}
 																top.Ext.getCmp('inputBarcode').setValue("");
-															}else if(BASKET == result){  //灭菌篮筐
+															}else if(BASKET == result){  //灭菌篮筐	
 																loadTousseInstanceCheckPosition(barcode,recordID);
 																if(hiddenEndBarcode || currentScanMode == 'single'){
 																	top.Ext.getCmp('inputBarcode').setValue("");//如果使用虚拟篮筐机制,扫描成功后需要清除该文本内容
@@ -1789,7 +1796,7 @@
 																}else{
 																	top.Ext.getCmp('inputBarcodeEnd').focus();//否则不清除,条码/篮筐(尾)获得焦点
 																}
-															}else if("notFixedBarcode" == result){  //固定条码
+															}else if("notFixedBarcode" == result){
 																showResult("该器械包为可追溯的包，不能扫描固定条码!");
 																top.Ext.getCmp('inputBarcode').setValue("");
 															}else if("errorBasket" == result){
@@ -2414,7 +2421,7 @@
 			}
 			
 			if(action.result.data.status != statusEnd){  //还没灭菌完成
-				notDoMonitor();
+				notDoMonitor(true);
 				if(action.result.data.status == statusFailure && reSterilization == false){
 					top.Ext.getCmp('monitorBtn').show();
 					top.Ext.getCmp('saveBtn').hide();
@@ -2438,15 +2445,13 @@
 						top.Ext.getCmp('physicsResult').setValue("合格");
 						top.Ext.getCmp('chemistryResult').setValue("合格");
 						top.Ext.getCmp('biologyResult').setValue("合格");
-						top.Ext.getCmp('biologicalMonitoringStartDate').setValue(top.Ext.getCmp('endDate').getValue());
-						
-						var temp = top.Ext.getCmp('biologicalMonitoringStartDate').getValue().getTime() + _biologicalMonitoringTime;
-						top.Ext.getCmp('biologicalMonitoringEndDate').setValue(new Date(temp));
-						top.Ext.getCmp('monitorUser').setValue(userName);
 					} else {
-						notDoMonitor();
+						notDoMonitor(false);
 					}
-					
+					top.Ext.getCmp('biologicalMonitoringStartDate').setValue(top.Ext.getCmp('endDate').getValue());
+					var temp = top.Ext.getCmp('biologicalMonitoringStartDate').getValue().getTime() + _biologicalMonitoringTime;
+					top.Ext.getCmp('biologicalMonitoringEndDate').setValue(new Date(temp));
+					top.Ext.getCmp('monitorUser').setValue(userName);
 				}
 				
 				top.Ext.getCmp('monitorBtn').show();