Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroupOption/service/DepartmentGroupOptionManager.java
===================================================================
diff -u
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroupOption/service/DepartmentGroupOptionManager.java	(revision 0)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroupOption/service/DepartmentGroupOptionManager.java	(revision 25135)
@@ -0,0 +1,28 @@
+package com.forgon.disinfectsystem.basedatamanager.departmentgroupOption.service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import net.sf.json.JSONArray;
+
+import com.forgon.disinfectsystem.entity.departmentGroupOption.DepartmentGroupOption;
+import com.forgon.disinfectsystem.entity.recycledepartmentgroup.DepartmentGroup;
+import com.forgon.tools.hibernate.BasePoManager;
+
+public interface DepartmentGroupOptionManager extends BasePoManager<DepartmentGroupOption> {
+	
+	/**
+	 * 按类型获得科室分组数据
+	 * @return List<Map<String, Object>> 
+	 */
+	List<Map<String, Object>> loadDeptGroupByType(String type);
+	
+	/**
+	 * 查找科室所属的科室分组。如果一个科室属于多个科室分组,返回第一个查找到的科室分组
+	 * @param departGroups 待查找的科室分组
+	 * @param departCode 科室编码
+	 * @return
+	 */
+	public DepartmentGroup findBelongTo(Collection<DepartmentGroup> departGroups,String departCode);
+}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroupOption/service/DepartmentGroupOptionManagerImpl.java
===================================================================
diff -u
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroupOption/service/DepartmentGroupOptionManagerImpl.java	(revision 0)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroupOption/service/DepartmentGroupOptionManagerImpl.java	(revision 25135)
@@ -0,0 +1,47 @@
+package com.forgon.disinfectsystem.basedatamanager.departmentgroupOption.service;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.map.HashedMap;
+
+import com.forgon.disinfectsystem.entity.departmentGroupOption.DepartmentGroupOption;
+import com.forgon.disinfectsystem.entity.recycledepartmentgroup.DepartmentGroup;
+import com.forgon.tools.hibernate.BasePoManagerImpl;
+import com.forgon.tools.util.ExtJsUtil;
+
+public class DepartmentGroupOptionManagerImpl extends BasePoManagerImpl<DepartmentGroupOption> implements DepartmentGroupOptionManager {
+
+	@Override
+	public DepartmentGroup findBelongTo(Collection<DepartmentGroup> departGroups, String departCode) {
+		if(CollectionUtils.isNotEmpty(departGroups)){
+			for(DepartmentGroup dg : departGroups){
+				Collection<String> departCodes = dg.departCodes();
+				if(CollectionUtils.isNotEmpty(departCodes) && departCodes.contains(departCode)){
+					return dg;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public List<Map<String, Object>> loadDeptGroupByType(String type) {
+		List<Map<String, Object>> groupList = new LinkedList<Map<String,Object>>();
+		List<DepartmentGroupOption> groups = this.getByProperty("type", type);
+		for (DepartmentGroupOption group : groups) {
+	        Map<String, Object> map = new HashedMap<>();
+	        map.put("name", group.getName());
+	        map.put("departCodes", group.getDepartCodes());
+			groupList.add(map);
+		}
+		return groupList;
+	}
+	
+}
Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
===================================================================
diff -u -r24838 -r25135
--- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 24838)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 25135)
@@ -666,6 +666,17 @@
 	}
 }
 
+/**
+ * 根据传过来的值来重新加载grid的dwr数据
+ * @param fieldValue 传过来的值
+ * @param domId dom节点的id
+ */
+function reloadConditionPara(fieldValue,domId){
+	var dom = document.getElementById(domId);
+	dom.value = fieldValue;
+	//刷新待审核物品列表
+	grid.dwrReload();
+}
 
 Ext.onReady(function() {
 	taskGroupObj = getTaskGroupObjByName($Id("parm_s_taskGroup").value);
@@ -1158,6 +1169,39 @@
 	    ]
 	});
 
+	/**
+	 * 科室分组数据
+	 */
+	var departmentGroupOptionStore = new Ext.data.Store({
+		proxy : new Ext.data.HttpProxy({
+			url : WWWROOT + '/disinfectSystem/baseData/departmentGroupOptionAction!loadDepartmentGroupOptiopnDataByType.do?type='+encodeURI(departmentGroupOption_REVIEWE),
+			method : 'POST'
+		}),
+		reader : new Ext.data.JsonReader({
+			totalProperty : 'totalCount',
+			root : 'data'
+		}, [
+		    {name : 'departCodes',mapping : 'departCodes'},
+		    {name : 'name',mapping : 'name'}
+		]),	
+		listeners: {
+			load:function(thiz,records){
+				record = Ext.data.Record.create([
+                           {name: "id", type: "string"},
+                           {name: "departCodes", type: "string"},
+                           {name: "name", type: "string"}
+				 ]);
+				var isAll = new record({
+					id: '',
+					departCodes: "",
+					name: "全部"
+				});
+				thiz.insert(0, isAll);
+			}
+		}
+	});
+
+	
 	var sign = true;
 	var tbar = [{
 		text : '进入审核列表',
@@ -1195,7 +1239,26 @@
 				grid.dwrReload();
 			});
 		}
-	}];
+	},'->',{
+		text : '科室分组:'
+	},{
+        xtype : 'combo',
+        id : 'departmentGroupOption_review',
+        name : 'departmentGroupOption_review',
+        editable:false,
+        valueField : 'departCodes',
+        displayField : 'name',
+        store : departmentGroupOptionStore,
+        forceSelection : true,
+        width: 100,
+        triggerAction : 'all',
+        anchor : '100%',
+		listeners : {
+			select: function(combo, record, index){
+				reloadConditionPara(combo.getValue(), 'parm_s_departCodesFilters');
+			}
+		}
+	 }];
 	
 	/** 未审核器械包 **/
 	grid = new Ext.ux.ForgonPageGrid({
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroupOption/departmentgroupOptionView.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroupOption/departmentgroupOptionView.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroupOption/departmentgroupOptionView.js	(revision 25135)
@@ -0,0 +1,72 @@
+var grid;
+
+function modify(v,data){
+	editConfig(data.id);
+}
+
+Ext.onReady(function() {
+	Ext.QuickTips.init();
+	
+	var columns = [
+	       	    {header : "id",dataIndex : 'id',hidden :true},
+	       	    {header : "名称",dataIndex : 'name',width : 150, renderer : modifyRecord},
+	       	    {id : 'departNames',header : "科室名称",sortable: false, dataIndex : 'departNames',menuDisabled: true}
+	       	];
+	
+	var filters = new Ext.grid.GridFilters({
+		filters : [
+			{type:'string',dataIndex:'name'}
+		]
+	});
+	var readerDetail = [
+	    {name : 'id'},
+	    {name : 'name'},
+	    {name : 'departNames'},
+	    {name : 'departCodes'}
+	];
+	
+	var tbar = [{
+		text : '添加',
+		hidden : SSTS_printApplication_manager,
+		iconCls : 'btn_ext_application_add',
+		handler : function() {
+			showWindow();
+		}
+	}, '-', {
+		text : '删除',
+		hidden : SSTS_printApplication_manager,
+		iconCls : 'btn_ext_application_del',
+		handler : function() {
+			deleteConfig(grid);
+		}
+	}];
+	var dwrCallParams = null;
+	Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function() {};
+	grid = new Ext.ux.ForgonPageGrid( {
+		tbar : tbar,
+		pageSize : 20,
+		defaultSortField : 'name',
+		defaultSortDirection : 'ASC',
+		title : departmentGroupType + "设置",
+		isCheckboxSelectionModel : true,
+		rememberSelected : false,
+		isShowSearchField : true,
+		columns : columns,
+		plugins : filters,
+		autoExpandColumn : 'departNames',
+		renderTo : 'gridDiv',
+		frame : false
+	}, readerDetail,
+	DepartmentGroupOptionTableManager.findGroupOptionTableList,
+		dwrCallParams // 这个参数只是占位作用
+	);
+	var viewport = new Ext.Viewport({
+		layout : 'border',
+		items : [{
+			region : 'center',
+			margins : '0 0 0 0',
+			layout : 'fit',
+			items : grid
+		}]
+	});
+});
\ No newline at end of file
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r24639 -r25135
--- ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 24639)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 25135)
@@ -682,6 +682,7 @@
             {hidden :SSTS_RecyclePrint_Menu || !((sstsConfig.hasOwnProperty('printInvoiceVersion')) && sstsConfig.printInvoiceVersion==2),text:"打印发货单设置",href:WWWROOT+'/disinfectsystem/printInvoiceConfig/printInvoiceConfigView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SupplyRoomType_manager,text:"标签模板管理",href:WWWROOT+'/disinfectsystem/labelTemplateDesign/labelTemplateView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_RecyclePrint_Menu,text:"回收科室分组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/departmentgroup/departmentgroupView.jsp',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_RecyclePrint_Menu,text:"审核科室分组设置",href:encodeURI(WWWROOT+'/disinfectsystem/basedatamanager/departmentgroupOption/departmentgroupOptionView.jsp?type='+departmentGroupOption_REVIEWE),hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_RecyclePrint_Menu,text:"物品科室共用配置",href:WWWROOT+'/disinfectsystem/goodsDepartShareConfig/goodsDepartShareConfigView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_UseRecordConvertConfig_Manager,text:"使用记录转换配置",href:WWWROOT+'/disinfectsystem/basedatamanager/useRecordConvertConfig/useRecordConvertConfigView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_RecyclePrint_Menu,text:"器械包回收备注设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=recycleItem_remark',hrefTarget:linkTarget,leaf:true},
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroupOption/departmentgroupOptionForm.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroupOption/departmentgroupOptionForm.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroupOption/departmentgroupOptionForm.js	(revision 25135)
@@ -0,0 +1,230 @@
+var configWin;
+var formPanel;
+
+function cancel() {
+	configWin.close();
+}
+function openSelectReceiverOrganization(departNames,codes){
+	var param = {
+		allowNull:true,
+		onlyOneOrg : true,
+		resultType:'code',
+		tabType : 'orgUnit',
+		sameLevel :'yes',
+		range : 'all',
+		departNames :departNames,
+		departCodes : codes
+	};
+	var selectedOrgUnitArray = openModalWindow(WWWROOT+"/common/selectOrgByExt.jsp",param, "800", "450");
+	var codes ='';
+    if(selectedOrgUnitArray != null&&selectedOrgUnitArray!=undefined){
+    	codes = '';
+    	var tem ='';
+    	var tempArray = selectedOrgUnitArray[0].split(';');
+    	for(var i=0;i<tempArray.length;i++){
+    		codes += tempArray[i]+";";
+	    }
+    	for(var j=0;j<codes.length-1;j++){
+    		tem += codes.charAt(j);
+    	}
+    	top.Ext4.getCmp("departNames").setValue(selectedOrgUnitArray[1]);
+    	top.Ext4.getCmp("departCodes").setValue(tem);
+    }
+}
+
+function editConfig(id){
+	showWindow(id);
+	if(!Ext4.isEmpty(id)){
+		var mask = new Ext4.LoadMask({
+		    msg    : '正在加载，请稍候...',
+		    target : formPanel
+		});
+		mask.show();
+		
+		Ext4.Ajax.request({
+			url : WWWROOT + '/disinfectSystem/baseData/departmentGroupOptionAction!loadConfigData.do',
+			params : {id : id},
+			success : function(response,options){
+				mask.hide();
+				var result = Ext4.JSON.decode(response.responseText);
+				if(result.success && result.data){
+					top.Ext4.ComponentQuery.query("#configForm #id")[0].setValue(result.data.id);
+					top.Ext4.ComponentQuery.query("#configForm #name")[0].setValue(result.data.name);
+					top.Ext4.ComponentQuery.query("#configForm #departCodes")[0].setValue(result.data.departCodes);
+					top.Ext4.ComponentQuery.query("#configForm #departNames")[0].setValue(result.data.departNames);
+				}else{
+					showResult('系统加载出错，请稍候再试');
+				}
+			},
+			failure : function(response, options) {
+				mask.hide();
+				showResult('系统加载出错，请稍候再试');
+			}
+		});
+	}
+}
+function deleteConfig(grid){
+	var selectedRecords = grid.getSelectionModel().getSelections();
+	var selectedCount = grid.getSelectionModel().getCount();
+	var ids = "";
+	if(selectedCount < 1){
+		showResult("请选择要删除的行");
+	}else{
+		for ( var i = 0, len = selectedRecords.length; i < len; i++) {
+			if (ids == "") {
+				ids = selectedRecords[i].data['id'];
+			} else {
+				ids = ids + ';' + selectedRecords[i].data['id'];
+			}
+		}
+		Ext4.MessageBox.confirm("请确认","确定要删除选中的信息吗？",
+				function(button, text) {
+					if ("yes" == button){
+						Ext4.Ajax.request({
+							url : WWWROOT + '/disinfectSystem/baseData/departmentGroupOptionAction!deleteDepartmentGroupOptiopn.do',
+							params : {ids : ids},
+							success : function(response, options) {
+								var result = Ext4.JSON.decode(response.responseText);
+								var success = result.success;
+								if (true != success) {
+									showResult("删除失败");
+									return;
+								} else {
+									showResult('删除成功!');
+									grid.dwrReload();
+								}
+							},
+							failure : function(response, options) {
+								showResult("删除失败");
+							}
+						});
+					}
+				});
+	}
+}
+
+function saveConfig(){
+	formPanel.form.submit({
+		url : WWWROOT + '/disinfectSystem/baseData/departmentGroupOptionAction!saveDepartmentGroupOption.do',
+		method : 'POST',
+		waitMsg : '正在保存数据，请稍候',
+		timeout : 600000,
+		waitTitle : '提交表单',
+		success : function(form, action) {
+			configWin.close();
+			showResult('保存成功');
+			grid.dwrReload();
+		},
+		failure : function(form, action) {
+			showResult('failure = ' + action.failureType);
+		}
+	});
+}
+
+function showWindow(id){
+	
+	 formPanel = new top.Ext4.form.Panel({
+		id : 'configForm',
+		frame : true,
+		labelSeparator : ':',
+		bodyStyle : 'padding:5px 5px 0px 5px;',
+		width : 800,
+		fieldDefaults: {
+	        labelAlign: 'left',
+	        labelWidth: 200
+	    },
+		items : [{
+			xtype : 'hidden',
+			id:'departCodes',
+			name:'departCodes'
+		},{
+			xtype : 'hidden',
+			id:'id',
+			name:'id'
+		},{
+			xtype : 'hidden',
+			id:'type',
+			name:'type',
+			value: departmentGroupType
+		},{
+			xtype:"fieldset", 
+			title :'基础信息', 
+			height:500,
+			items:[{
+				layout : 'column',
+				labelWidth : 170,
+				items : [{
+					columnWidth : .8,
+					layout : 'form',
+					items : [{
+						xtype : 'textfield',
+						fieldLabel : '名称',
+						id : 'name',
+						name : 'name',
+						allowBlank : false,
+						anchor : '98%'
+					},{
+						xtype : 'textarea',
+						fieldLabel : '科室',
+						id : 'departNames',
+						name : 'departNames',
+						height : 230,
+						allowBlank : false,
+						readOnly:true,
+						anchor : '98%'
+					}]
+				},{
+					columnWidth : .2,
+					layout : 'form',
+					items : [{
+						xtype : 'button',
+						text : '选择科室',
+						listeners:{
+							click : function(){
+								var departName = top.Ext4.getCmp('departNames').getValue();
+								var codes = top.Ext4.getCmp("departCodes").getValue();;
+								openSelectReceiverOrganization(departName,codes);
+							} 								
+						}
+					}]
+				}]
+			}]
+		}]
+	 ,
+		buttons : [{
+			id : 'saveBtn',
+			text : '保存',
+			hidden:false,
+			handler : function(){
+				if(formPanel.getForm().isValid()){
+					saveConfig();
+				}else{
+					showResult('请填写表单！');
+					return false;
+				}
+			}
+		}, {
+			text : '取消',
+			id : 'saveAndNewBtn',
+			handler : cancel
+		}]
+	});
+	 configWin = new top.Ext4.window.Window({
+		 id : 'satisfactionSurveyApplicationWin',
+			layout : 'border',
+			title : departmentGroupType+"设置",
+			width : 800,
+			height : 500,
+			border : false,
+			plain : true,
+			modal :true,
+			items : [{
+				region:'center',
+				width : 400,
+			    layout :'fit',
+				items:[formPanel]
+			}]
+	});
+	configWin.show();
+}
+
Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp
===================================================================
diff -u -r21618 -r25135
--- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp	(.../reviewView.jsp)	(revision 21618)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp	(.../reviewView.jsp)	(revision 25135)
@@ -4,6 +4,7 @@
 <%@ page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance" %>
 <%@ page import="com.forgon.disinfectsystem.entity.basedatamanager.container.Container" %>
 <%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
+<%@page import="com.forgon.disinfectsystem.entity.departmentGroupOption.DepartmentGroupOption"%>
 <%@ include file="/common/taglibs.jsp"%>
 <html>
 <head>
@@ -51,6 +52,8 @@
 <link rel="stylesheet" type="text/css" href="${ctx}/ext/fontSize${fontSize}/treepanel/resources/css/column-tree.css" />
 
 <script type="text/javascript">
+var departmentGroupOption_REVIEWE = '<%=DepartmentGroupOption.TYPE_GROUP_REVIEWE%>';//审核科室分组
+
 var SSTS_QualityRecord_Create = true;
 <operation:authorize ifAnyGranted="SSTS_QualityRecord_Create">
 SSTS_QualityRecord_Create = false;
@@ -72,6 +75,7 @@
 <input type="hidden" id="userName" value="${userName}">
 <form name="parametersFrm">
     <input type="hidden" id="parm_s_taskGroup" name="parm_s_taskGroup" value="${param.taskGroup}">
+    <input type="hidden" id="parm_s_departCodesFilters" name="parm_s_departCodesFilters" value=""><!-- 待审核物品：科室分组过滤用 -->
 </form>
 </body>
 <object id="LODOP" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0> 
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroupOption/departmentgroupOptionView.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroupOption/departmentgroupOptionView.jsp	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroupOption/departmentgroupOptionView.jsp	(revision 25135)
@@ -0,0 +1,58 @@
+<%@page import="java.util.Date"%>
+<%@page import="java.text.SimpleDateFormat"%>
+<%@ page contentType="text/html; charset=UTF-8"%>
+<%@ include file="/common/taglibs.jsp"%>
+<%
+    request.setAttribute("userName",AcegiHelper.getLoginUser().getUserFullName());
+    request.setAttribute("orgunit",AcegiHelper.getLoginUser().getCurrentOrgUnitName());
+    request.setAttribute("orgUnitCoding",AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig());
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+    request.setAttribute("today", dateFormat.format(new Date()));
+%>
+
+<html>
+<head>
+<%@ include file="/common/includeExtJsAndCss.jsp"%>
+<%@ include file="/common/includeExtJs4_2.jsp"%>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<body>
+<script type="text/javascript" src="${ctx}/js/common.js" /></script>
+<script type="text/javascript" src="${ctx }/ext/grid/ForgonGrid.js"></script>
+<script type="text/javascript" src="${ctx }/dwr/interface/DepartmentGroupOptionTableManager.js"></script>
+<script type="text/javascript" src="${ctx }/dwr/engine.js"></script>
+<script type="text/javascript" src="${ctx }/dwr/util.js"></script>
+<script type="text/javascript" src="departmentgroupOptionView.js"></script>
+ <script type="text/javascript" src="departmentgroupOptionForm.js"></script> 
+<script type="text/javascript">
+//科室分组类型
+var departmentGroupType = '${param.type}';
+
+var SSTS_printApplication_manager = true;
+<operation:authorize ifAnyGranted="SSTS_printApplication_manager">
+SSTS_printApplication_manager = false;
+</operation:authorize>
+
+
+</script>
+
+<input type="hidden" id="userName" value="${userName}">
+<input type="hidden" id="orgunit" value="${orgunit}">
+<input type="hidden" id="orgUnitCoding" value="${orgUnitCoding}">
+<input type="hidden" id="today" value="${today}">
+
+
+<table height="100%;" width="100%" border="0" align="center"
+    cellpadding="0" cellspacing="0">
+    <tr height="100%;">
+        <td colspan="2">
+        <div id="gridDiv" style="height: 100%;"></div>
+        </td>
+    </tr>
+</table>
+ <form name="parametersFrm">
+    <input type="hidden" id="parm_s_type" name="parm_s_type" value="${param.type}">
+</form>
+
+</body>
+</html>
\ No newline at end of file
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
===================================================================
diff -u -r23825 -r25135
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 23825)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 25135)
@@ -26,6 +26,7 @@
 import org.apache.http.impl.cookie.DateParseException;
 import org.apache.http.impl.cookie.DateUtils;
 import org.apache.log4j.Logger;
+import org.apache.poi.util.StringUtil;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.forgon.component.grid.GridManager;
@@ -649,14 +650,17 @@
 	 */
 	public String findUnReviewedTousseInstanceList(
 			Map<String, List<String>> parameterMap) {
-		Map<String, String> sqlWhereParamMap = gridManager
-				.getParamFromView(parameterMap);
-		
+		Map<String, String> sqlWhereParamMap = gridManager.getParamFromView(parameterMap);
+		//
 		StringBuilder sqlBuilder = new StringBuilder(String.format(" WHERE po.status = '%s'", TousseInstance.STATUS_PACKED));
+		sqlBuilder.append(String.format(" AND po.orgUnitCoding = '%s'", AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig()));
+		//科室分组过滤条件
+		String departCodesFilters = sqlWhereParamMap.get("departCodesFilters");
+		if(StringUtils.isNotBlank(departCodesFilters)){
+			Collection<String> departCodesList = StringTools.toCollectionIgnoreNullAndBlank(departCodesFilters,";");
+			sqlBuilder.append(String.format(" AND %s ", SqlUtils.getStringFieldInLargeCollectionsPredicate("po.departCoding", departCodesList)));
+		}
 
-		sqlBuilder.append(String.format(" AND po.orgUnitCoding = '%s'", AcegiHelper.getLoginUser()
-				.getOrgUnitCodingFromSupplyRoomConfig()));
-		
 		//任务组的条件先注释,因为现在任务组的条件不再从tousseDefinition获取,而是从CssdHandleTousses配置表获取,。
 		//CssdHandleTousses与其它实体并未建立关联关系,所以不能使用hql,条件放到gridManager实现类的方法里的sql语句加上
 		/*String taskGroup = sqlWhereParamMap.get("taskGroup");
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroupOption/action/DepartmentGroupOptionAction.java
===================================================================
diff -u
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroupOption/action/DepartmentGroupOptionAction.java	(revision 0)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroupOption/action/DepartmentGroupOptionAction.java	(revision 25135)
@@ -0,0 +1,136 @@
+package com.forgon.disinfectsystem.basedatamanager.departmentgroupOption.action;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import net.sf.json.JSONObject;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.apache.struts2.convention.annotation.Action;
+import org.apache.struts2.convention.annotation.Namespace;
+import org.apache.struts2.convention.annotation.ParentPackage;
+
+import com.forgon.disinfectsystem.basedatamanager.departmentgroupOption.service.DepartmentGroupOptionManager;
+import com.forgon.disinfectsystem.entity.departmentGroupOption.DepartmentGroupOption;
+import com.forgon.tools.StrutsParamUtils;
+import com.forgon.tools.StrutsResponseUtils;
+import com.forgon.tools.db.DatabaseUtil;
+import com.forgon.tools.util.PageUtil;
+import com.forgon.tools.util.SqlUtils;
+import com.opensymphony.xwork2.ModelDriven;
+import com.opensymphony.xwork2.Preparable;
+
+
+@ParentPackage(value = "default")
+@Namespace(value = "/disinfectSystem/baseData")
+@Action(value = "departmentGroupOptionAction")
+public class DepartmentGroupOptionAction implements ModelDriven<DepartmentGroupOption>, Preparable {
+
+	private DepartmentGroupOption departmentGroupOption;
+
+	private DepartmentGroupOptionManager departmentGroupOptionManager;
+
+	protected final Logger logger = Logger.getLogger(this.getClass());
+
+	public void setDepartmentGroupOptionManager(
+			DepartmentGroupOptionManager departmentGroupOptionManager) {
+		this.departmentGroupOptionManager = departmentGroupOptionManager;
+	}
+
+	public DepartmentGroupOption getDepartmentGroup() {
+		return departmentGroupOption;
+	}
+
+	public void setDepartmentGroup(DepartmentGroupOption departmentGroupOption) {
+		this.departmentGroupOption = departmentGroupOption;
+	}
+
+	@Override
+	public void prepare() throws Exception {
+		try {
+			String id = StrutsParamUtils.getPraramValue("id", "");
+			if (DatabaseUtil.isPoIdValid(id)) {
+				departmentGroupOption = departmentGroupOptionManager.get(id);
+			} else {
+				departmentGroupOption = new DepartmentGroupOption();
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	public DepartmentGroupOption getModel() {
+		return departmentGroupOption;
+	}
+	
+	/**
+	 * 保存科室分组设置
+	 */
+	public void saveDepartmentGroupOption() {
+		try {
+			departmentGroupOptionManager.save(departmentGroupOption);
+			StrutsResponseUtils.output(true);
+		} catch (Exception e) {
+			e.printStackTrace();
+			StrutsResponseUtils.output(false,e.getMessage());
+		}
+	}
+	
+	/**
+	 * 删除科室分组设置
+	 * @param ids 科室分组ids 示例：1或者1;2;3 
+	 */
+	public void deleteDepartmentGroupOptiopn() {
+		String idStr = StrutsParamUtils.getPraramValue("ids", "");
+		try {
+			if (StringUtils.isNotBlank(idStr)) {
+				String[] str = idStr.split(";");
+				for (String id : str) {
+					DepartmentGroupOption group = departmentGroupOptionManager.get(id);
+					departmentGroupOptionManager.delete(group);
+				}
+				StrutsResponseUtils.output(true);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			StrutsResponseUtils.output(false,e.getMessage());
+		}
+	}
+	
+	/**
+	 * 返回科室分组数据
+	 * （prepare()获得的科室分组对象）
+	 */
+	public void loadConfigData(){
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("success", true);
+		if(departmentGroupOption != null){
+			map.put("data", departmentGroupOption);
+		}		
+		try {
+			StrutsResponseUtils.output(JSONObject.fromObject(map));
+		} catch (Exception e) {
+			e.printStackTrace();
+			StrutsResponseUtils.output(false);
+		}
+	}
+
+	/**
+	 * 根据类型获取科室分组数据
+	 */
+	public void loadDepartmentGroupOptiopnDataByType(){
+		String type = StrutsParamUtils.getPraramValue("type", "");
+		try {
+			PageUtil.outPutResult(PageUtil.getPagePara(), departmentGroupOptionManager.loadDeptGroupByType(type));
+		}
+		catch (Exception e) {
+			e.printStackTrace();
+			StrutsResponseUtils.output(false);
+		}
+	}
+	
+}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/departmentGroupOption/DepartmentGroupOption.java
===================================================================
diff -u
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/departmentGroupOption/DepartmentGroupOption.java	(revision 0)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/departmentGroupOption/DepartmentGroupOption.java	(revision 25135)
@@ -0,0 +1,93 @@
+package com.forgon.disinfectsystem.entity.departmentGroupOption;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Lob;
+import javax.persistence.Table;
+
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+
+import com.forgon.tools.string.StringTools;
+
+
+/**
+ * 科室分组设置
+ */
+@Entity
+@DynamicInsert(false)
+@DynamicUpdate(true)
+@Table(name = "departmentGroupOption")
+@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
+public class DepartmentGroupOption {
+	
+	public static final String TYPE_GROUP_REVIEWE = "审核科室分组";
+	
+	private Long id;
+	/**
+	 * 科室分组名称
+	 */
+	private String name;
+	/**
+	 * 每个名称负责的科室编码，科室编码之间以;号隔开
+	 */
+	private String departCodes;
+	/**
+	 * 科室名称
+	 */
+	private String departNames;
+	/**
+	 * 科室分组类型
+	 */
+	private String type;
+	
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getDepartCodes() {
+		return departCodes;
+	}
+
+	public void setDepartCodes(String departCodes) {
+		this.departCodes = departCodes;
+	}
+
+	public String getDepartNames() {
+		return departNames;
+	}
+
+	public void setDepartNames(String departNames) {
+		this.departNames = departNames;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroupOption/dwr/table/DepartmentGroupOptionTableManager.java
===================================================================
diff -u
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroupOption/dwr/table/DepartmentGroupOptionTableManager.java	(revision 0)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroupOption/dwr/table/DepartmentGroupOptionTableManager.java	(revision 25135)
@@ -0,0 +1,76 @@
+package com.forgon.disinfectsystem.basedatamanager.departmentgroupOption.dwr.table;
+
+import java.util.List;
+import java.util.Map;
+
+import com.forgon.component.grid.GridManager;
+import com.forgon.disinfectsystem.entity.departmentGroupOption.DepartmentGroupOption;
+import com.forgon.disinfectsystem.entity.recycledepartmentgroup.DepartmentGroup;
+import com.forgon.tools.hibernate.ObjectDao;
+import com.forgon.tools.util.SqlUtils;
+
+import org.apache.commons.lang.StringUtils;
+
+public class DepartmentGroupOptionTableManager {
+	
+	private GridManager gridManager;
+	
+	private ObjectDao objectDao;
+	
+	public void setObjectDao(ObjectDao objectDao) {
+		this.objectDao = objectDao;
+
+	}
+	public void setGridManager(GridManager gridManager) {
+		this.gridManager = gridManager;
+	}
+
+	public String findGroupOptionTableList(Map<String, List<String>> parameterMap) {
+		Map<String, String> sqlWhereParamMap = gridManager.getParamFromView(parameterMap);
+		String sql = "where 1=1 ";
+		//科室分组类型
+		String type = sqlWhereParamMap.get("type");
+		if(StringUtils.isNotBlank(type)){
+			sql += String.format(" and %s ",SqlUtils.getStringFieldPredicate("po.type", type));
+		}
+		return gridManager.renderGrid(parameterMap,
+				DepartmentGroupOption.class.getSimpleName(),sql, new String[] {});
+	}
+	
+//	public void moveUpRecord(String number){
+//		Integer numberOrder = Integer.parseInt(number);
+//		if(numberOrder>1){
+//			DepartmentGroup currentprintConfig = (DepartmentGroup) objectDao.getByProperty(DepartmentGroup.class.getSimpleName()
+//					, "orderNum", numberOrder);
+//			currentprintConfig.setOrderNum(numberOrder-1);
+//			
+//			DepartmentGroup printConfig = (DepartmentGroup) objectDao.getByProperty(DepartmentGroup.class.getSimpleName()
+//					, "orderNum", numberOrder-1);
+//			printConfig.setOrderNum(printConfig.getOrderNum()+1);
+//			
+//			objectDao.saveOrUpdate(currentprintConfig);
+//			objectDao.saveOrUpdate(printConfig);
+//		}
+//	}
+//	
+//	public void moveDownRecord(String number){
+//		
+//		Integer numberOrder = Integer.parseInt(number);
+//		
+//		DepartmentGroup printConfig = (DepartmentGroup) objectDao.getByProperty(DepartmentGroup.class.getSimpleName()
+//				, "orderNum", numberOrder+1);
+//		
+//		if(printConfig != null){
+//			DepartmentGroup currentPrintConfig = (DepartmentGroup) objectDao.
+//					getByProperty(DepartmentGroup.class.getSimpleName()
+//							, "orderNum", numberOrder);
+//			currentPrintConfig.setOrderNum(numberOrder+1);
+//			
+//			printConfig.setOrderNum(printConfig.getOrderNum()-1);
+//			
+//			objectDao.saveOrUpdate(currentPrintConfig);
+//			objectDao.saveOrUpdate(printConfig);
+//		}
+//	}
+	
+}
Index: ssts-web/src/main/webapp/homepage/menu.jsp
===================================================================
diff -u -r24639 -r25135
--- ssts-web/src/main/webapp/homepage/menu.jsp	(.../menu.jsp)	(revision 24639)
+++ ssts-web/src/main/webapp/homepage/menu.jsp	(.../menu.jsp)	(revision 25135)
@@ -1,6 +1,7 @@
 <%@page import="com.forgon.disinfectsystem.entity.stocktakemanager.InventoryRecord"%>
 <%@page import="com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsGodownEntry"%>
 <%@page import="com.forgon.disinfectsystem.entity.assestmanagement.Contract"%>
+<%@page import="com.forgon.disinfectsystem.entity.departmentGroupOption.DepartmentGroupOption"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ include file="/common/taglibs.jsp"%>
 <script type="text/javascript" src="${ctx}/js/common.js"></script>
@@ -29,6 +30,9 @@
 var inventoryTypeCodeDisposableGoods = '<%=InventoryRecord.TYPECODE_DISPOSABLEGOODS %>';
 var inventoryTypeCodeExpensiveGoods = '<%=InventoryRecord.TYPECODE_EXPENSIVEGOODS %>';
 
+//科室分组设置类型(审核)
+var departmentGroupOption_REVIEWE = '<%=DepartmentGroupOption.TYPE_GROUP_REVIEWE%>';//审核科室分组
+
 /*控制面版*/
 var System_Manage_Menu = true;
 <operation:authorize ifAnyGranted="System_Orgunit_Select,System_User_Select,System_Role_Select,System_Log_Select,System_Log_Delete">
Index: ssts-web/src/main/webapp/WEB-INF/dwr.xml
===================================================================
diff -u -r23608 -r25135
--- ssts-web/src/main/webapp/WEB-INF/dwr.xml	(.../dwr.xml)	(revision 23608)
+++ ssts-web/src/main/webapp/WEB-INF/dwr.xml	(.../dwr.xml)	(revision 25135)
@@ -10,6 +10,10 @@
       <param name="beanName" value="beCleanItemTableManager"/>
     </create>
     
+    <create creator="spring" javascript="DepartmentGroupOptionTableManager">
+      <param name="beanName" value="departmentGroupOptionTableManager"/>
+    </create>
+    
     <create creator="spring" javascript="DepartmentGroupTableManager">
       <param name="beanName" value="departmentGroupTableManager"/>
     </create>