Index: ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
===================================================================
diff -u -r15581 -r15893
--- ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js	(.../directPacking.js)	(revision 15581)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js	(.../directPacking.js)	(revision 15893)
@@ -41,6 +41,22 @@
     }  
 
 	});
+	
+	//申请科室Store
+	var appDepartJsonStore = new Ext.data.Store({
+		proxy : new Ext.data.HttpProxy({
+			url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getApplicationDepartJson.do',
+			method : 'POST'
+		}),
+		reader : new Ext.data.JsonReader({
+			root : 'data'
+		},[
+		    {name : 'id',mapping : 'id'}, 
+		    {name : 'departCode',mapping : 'departCode'}, 
+		    {name : 'name',mapping : 'name'}
+		  ]
+		)
+	});
 
 	//器械包
 	var tousseDefinitionStore = new Ext.data.Store({
@@ -148,6 +164,10 @@
 		var sterilingType = Ext.getCmp("sterilingType").getValue();
 		var sterilizer = Ext.getCmp("sterilizer").getValue();
 		var frequency = Ext.getCmp("frequency").getValue();
+		var department = '';
+		if(sstsConfig.selectDepartInCustomPacking){
+			department=Ext.getCmp('depart').getValue();
+        }
 
 		if(barcodeStr != null  && barcodeStr.length > 0){
 			 var tousseName = Ext.getCmp('tousseName').getValue();
@@ -201,6 +221,7 @@
                     				'idCardDefinitionUseAmount':idCardDefinitionUseAmount,'packageTypeAbbreviation':packageTypeAbbreviation};
                             obj.sterilizerName = sterilizer;
                             obj.sterileFrequency = frequency;
+                            obj.department = department;
                             defaultPrintPackage(obj);
                             tempPrintNum--;
 						}
@@ -595,6 +616,11 @@
             name : 'wrapperCode',
             value : wrapperCode
         },{
+            xtype : 'hidden',
+            id : 'departCoding',
+            name : 'departCoding',
+            value : wrapperCode
+        },{
             columnWidth : .33,
             layout : 'form',
             cls:'edit-5char-labelwidth',
@@ -765,6 +791,38 @@
 			columnWidth : .33,
 			layout : 'form',
 			cls:'edit-5char-labelwidth',
+			hidden : !sstsConfig.selectDepartInCustomPacking,
+			items : [{
+				xtype : 'combo',
+				fieldLabel : '申请科室',
+				itemId : 'depart',
+				name : 'depart',
+				id : 'depart',
+				queryParam : 'spell',
+				minChars : 0,
+				valueField : 'name',
+				displayField : 'name',
+				store : appDepartJsonStore,
+				forceSelection : true,
+				lazyInit : true,
+				triggerAction : 'all',
+				hideTrigger : true,
+				typeAhead : false,
+				allowBlank : true,
+				flex : 1,
+				listeners:{
+					select:function(combo, record, index){
+						Ext.getCmp('departCoding').setValue(record.data.departCode);
+					},
+					focus : function(thiz){
+						thiz.selectText();
+					}
+				}						
+			}]
+		},{
+			columnWidth : .33,
+			layout : 'form',
+			cls:'edit-5char-labelwidth',
 			items : [ {
 				xtype : 'combo',
 				fieldLabel : "包装类型",