Index: ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
===================================================================
diff -u -r14911 -r14965
--- ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js	(.../directPacking.js)	(revision 14911)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js	(.../directPacking.js)	(revision 14965)
@@ -8,9 +8,9 @@
 	
 	//灭菌程序
 	var sterilizerTypeStore = new Ext.data.SimpleStore({
-		fields : [ 'id','typeName' ],
+		fields : [ 'id','typeName','typeNameAndPurpose' ],
 		autoLoad :true,
-		url : WWWROOT + '/disinfectSystem/baseData/sterilizerAction!getSterilizerType.do'
+		url : WWWROOT + '/disinfectSystem/baseData/sterilizerAction!getSterilizerTypeAndSterilizationPurpose.do'
 	});
 	
 	//包装类型
@@ -690,12 +690,12 @@
 				xtype : 'combo',
 				fieldLabel : "灭菌程序",
 				valueField : 'typeName',
-				displayField : 'typeName',
+				displayField : 'typeNameAndPurpose',
 				store : sterilizerTypeStore,
 				forceSelection : true,
 				editable : false,
 				lazyInit : false,
-				listWidth:100,
+				listWidth:150,
 				triggerAction : 'all',
 				mode : "local",
 				name : "sterilingType",