Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
===================================================================
diff -u -r29513 -r29687
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 29687)
@@ -3,6 +3,7 @@
 <%@page import="com.forgon.disinfectsystem.entity.recyclingdamagerecord.RecyclingDamageItem"%>
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier,com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig"%>
 <%@page import="com.forgon.disinfectsystem.entity.packing.PackingTask"%>
+<%@page import="com.forgon.disinfectsystem.entity.departmentGroupOption.DepartmentGroupOption"%>
 <%@page import="java.util.Map"%>
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile"%>
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.videomanager.VideoFile" %>
@@ -208,6 +209,7 @@
 <link rel="stylesheet" href="${ctx}/js/magnificPopup/magnific-popup.css"> 
 <script>
 var getPrintUserFullName = parseFloat('${getPrintUserFullName}');
+var departmentGroupOption_REVIEWE = '<%=DepartmentGroupOption.TYPE_GROUP_REVIEWE%>';//审核科室分组 
 var timer, target, current, ab; 
 var isShown = false;
 function updateNote(note){
Index: ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js
===================================================================
diff -u -r28612 -r29687
--- ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js	(.../comboToussePackingView.js)	(revision 28612)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js	(.../comboToussePackingView.js)	(revision 29687)
@@ -593,7 +593,33 @@
 		    {name : 'id',mapping : 'id'}, 
 		    {name : 'name',mapping : 'name'}
 		  ]
-	})
+	});
+	/**
+	 * 审核科室分组数据
+	 */
+	var departmentGroupOptionStore = new Ext4.data.Store({
+		proxy : {
+			type : 'ajax',
+			url : WWWROOT + '/disinfectSystem/baseData/departmentGroupOptionAction!loadDepartmentGroupOptiopnDataByType.do?type='+encodeURI(departmentGroupOption_REVIEWE),
+			reader : {
+				type : 'json',
+                totalProperty : 'totalCount',
+				root : 'data'
+			}
+		},
+		fields : [
+		    {name : 'name',mapping : 'name'}
+		],
+		listeners: {
+			load:function(thiz,records){
+				record = Ext.data.Record.create([
+					{name: "name", type: "string"}
+				]);
+				var record = {name:'全部'};
+				thiz.insert(0, record);
+			}
+		}
+	});
 
     var tbar = [{
     	text:'聚合包名称:'
@@ -1131,6 +1157,30 @@
     		allowBlank : true,
     		anchor : '90%'
     	},{
+			xtype : "combo",
+            columnWidth : .33,
+            labelWidth : 70,
+            fieldLabel : "科室分组",
+            valueField : 'name',
+			displayField : 'name',
+            labelAlign:'right',
+            margin :'5 0 0 0',
+            store : departmentGroupOptionStore,
+            forceSelection : true,
+            editable : false,
+            triggerAction : "all",
+			id : 'departmentGroupOption',
+			name : 'departmentGroupOption',
+			anchor : "80%",
+			emptyText : '全部',
+			allowBlank : true,
+			listeners:{
+				select:function(combo, record, index){
+					appDepartJsonStore.load();
+					top.Ext4.getCmp('comboToussePacking_orgUnit').setValue('');
+				}
+			}
+        },{
             xtype : 'combo',
             columnWidth : .33,
             labelWidth : 70,
@@ -1149,7 +1199,6 @@
 //            forceSelection : true,
 			lazyInit : true,
 			triggerAction : 'all',
-			hideTrigger : true,
 			typeAhead : false,
 //            allowBlank : !sstsConfig.sterilizerNotAllowBlank,
             anchor : '80%',
@@ -1217,7 +1266,7 @@
             height : 130,
             anchor: '100%',
             layout : 'fit',
-            items : [packingComboToussePanel]
+			items : [packingComboToussePanel]
         }, {
             region : 'center',
             anchor: '100% -130',
@@ -1317,7 +1366,7 @@
     	}
     });
     
-    comboTousseWin.show();
+	comboTousseWin.show();
     
     if (sstsConfig.printLabelWhenReviewing == true){
     	var reviewer3 = top.Ext4.getCmp("reviewer3");
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r29619 -r29687
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 29619)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 29687)
@@ -52,6 +52,34 @@
 
 //判断是否ie和ie7
 var isIE6OrIE7 = top.Ext4.isIE6 || top.Ext4.isIE7;
+var filterDepartmentsWithoutToussesStore = new Ext4.data.Store({
+	//limit参数，每页显示条数，默认为25
+	pageSize: isIE6OrIE7 ? 15 : 50,
+	autoLoad:false,
+	proxy : {
+		type : 'ajax',
+		url : WWWROOT + '/disinfectSystem/packingAction!filterDepartmentsWithoutTousses.do',
+		reader : {
+			type : 'json',
+			totalProperty : 'totalCount',
+			root : 'data'
+		}
+	},
+	fields : [
+	    {name : 'id',mapping : 'id'},
+	    {name : 'name',mapping : 'name'}
+	],
+	listeners:{
+		load:function(store){
+			top.Ext4.getCmp('comboToussePacking_orgUnit').getStore().removeAll();
+			var array = [];
+			store.each(function(item){
+				array.push(item.data);
+			})
+			top.Ext4.getCmp('comboToussePacking_orgUnit').getStore().add(array)
+		}
+	}
+});
 var appDepartJsonStore = new Ext4.data.Store({
 	//limit参数，每页显示条数，默认为25
 	pageSize: isIE6OrIE7 ? 15 : 50,
@@ -68,7 +96,23 @@
 	fields : [
 	    {name : 'id',mapping : 'id'},
 	    {name : 'name',mapping : 'name'}
-	  ]
+	],
+	listeners:{
+		beforeload : function( store, options ){
+			var departmentGroupOption = top.Ext4.getCmp('departmentGroupOption');
+			if(departmentGroupOption){
+				var departmentGroupOptionName = (departmentGroupOption.getValue() == '全部')?'':departmentGroupOption.getValue();
+				store.proxy.extraParams.departmentGroupOptionType = '审核科室分组';
+				store.proxy.extraParams.departmentGroupOptionName = departmentGroupOptionName;
+			}
+		},
+		load:function(store){
+			if(store.data.keys.length > 0){
+				filterDepartmentsWithoutToussesStore.proxy.extraParams.departCodes = store.data.keys.join(';');
+				filterDepartmentsWithoutToussesStore.load();
+			}
+		}
+	}
 });
 //申请科室Store
 var appDepartJsonStoreExt2 = new Ext4.data.Store({
@@ -1498,7 +1542,6 @@
 							 }
 						 });
 					 }
-					 console.log(delNodes)
 					 for(var j = 0;j < delNodes.length;j++){
 						delNodes[j].remove()
 					}