Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r17009 -r17012
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 17009)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 17012)
@@ -1758,6 +1758,7 @@
 				if(result.success){
 					top.Ext.getCmp('id').setValue(result.data.id);
 					top.Ext.getCmp('formName').setValue(result.data.name);
+					top.Ext.getCmp('formName').setEditable(false);
 					top.Ext.getCmp('name').setValue(result.data.name);
 					top.Ext.getCmp('type').setValue(result.data.type);
 					top.Ext.getCmp('srDateTime').setValue(result.data.sterilizerDate);
@@ -1962,7 +1963,7 @@
 		var inspectName = top.Ext.getCmp('formName').getRawValue();
 		var scope = top.Ext.getCmp('scope').getValue();
 		if(!allTousseOfSterileChecked()){
-			if(inspectName != '无' && scope != '无'){
+			if(inspectName != '无' && scope != '无' && scope != '灭菌炉记录'){
 				// 质量检测项为'无',不强制登记器械包信息
 				if(!material && !tousseName){
 					showResult("请录入抽验器械或器械包名称");
Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
===================================================================
diff -u -r17009 -r17012
--- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js	(.../routineMonitoringView.js)	(revision 17009)
+++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js	(.../routineMonitoringView.js)	(revision 17012)
@@ -862,7 +862,7 @@
 					name : 'material',
 					fieldLabel : '抽检器械',
 					queryParam : 'spell',
-					minChars : 0,
+					minChars : 0,	
 					valueField : 'id',
 					displayField : 'name',
 					store : materialDefinitionStore,
@@ -1106,6 +1106,7 @@
 						top.Ext.getCmp('recycle').getEl().up('.x-form-item').setDisplayed(true);
 						top.Ext.getCmp('repacking').setVisible(true);   
 						top.Ext.getCmp('repacking').getEl().up('.x-form-item').setDisplayed(true);
+						top.Ext.getCmp('sterilizationRecordInfo').setVisible(false);
 					}else if('材料' == result.data.scope){
 						top.Ext.getCmp("tousseName").setVisible(false);
 						top.Ext.getCmp("tousseName").getEl().up('.x-form-item').setDisplayed(false);
@@ -1119,29 +1120,20 @@
 						top.Ext.getCmp('recycle').getEl().up('.x-form-item').setDisplayed(false);
 						top.Ext.getCmp('repacking').setVisible(false);   
 						top.Ext.getCmp('repacking').getEl().up('.x-form-item').setDisplayed(false);
-					}else{
-						top.Ext.getCmp('material').setVisible(true);   
-						top.Ext.getCmp('material').getEl().up('.x-form-item').setDisplayed(true);
-						top.Ext.getCmp('amount').setVisible(true);   
-						top.Ext.getCmp('amount').getEl().up('.x-form-item').setDisplayed(true);
-						top.Ext.getCmp('tempBarcode').setVisible(true);   
-						top.Ext.getCmp('tempBarcode').getEl().up('.x-form-item').setDisplayed(true);
-						top.Ext.getCmp('recycle').setVisible(true);   
-						top.Ext.getCmp('recycle').getEl().up('.x-form-item').setDisplayed(true);
-						top.Ext.getCmp('tousseName').setVisible(true);   
-						top.Ext.getCmp('tousseName').getEl().up('.x-form-item').setDisplayed(true);
-						top.Ext.getCmp('repacking').setVisible(true);   
-						top.Ext.getCmp('repacking').getEl().up('.x-form-item').setDisplayed(true);
-					}
-					if(sstsConfig.hasOwnProperty('isInspectScopeHideTousseMsg') && sstsConfig.isInspectScopeHideTousseMsg){
-						if(result.data.scope == "无"){
+						top.Ext.getCmp('sterilizationRecordInfo').setVisible(false);
+					}else if(result.data.scope == "材料和器械包"){
+						showTousseAndMaterialMsg();
+						top.Ext.getCmp('sterilizationRecordInfo').setVisible(false);
+					}else if(result.data.scope == "无"){
+						if(sstsConfig.hasOwnProperty('isInspectScopeHideTousseMsg') && sstsConfig.isInspectScopeHideTousseMsg){
 							hideTousseAndMaterialMsg();
+						}else{
+							showTousseAndMaterialMsg();
 						}
-					}
-					if(result.data.scope == "灭菌炉记录"){
-						top.Ext.getCmp('sterilizationRecordInfo').setVisible(true);
-					}else{
 						top.Ext.getCmp('sterilizationRecordInfo').setVisible(false);
+					}else if(result.data.scope == "灭菌炉记录"){
+						hideTousseAndMaterialMsg();
+						top.Ext.getCmp('sterilizationRecordInfo').setVisible(true);
 					}
 					for(var i = 0 ; i< result.data.items.length ; i++){
 						var item = result.data.items[i];
@@ -1682,6 +1674,7 @@
 					}
 					top.Ext.getCmp('id').setValue(result.data.id);
 					top.Ext.getCmp('formName').setValue(result.data.name);
+					top.Ext.getCmp('formName').setEditable(false);
 					top.Ext.getCmp('name').setValue(result.data.name);
 					top.Ext.getCmp('type').setValue(result.data.type);
 					top.Ext.getCmp('srDateTime').setValue(result.data.sterilizerDate);
@@ -1765,6 +1758,7 @@
 						top.Ext.getCmp('recycle').getEl().up('.x-form-item').setDisplayed(true);
 						top.Ext.getCmp('repacking').setVisible(true);   
 						top.Ext.getCmp('repacking').getEl().up('.x-form-item').setDisplayed(true);
+						top.Ext.getCmp('sterilizationRecordInfo').setVisible(false);
 					}else if('材料' == result.data.scope){
 						top.Ext.getCmp("tousseName").setVisible(false);
 						top.Ext.getCmp("tousseName").getEl().up('.x-form-item').setDisplayed(false);
@@ -1778,26 +1772,21 @@
 						top.Ext.getCmp('recycle').getEl().up('.x-form-item').setDisplayed(false);
 						top.Ext.getCmp('repacking').setVisible(false);   
 						top.Ext.getCmp('repacking').getEl().up('.x-form-item').setDisplayed(false);
-					}else{
-						top.Ext.getCmp('material').setVisible(true);   
-						top.Ext.getCmp('material').getEl().up('.x-form-item').setDisplayed(true);
-						top.Ext.getCmp('amount').setVisible(true);   
-						top.Ext.getCmp('amount').getEl().up('.x-form-item').setDisplayed(true);
-						top.Ext.getCmp('tempBarcode').setVisible(true);   
-						top.Ext.getCmp('tempBarcode').getEl().up('.x-form-item').setDisplayed(true);
-						top.Ext.getCmp('recycle').setVisible(true);   
-						top.Ext.getCmp('recycle').getEl().up('.x-form-item').setDisplayed(true);
-						top.Ext.getCmp('tousseName').setVisible(true);   
-						top.Ext.getCmp('tousseName').getEl().up('.x-form-item').setDisplayed(true);
-						top.Ext.getCmp('repacking').setVisible(true);   
-						top.Ext.getCmp('repacking').getEl().up('.x-form-item').setDisplayed(true);
-					}
-					if(sstsConfig.hasOwnProperty('isInspectScopeHideTousseMsg') && sstsConfig.isInspectScopeHideTousseMsg){
-						if(result.data.scope == "无"){
+						top.Ext.getCmp('sterilizationRecordInfo').setVisible(false);
+					}else if(result.data.scope == "材料和器械包"){
+						showTousseAndMaterialMsg();
+						top.Ext.getCmp('sterilizationRecordInfo').setVisible(false);
+					}else if(result.data.scope == "无"){
+						if(sstsConfig.hasOwnProperty('isInspectScopeHideTousseMsg') && sstsConfig.isInspectScopeHideTousseMsg){
 							hideTousseAndMaterialMsg();
+						}else{
+							showTousseAndMaterialMsg();
 						}
+						top.Ext.getCmp('sterilizationRecordInfo').setVisible(false);
+					}else if(result.data.scope == "灭菌炉记录"){
+						hideTousseAndMaterialMsg();
+						top.Ext.getCmp('sterilizationRecordInfo').setVisible(true);
 					}
-					
 					top.Ext.getCmp('addRoutineMonitoringForm').remove('itemsFieldSet');
 					if(items.length > 0){
 						top.Ext.getCmp('addRoutineMonitoringForm').add({
@@ -1864,6 +1853,21 @@
 	top.Ext.getCmp('amount').setVisible(false);   
 	top.Ext.getCmp('amount').getEl().up('.x-form-item').setDisplayed(false);
 }
+
+function showTousseAndMaterialMsg(){
+	top.Ext.getCmp('material').setVisible(true);   
+	top.Ext.getCmp('material').getEl().up('.x-form-item').setDisplayed(true);
+	top.Ext.getCmp('amount').setVisible(true);   
+	top.Ext.getCmp('amount').getEl().up('.x-form-item').setDisplayed(true);
+	top.Ext.getCmp('tempBarcode').setVisible(true);   
+	top.Ext.getCmp('tempBarcode').getEl().up('.x-form-item').setDisplayed(true);
+	top.Ext.getCmp('recycle').setVisible(true);   
+	top.Ext.getCmp('recycle').getEl().up('.x-form-item').setDisplayed(true);
+	top.Ext.getCmp('tousseName').setVisible(true);   
+	top.Ext.getCmp('tousseName').getEl().up('.x-form-item').setDisplayed(true);
+	top.Ext.getCmp('repacking').setVisible(true);   
+	top.Ext.getCmp('repacking').getEl().up('.x-form-item').setDisplayed(true);
+}
 function updateControlStatus(){
 	var tousseType = top.Ext.getCmp('tousseType').getValue();
 	var tousseInstanceId = top.Ext.getCmp('tousseInstanceId').getValue();