Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
===================================================================
diff -u -r20067 -r20070
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 20067)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 20070)
@@ -185,5 +185,7 @@
   //同步入库单失效时期默认值，添加3年
   defaultExpDate:3,
   //是否启用快速回收一键入筐功能
-  recycleAllTousseIntoBasketInExpressRecycle:true
+  recycleAllTousseIntoBasketInExpressRecycle:true,
+  //待回收界面是否启用器械包分组过滤。与记住回收人的控件位置上重叠，所以同一个项目只能有一个启用
+  enableTousseGroupFilterInAwaitRecycling:true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
===================================================================
diff -u -r20064 -r20070
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 20064)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 20070)
@@ -1,3 +1,5 @@
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.tousseGroup.TousseGroup"%>
+<%@page import="com.forgon.disinfectsystem.basedatamanager.tousseGroup.service.TousseGroupManager"%>
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.container.Container"%>
 <%@page import="com.forgon.disinfectsystem.entity.recycledepartmentgroup.DepartmentGroup"%>
 <%@page import="java.util.List"%>
@@ -37,6 +39,11 @@
 DepartmentGroupManager departmentGroupManager = (DepartmentGroupManager)SpringBeanManger.getBean("departmentGroupManager");
 List<DepartmentGroup> groups = departmentGroupManager.getAll();
 request.setAttribute("departmentGroups", groups);
+
+TousseGroupManager tousseGroupManager = (TousseGroupManager)SpringBeanManger.getBean("tousseGroupManager");
+List<TousseGroup> tousseGroups = tousseGroupManager.getAll();
+request.setAttribute("tousseGroups", tousseGroups);
+
 boolean isTouchScreen = false;
 String logonType = (String)session.getAttribute("logonType");
 if(logonType != null){
@@ -93,6 +100,13 @@
 #divStatusSelect ul li a{display:block;font-size:30px; height:60px; color:#333333; text-decoration:none; padding-left:10px; padding-right:10px;}
 #divStatusSelect ul li a:hover{background-color:#CCC;}
 
+#divTousseGroup{width:180px; margin:-52px 480px auto; position:relative; z-index:10000;}
+#divTousseGroup cite{width:180px; height:50px;line-height:50px;font-size:26px; display:block; color:#FFFFFF; cursor:pointer;font-style:normal;padding-left:4px; padding-right:30px; border:1px solid #333333;background:url(xjt.png) no-repeat right center;}
+#divTousseGroup ul{width:200px;border:1px solid #333333; background-color:#ffffff; position:absolute; z-index:20000; margin-top:-1px; display:none;}
+#divTousseGroup ul li{height:60px; line-height:60px;}
+#divTousseGroup ul li a{display:block;font-size:30px; height:60px; color:#333333; text-decoration:none; padding-left:10px; padding-right:10px;}
+#divTousseGroup ul li a:hover{background-color:#CCC;}
+
 #rememberRecycleUser{width:212px; margin:-50px 490px auto; position:relative; z-index:10000;}
 #rememberCheckBox{
  width: 60px;
@@ -427,6 +441,12 @@
 	if(sstsConfig.showRememberRecycleUserButton == true){
 		$("#rememberRecycleUser").show();
 	}
+	$.divselect("#divTousseGroup","#tousseGroupSelect");
+	if(sstsConfig.enableTousseGroupFilterInAwaitRecycling){
+		$('#divTousseGroup').show();
+	}else{
+		$('#divTousseGroup').hide();
+	}
 	
 	if(sstsConfig.enablePackingSerialNum){
 		$("#packingTaskSerialNum").show();
@@ -920,20 +940,26 @@
 	var txt = $("#item" + id).text();
 	var appType = $("#appTypeSelect").val();
 	var applyTimeOrder = $("#applyTimeOrder").val();
+	//按器械包分组过滤
+	var selectTousseGroupId = $('#tousseGroupSelect').val();
 	CookieManager.setCookie("groupId",id);
 	CookieManager.setCookie("groupText",txt);
 	CookieManager.setCookie("appType",appType);
+	CookieManager.setCookie("tousseGroupId",selectTousseGroupId);
+	
 	var orgUnitCoding =  CookieManager.getCookie("applyDepartCode");
 	var operationRoom = CookieManager.getCookie("operationRoom");
 	loadApplicationData(id,appType,applyTimeOrder,orgUnitCoding,operationRoom,false);
 }
 
 function loadApplicationData(groupId,appType,applyTimeOrder,orgUnitCoding,operationRoom,isOpenApplication,orgUnitName){
+	var tousseGroupId = CookieManager.getCookie("tousseGroupId");
 	$.ajax({
         type:'post',
         url:WWWROOT + '/disinfectSystem/recyclingRecordAction!getAwaitForRecyclingInvoicePlan.do',
         dataType:'json',
         data : {
+        	tousseGroupId : tousseGroupId,
         	groupId : "" + groupId + "",
         	appType:"" + appType + "",
         	applyTimeOrder:"" + applyTimeOrder + "",
@@ -1177,6 +1203,17 @@
 		      </ul>
  		</div>
  		
+ 		<input name="" type="hidden" value="" id="tousseGroupSelect"/>
+		<div id="divTousseGroup">
+		    <cite>按器械包分组过滤</cite>
+		    <ul>
+	      	    <li><a href="javascript:filterApplication();" id="" selectid="">全部</a></li>
+		        <c:forEach items="${tousseGroups}" var="item">
+	                <li><a href="javascript:filterApplication();" id="tousseGroup${item.id }" selectid="${item.id}">${item.tousseGroupName}</a></li>
+	      		</c:forEach>
+		    </ul>
+		</div>
+		
  		<div id="rememberRecycleUser" style="display: none;">
 		     <p style="color:white;font-size:30px;">记住回收人<input type="checkbox" id="rememberCheckBox"/></p>
  		</div>
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
===================================================================
diff -u -r20064 -r20070
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 20064)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 20070)
@@ -63,7 +63,8 @@
 	 */
 	public List<InvoicePlan> getWaitTransitionInvoicePlans(String orgUnitCodings);
 	
-	public List<InvoicePlan> getWaitingforRecyclingInvoicePlans(String handleDepartCoding,String applicationOrgUnitCoding,String applicationType,String applyTimeOrder,String operationRoom);
+	public List<InvoicePlan> getWaitingforRecyclingInvoicePlans(String handleDepartCoding,String applicationOrgUnitCoding,
+			String applicationType,String applyTimeOrder,String operationRoom,String tousseGroupId);
 
 	public List<ApplicationItemVO> findApplicationItemVOListByInvoicePlanId(
 			String id);
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r20064 -r20070
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 20064)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 20070)
@@ -441,7 +441,7 @@
 	@Override
 	public List<InvoicePlan> getWaitingforRecyclingInvoicePlans(
 			String handleDepartCoding, String applicationOrgUnitCoding,
-			String applicationType, String applyTimeOrder,String operationRoom) {
+			String applicationType, String applyTimeOrder,String operationRoom,String tousseGroupId) {
 
 		String sql = "where po.committedStatus=true";
 		String [] recycleStatus = {
@@ -475,6 +475,12 @@
 		}
 		sql += " and (po.includeRecyclingItems is null or po.includeRecyclingItems =" + InvoicePlan.SIGNED_TRUE + ")";
 		
+		if(DatabaseUtil.isPoIdValid(tousseGroupId)){
+			sql += " and po.id in(select invoicePlan.id from " + TousseItem.class.getSimpleName() 
+					+ " where tousseDefinitionId in (select id from " + TousseDefinition.class.getSimpleName() 
+															+ " where tousseGroupID = " + tousseGroupId + "))";
+		}
+		
 		if(StringUtils.isBlank(applyTimeOrder)){
 			sql += " order by po.sequence,po.departCoding,po.applicationTime ASC";
 		}else{
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r20064 -r20070
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 20064)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 20070)
@@ -1207,6 +1207,7 @@
 		String appType = StrutsParamUtils.getPraramValue("appType", "");
 		String applyTimeOrder = StrutsParamUtils.getPraramValue("applyTimeOrder", "");
 		String operationRoom = StrutsParamUtils.getPraramValue("operationRoom", "");
+		String tousseGroupId = StrutsParamUtils.getPraramValue("tousseGroupId", null);
 		
 		String loginUserDeptCoding = AcegiHelper.getLoginUser()
 				.getOrgUnitCodingFromSupplyRoomConfig();
@@ -1219,7 +1220,7 @@
 			}
 		}
 		List<InvoicePlan> invoicePlanList = invoicePlanManager
-				.getWaitingforRecyclingInvoicePlans(loginUserDeptCoding,orgUnitCoding,appType,applyTimeOrder,operationRoom);
+				.getWaitingforRecyclingInvoicePlans(loginUserDeptCoding,orgUnitCoding,appType,applyTimeOrder,operationRoom,tousseGroupId);
 		
 		List<InvoicePlan> disinfectApp = new ArrayList<InvoicePlan>();
 		JSONArray jsonArray = new JSONArray();