Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
===================================================================
diff -u -r36988 -r37869
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 36988)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 37869)
@@ -33,7 +33,7 @@
 request.setAttribute("today", dateFormat.format(new Date()));
 
 DepartmentGroupManager departmentGroupManager = (DepartmentGroupManager)SpringBeanManger.getBean("departmentGroupManager");
-List<DepartmentGroup> groups = departmentGroupManager.getAll();
+List<DepartmentGroup> groups = departmentGroupManager.getAllOfCurrentHandleDepartOrNoHaveHandleDepart();
 request.setAttribute("departmentGroups", groups);
 
 TousseGroupManager tousseGroupManager = (TousseGroupManager)SpringBeanManger.getBean("tousseGroupManager");
@@ -425,11 +425,8 @@
     	<input name="" type="hidden" value="" id="inputselect"/>
     	<div id="divselect">
 		      <cite class='filter'>科室分组</cite>
-		      <ul>
-		      	<li><a href="javascript:filterApplication();" id="" selectid="">全部</a></li>
-			      <c:forEach items="${departmentGroups}" var="item">
-							<li><a href="javascript:filterApplication();" id="item${item.id }" selectid="${item.id}">${item.name}</a></li>
-						</c:forEach>
+		      <ul id="divselectUl">
+		      	
 		      </ul>
  		</div>
  		
@@ -504,11 +501,8 @@
 		<input name="" type="hidden" value="" id="inputTypeSelect"/>
 		<div id="divDepartGroupSelect">
 			<cite class='filter'>科室分组</cite>
-		      <ul>
-		      	<li><a href="javascript:setHisDepartGroupId();" id="" selectid="">全部</a></li>
-			      <c:forEach items="${departmentGroups}" var="item">
-							<li><a href="javascript:setHisDepartGroupId('${item.id}','${item.name}');" id="item${item.id }" selectid="${item.id}">${item.name}</a></li>
-						</c:forEach>
+		      <ul id="divDepartGroupSelectUl">
+		      	
 		      </ul>
 	   </div>
     	<div id="divStatusSelect">
@@ -590,6 +584,36 @@
 		width: 100%;
 	}
 </style>
+<script>
+	//ZSRY-74：【回收清点】的“科室分组控件优化
+	var departmentGroups = '${departmentGroups}';
+	var names = [];
+	var ids = [];
+	<c:forEach items="${departmentGroups}" var="item">
+		var name = '${item.name}';
+		var id = '${item.id}';
+		names.push(name);
+		ids.push(id);
+	</c:forEach>
+	var divselectUl_maxWidth = 260;
+	var divselectUlHtml = '<li><a href="javascript:filterApplication();" selectid="">全部</a></li>';
+	var divDepartGroupSelectUlHtml = '<li><a href="javascript:setHisDepartGroupId();" selectid="">全部</a></li>';
+	for(var i=0;i<names.length;i++){
+		var name = names[i];
+		if(name.length > 8 && name.length <= 20){
+			divselectUl_maxWidth += (name.length - 8) * 32;
+		}else if(name.length > 20){
+			divselectUl_maxWidth += 13 * 32;
+			name = name.slice(0,20) + '...';
+		}
+		divselectUlHtml += '<li><a href="javascript:filterApplication();" id="item'+ids[i]+'" selectid="'+ids[i]+'">'+name+'</a></li>';
+		divDepartGroupSelectUlHtml += '<li><a href="javascript:setHisDepartGroupId('+ids[i]+',\''+name+'\');" id="item'+ids[i]+'" selectid="'+ids[i]+'">'+name+'</a></li>';
+	}
+	document.getElementById('divselectUl').innerHTML = divselectUlHtml;
+	document.getElementById('divDepartGroupSelectUl').innerHTML = divDepartGroupSelectUlHtml;
+	document.getElementById('divselectUl').style.width = divselectUl_maxWidth+'px';
+	document.getElementById('divDepartGroupSelectUl').style.width = divselectUl_maxWidth+'px';
+</script>
 </body>
 <jsp:include page="../../videoMonitor/common/heartbeatRequestCommon.jsp">
 	<jsp:param value="<%=Workstation.TRIGGERMODULE_RECYCLING %>" name="module"/>
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupForm.js
===================================================================
diff -u -r35760 -r37869
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupForm.js	(.../departmentgroupForm.js)	(revision 35760)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupForm.js	(.../departmentgroupForm.js)	(revision 37869)
@@ -18,6 +18,9 @@
 					top.Ext.getCmp('departCodes').setValue(result.data.departCodes);
 					top.Ext.getCmp('departNames').setValue(result.data.departNames);
 					top.Ext.getCmp('prepareRecycleType').setValue(result.data.prepareRecycleType);
+					//ZSRY-74：处理科室
+					top.Ext.getCmp('handleDepartName').setValue(result.data.handleDepartName);
+					top.Ext.getCmp('handleDepartCode').setValue(result.data.handleDepartCode);
 					if (sstsConfig.enableNotifiOfPrepareRecycleFunction && sstsConfig.limitOneOperationRoomCanOnlyRegistOneUnAuditedUseRecord) {
 						if (result.data.prepareRecycleType == '预回收') {
 							top.Ext.getCmp('warningUserNamesBox').show();
@@ -103,8 +106,8 @@
 		warningWays = warningWays.substring(0, warningWays.length - 1);
 	}
 
-	if(warningUserNames !== '' && warningWays == ''){
-		showResult('请至少选择一种提醒方式!');return
+	if (warningUserNames !== '' && warningWays == '') {
+		showResult('请至少选择一种提醒方式!'); return
 	}
 
 	top.Ext.getCmp('warningWays').setValue(warningWays);
@@ -133,6 +136,19 @@
 		data: [['', '空白'], ['预回收', '预回收'], ['器械交接', '器械交接']]
 	});
 
+	var handleDepartStore = new top.Ext.data.Store({
+		autoLoad: false,
+		proxy: new top.Ext.data.HttpProxy({
+			url: WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfigRoom.do',
+			method: 'POST'
+		}),
+		reader: new top.Ext.data.JsonReader({
+			fields: [
+				{ name: 'departId' },
+				{ name: 'name' }]
+		})
+	});
+
 	formPanel = new top.Ext.FormPanel({
 		id: 'configForm',
 		frame: true,
@@ -159,6 +175,10 @@
 			id: 'warningWays',
 			name: 'warningWays'
 		}, {
+			xtype: 'hidden',
+			id: 'handleDepartCode',
+			name: 'handleDepartCode'
+		}, {
 			xtype: "fieldset",
 			title: '基础信息',
 			height: 400,
@@ -177,6 +197,26 @@
 						anchor: '98%'
 					}, {
 						xtype: 'combo',
+						fieldLabel: '处理科室',
+						id: 'handleDepartName',
+						name: 'handleDepartName',
+						valueField: 'name',
+						displayField: 'name',
+						store: handleDepartStore,
+						forceSelection: true,
+						lazyInit: true,
+						triggerAction: 'all',
+						typeAhead: false,
+						editable: false,
+						anchor: '98%',
+						allowBlank: true,
+						listeners: {
+							select: function (combo, record, index) {
+								top.Ext.getCmp('handleDepartCode').setValue(record.data.departId);
+							}
+						}
+					}, {
+						xtype: 'combo',
 						fieldLabel: '预回收属性',
 						id: 'prepareRecycleType',
 						name: 'prepareRecycleType',
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupView.js
===================================================================
diff -u -r35611 -r37869
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupView.js	(.../departmentgroupView.js)	(revision 35611)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupView.js	(.../departmentgroupView.js)	(revision 37869)
@@ -13,8 +13,8 @@
 	}
 	
 	var columns = [
-		{header : "id",dataIndex : 'id',hidden :true},
 		{header : "名称",dataIndex : 'name',width : 150, renderer : modifyRecord},
+		{header : "处理科室",dataIndex : 'handleDepartName',width : 100},
 		{header : "pda回收通知人",dataIndex : 'warningUserNames',width : 150,hidden:!showColumn},
 		{header : "提醒方式",dataIndex : 'warningWays',width : 230,hidden:!showColumn},
 		{id : 'departNames',header : "科室名称",dataIndex : 'departNames',sortable:false}
@@ -32,6 +32,7 @@
 	    {name : 'departCodes'},
 		{name : 'warningUserNames'},
 		{name : 'warningWays'},
+		{name : 'handleDepartName'},
 	    {name : 'orderNum'}
 	];
 	
@@ -65,6 +66,7 @@
 		plugins : filters,
 		autoExpandColumn : 'departNames',
 		renderTo : 'gridDiv',
+		searchDisableIndexes: ['handleDepartName','warningUserNames'],
 		frame : false
 	}, readerDetail,
 	DepartmentGroupTableManager.findGroupTableList,