Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
===================================================================
diff -u -r21789 -r22651
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js	(.../printCustomDesign.js)	(revision 21789)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js	(.../printCustomDesign.js)	(revision 22651)
@@ -1202,7 +1202,8 @@
 	
 // 测试数据源
 var dataSource1 = {
-	materials:[]	
+	materials:[],	
+	comboTousseNameAmountInfo:[]
 }
 
 for(var i=0;i<10;++i){
@@ -1214,5 +1215,9 @@
 		specification: '规格'+num,
 		price: '单价'+num
 	});
+	dataSource1.comboTousseNameAmountInfo.push({
+		name: '包'+num,
+		count: '数量'+num
+	});
 }
 
Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
===================================================================
diff -u -r22583 -r22651
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 22583)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 22651)
@@ -150,6 +150,19 @@
 	})]
 });
 tableDataSourceManager.registerTableDataSource(tableDataSource);
+// 聚合包明细表格的数据源
+var tableDataSource_comboTousseDetails = new TableDataSource({
+	name: '聚合包明细',
+	itemsPropName: 'comboTousseNameAmountInfo',
+	dataSourceItems: [new TableDataSourceItem({
+		propName: 'name',
+		displayName: '包名'
+	}),new TableDataSourceItem({
+		propName: 'count',
+		displayName: '数量'
+	})]
+});
+tableDataSourceManager.registerTableDataSource(tableDataSource_comboTousseDetails);
 // 注册对象数据源
 var objectDataSourceManager = new ObjectDataSourceManager();
 var normalTousseDataSource = new ObjectDataSource({
Index: ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js
===================================================================
diff -u -r22403 -r22651
--- ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js	(.../comboToussePackingView.js)	(revision 22403)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js	(.../comboToussePackingView.js)	(revision 22651)
@@ -397,12 +397,14 @@
 				top.Ext4.getCmp("sterilingType3").setValue(sterilingMethod);
 				
 				var includeTousses = record.data.includeTousses;
+				var comboToussePacking_orgUnit = top.Ext4.getCmp('comboToussePacking_orgUnit').getValue();
 				if(includeTousses.length > 0){
 					Ext4.Ajax.request({
 						url : WWWROOT + '/disinfectSystem/packingAction!findComboTousseIncludeToussePackingTaskAmount.do',
 						params : {
 							id : record.data.id,
-							includeTousses : JSON.stringify(includeTousses)
+							includeTousses : JSON.stringify(includeTousses),
+							departCoding: comboToussePacking_orgUnit
 						},success : function(response, options) {
 							var result = Ext4.decode(response.responseText);
 							if(!result.success){
@@ -442,7 +444,21 @@
 						}
 					});
 				}
-			}
+			},beforequery: function(queryPlan, eOpts){
+//            	以后可能会需要打开
+//            	var comboToussePacking_orgUnit = top.Ext4.getCmp('comboToussePacking_orgUnit').getValue();
+//            	if(isUndefinedOrNullOrEmpty(comboToussePacking_orgUnit)){
+//            		showResult('请选择科室!' , null , sstsConfig.messagePauseTimeOnPackingPage);
+//            		return false;
+//            	}
+            },beforeselect: function(combo, record, index, eOpts){
+//            	以后可能会需要打开
+//            	var comboToussePacking_orgUnit = top.Ext4.getCmp('comboToussePacking_orgUnit').getValue();
+//            	if(isUndefinedOrNullOrEmpty(comboToussePacking_orgUnit)){
+//            		showResult('请选择科室!' , null , sstsConfig.messagePauseTimeOnPackingPage);
+//            		return false;
+//            	}
+            }
 		}
     }];
     
@@ -835,7 +851,42 @@
     		format : 'Y-m-d',
     		allowBlank : true,
     		anchor : '90%'
-    	}],
+    	},{
+            xtype : 'combo',
+            columnWidth : .33,
+            labelWidth : 70,
+//            hidden : !sstsConfig.showSterilizer,
+            fieldLabel : '科室',
+            id : 'comboToussePacking_orgUnit',
+            name : 'comboToussePacking_orgUnit',
+            valueField : 'id',
+            displayField : 'name',
+            queryParam : 'spell',
+            minChars : 0,
+            labelAlign:'right',
+            margin :'5 0 0 0',
+            pageSize : 100,
+            store : appDepartJsonStore,
+            forceSelection : true,
+			lazyInit : true,
+			triggerAction : 'all',
+			hideTrigger : true,
+			typeAhead : false,
+//            allowBlank : !sstsConfig.sterilizerNotAllowBlank,
+            anchor : '80%',
+            listeners : {
+                select : function(combo, record, index) {
+                	top.Ext4.getCmp("comboTousseName").setValue('');
+                	var waitComboTousseStore = top.Ext4.getCmp("waitComboTousseGrid").getStore();
+    				waitComboTousseStore.removeAll();
+    				var comboGrid = top.Ext4.getCmp("comboGrid").getStore();
+    				comboGrid.removeAll();
+    				var comboTousseDataGrid = top.Ext4.getCmp("comboTousseDataGrid").getStore();
+    				comboTousseDataGrid.removeAll();
+    				
+                }
+            }
+        }],
         buttons : [{
             text : packingBtnText,
             handler : function() {
@@ -1009,10 +1060,20 @@
         if(isUndefinedOrNullOrEmpty(sterileDate)){
         	sterileDate = new Date();
         }
+        
         // 校验数量是否有效
 //        if(!isAmountSufficient()){
 //        	return false;
 //        }
+        var comboToussePacking_depart = top.Ext4.getCmp('comboToussePacking_orgUnit').getRawValue();
+        var comboToussePacking_departCoding = top.Ext4.getCmp('comboToussePacking_orgUnit').getValue();
+        if(isUndefinedOrNullOrEmpty(comboToussePacking_depart)){
+        	comboToussePacking_depart = null;
+        }
+        if(isUndefinedOrNullOrEmpty(comboToussePacking_departCoding)){
+        	comboToussePacking_departCoding = null;
+        }
+//        alert(comboToussePacking_depart+','+comboToussePacking_departCoding)
         var params = {
         		operator: operator,
         		operatorCode: operatorCode,
@@ -1026,6 +1087,8 @@
         		taskGroup: taskGroup,
         		comboTousseJsonArray: comboPackages,
     			sterilizer: sterilizer,
+    			depart: comboToussePacking_depart,
+    			departCoding: comboToussePacking_departCoding,
     			frequency: frequency
     	}
         DWREngine.setAsync(false);
Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/configObj.js
===================================================================
diff -u -r22420 -r22651
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/configObj.js	(.../configObj.js)	(revision 22420)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/configObj.js	(.../configObj.js)	(revision 22651)
@@ -510,6 +510,9 @@
 	if(dataRowConfig != null){
 		var itemsPerRow = tableConfig.itemsPerRow;
 		var dataItems = obj[itemsPropName];
+		if(isUndefinedOrNull(dataItems)){
+			dataItems = [];
+		}
 //		alert(itemsPropName)
 		var mod = dataItems.length % itemsPerRow;
 		var itemsCount = dataItems.length;