Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r17476 -r17907
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 17476)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 17907)
@@ -66,16 +66,16 @@
 	}
 });
 
-//已废弃,改为下面的变量
-var jsonStore = new Ext.data.SimpleStore( {
-	fields : [ 'value'],
-	data : [
-	    ['器械包灭菌'],
-	    ['每天例行监测'], 
-	    ['更换部件或维护监测'],
-		['装载监测']
-	]
-});
+////已废弃,改为下面的变量
+//var jsonStore = new Ext.data.SimpleStore( {
+//	fields : [ 'value'],
+//	data : [
+//	    ['器械包灭菌'],
+//	    ['每天例行监测'], 
+//	    ['更换部件或维护监测'],
+//		['装载监测']
+//	]
+//});
 
 //远程方法请求后台查询灭菌目录
 var sterilizationPurposeJsonStore = new Ext.data.Store({
@@ -339,19 +339,19 @@
 			 if(resultArray[0] == "success"){
 				 top.Ext.getCmp('sterilizerName').setValue(resultArray[1].split(',')[0]);
 	       		 top.Ext.getCmp('frequency').setValue(resultArray[1].split(',')[1]);
-	       		 if(resultArray[1].split(',')[1] == 1){
-	       			 top.Ext.getCmp('sterilizationPurpose').setValue("每天例行监测");
-	       			 top.Ext.getCmp('sterilizationPurpose').disable();
-	       			 var rootNode = sterilizationColumnTree.getRootNode();
-	       			 while(rootNode.hasChildNodes()){
-	   					 rootNode.removeChild(rootNode.firstChild);
-	       			 }
-	       			 tousseItemCountJsonStore.removeAll();
-	       			 pendingSterilizationColumnTree.loader.load(pendingSterilizationColumnTree.root,function(){});
-	       		 }else{
-	       			 top.Ext.getCmp('sterilizationPurpose').enable();
-					 //top.Ext.getCmp('sterilizationPurpose').setValue('器械包灭菌');
-	       		 }
+//	       		 if(resultArray[1].split(',')[1] == 1){
+//	       			 top.Ext.getCmp('sterilizationPurpose').setValue("每天例行监测");
+//	       			 top.Ext.getCmp('sterilizationPurpose').disable();
+//	       			 var rootNode = sterilizationColumnTree.getRootNode();
+//	       			 while(rootNode.hasChildNodes()){
+//	   					 rootNode.removeChild(rootNode.firstChild);
+//	       			 }
+//	       			 tousseItemCountJsonStore.removeAll();
+//	       			 pendingSterilizationColumnTree.loader.load(pendingSterilizationColumnTree.root,function(){});
+//	       		 }else{
+//	       			 top.Ext.getCmp('sterilizationPurpose').enable();
+//					 //top.Ext.getCmp('sterilizationPurpose').setValue('器械包灭菌');
+//	       		 }
 			 }else{
 				 showResult(resultArray[1]);
 			 }
@@ -2058,19 +2058,19 @@
 										 recordId = "0"; 
 									 }
 									 SterilizationRecordTableManager.getMaxFrequency(combo.value,recordId,function(result){
-										 if(result == 1){
-											 //top.Ext.getCmp('sterilizationPurpose').setValue("每天例行监测");
-				                			 //top.Ext.getCmp('sterilizationPurpose').disable();
-				                			 var rootNode = sterilizationColumnTree.getRootNode();
-				                			 while(rootNode.hasChildNodes()){
-			                					 rootNode.removeChild(rootNode.firstChild);
-				                			 }
-				                			 tousseItemCountJsonStore.removeAll();
-				                			 pendingSterilizationColumnTree.loader.load(pendingSterilizationColumnTree.root,function(){});
-										 }else{
-											 top.Ext.getCmp('sterilizationPurpose').enable();
-											 //top.Ext.getCmp('sterilizationPurpose').setValue('器械包灭菌');
-										 }
+//										 if(result == 1){
+//											 //top.Ext.getCmp('sterilizationPurpose').setValue("每天例行监测");
+//				                			 //top.Ext.getCmp('sterilizationPurpose').disable();
+//				                			 var rootNode = sterilizationColumnTree.getRootNode();
+//				                			 while(rootNode.hasChildNodes()){
+//			                					 rootNode.removeChild(rootNode.firstChild);
+//				                			 }
+//				                			 tousseItemCountJsonStore.removeAll();
+//				                			 pendingSterilizationColumnTree.loader.load(pendingSterilizationColumnTree.root,function(){});
+//										 }else{
+//											 top.Ext.getCmp('sterilizationPurpose').enable();
+//											 //top.Ext.getCmp('sterilizationPurpose').setValue('器械包灭菌');
+//										 }
 										 top.Ext.getCmp('frequency').setValue(result);
 									 });
 									 SterilizationRecordTableManager.getNextCycleCounter(combo.value,recordId,function(result){
@@ -3014,9 +3014,9 @@
 					top.Ext.getCmp('cycleCounterId').hide();
 			});
 			
-			if(sr.frequency == 1){//每天第一炉
-				top.Ext.getCmp('sterilizationPurpose').disable();
-			}
+//			if(sr.frequency == 1){//每天第一炉
+//				top.Ext.getCmp('sterilizationPurpose').disable();
+//			}
 			
 			//加载灭菌参数
 			SterilizationRecordTableManager.getParameter(sr.sterilizationType,function(result){
@@ -3232,15 +3232,15 @@
 		top.Ext.getCmp('id').setValue(0);
 		top.Ext.getCmp('reSterilization').setValue("true");
 	}
-	//每天第一炉是例行监测
+/*	//每天第一炉是例行监测
 	var frequencyValue = top.Ext.getCmp('frequency').getValue();
 	var sterilizationPurposeValue = top.Ext.getCmp('sterilizationPurpose').getValue();
-/*	if( frequencyValue== 1 && sterilizationPurposeValue != '每天例行监测'){
+	if( frequencyValue== 1 && sterilizationPurposeValue != '每天例行监测'){
 		showResult('当天第一炉必须是例行监测');
 		return false;
 	}*/
 	
-	// 例行监测不能灭菌物品
+	//判断当前灭菌程序是否能灭菌器械包
 	var rootNode = sterilizationColumnTree.getRootNode();
 	var hasGoods = rootNode.hasChildNodes();
 	var canAddTousse = sterilizationCanAddTousse();