Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
===================================================================
diff -u -r33887 -r33888
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 33887)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 33888)
@@ -2502,24 +2502,24 @@
 					layout: 'form',
 					labelWidth: fontSize == 12 ? 90 : 100,
 					labelAlign: "right",
-					hidden: !sstsConfig.enableInstrumentSetTypeSetting,
+					hidden: SSTS_TousseInstanceType_list,
 					items: [{
-						//用于保存时：传递器械包种类id
+						//用于保存时：传递所属种类id
 						xtype: 'hidden',
-						id: 'tousseSetType',
-						name: 'tousseSetType'
+						id: 'instrumentSetType',
+						name: 'instrumentSetType'
 					}, {
 						xtype: 'trigger',
 						fieldLabel: "器械包种类",
 						allowBlank: true,
-						name: "tousseSetTypeName",
-						id: "tousseSetTypeName",
+						name: "instrumentSetTypeName",
+						id: "instrumentSetTypeName",
 						msgTarget: 'side',
 						readOnly: true,
 						onTriggerClick: function () {
-							var ids = top.Ext.getCmp('tousseSetType').getValue();
-							var names = top.Ext.getCmp('tousseSetTypeName').getValue();
-							setInstrumentSetType('tousseSetType', 'tousseSetTypeName', ids, names);
+							var ids = top.Ext.getCmp('instrumentSetType').getValue();
+							var names = top.Ext.getCmp('instrumentSetTypeName').getValue();
+							setInstrumentSetType('instrumentSetType', 'instrumentSetTypeName', ids, names);
 						},
 						triggerClass: 'x-form-search-trigger',
 						anchor: '100%'
@@ -2993,16 +2993,16 @@
 				}
 				var ids = [];
 				var names = [];
-				if (tousseDefinition.tousseSetTypeJSONArray && tousseDefinition.tousseSetTypeJSONArray.length > 0) {
-					for (var i = 0; i < tousseDefinition.tousseSetTypeJSONArray.length; i++) {
-						ids[i] = tousseDefinition.tousseSetTypeJSONArray[i].id;
-						names[i] = tousseDefinition.tousseSetTypeJSONArray[i].name;
+				if (tousseDefinition.instrumentSetTypeJSONArray && tousseDefinition.instrumentSetTypeJSONArray.length > 0) {
+					for (var i = 0; i < tousseDefinition.instrumentSetTypeJSONArray.length; i++) {
+						ids[i] = tousseDefinition.instrumentSetTypeJSONArray[i].id;
+						names[i] = tousseDefinition.instrumentSetTypeJSONArray[i].name;
 					}
-					top.Ext.getCmp('tousseSetType').setValue(ids.join(';'));
-					top.Ext.getCmp('tousseSetTypeName').setValue(names.join(';'));
+					top.Ext.getCmp('instrumentSetType').setValue(ids.join(';'));
+					top.Ext.getCmp('instrumentSetTypeName').setValue(names.join(';'));
 				} else {
-					top.Ext.getCmp('tousseSetType').setValue('');
-					top.Ext.getCmp('tousseSetTypeName').setValue('');
+					top.Ext.getCmp('instrumentSetType').setValue('');
+					top.Ext.getCmp('instrumentSetTypeName').setValue('');
 				}
 				if (tousseDefinition.printBOMwhenPrintLabel == '') {
 					top.Ext.getCmp('printBOMwhenPrintLabel').setValue('否');
@@ -3101,8 +3101,8 @@
 	var rowIndex = configGridStore.getCount();//grid的行数 
 	//所属科室编码s
 	var belongOrgUnitCodes = top.Ext.getCmp('belongDepartCodes').getValue();
-	//器械包种类
-	var tousseSetType = top.Ext.getCmp('tousseSetType').getValue();
+	//所属种类
+	var instrumentSetType = top.Ext.getCmp('instrumentSetType').getValue();
 	var materials = [];
 	// 设置序号
 	setMaterialSequence();
@@ -3177,7 +3177,7 @@
 					params: {
 						materialDefinitionConfigResult: JSON.stringify(materials),
 						belongOrgUnitCodes: belongOrgUnitCodes,
-						tousseSetTypeIds: tousseSetType,
+						instrumentSetTypeIds: instrumentSetType,
 						belongOrgUnit: JSON.stringify(belongOrgUnit),
 						expendTousseImg: expendTousseImg,
 						expendInstructionBook: expendInstructionBook,