Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r14708 -r14736
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 14708)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 14736)
@@ -282,7 +282,8 @@
 		}
 		return list;
 	}
-	public List<InvoicePlan> getWaitingforRecyclingInvoicePlans(String handleDepartCoding,String applicationOrgUnitCoding){
+	
+	public List<InvoicePlan> getWaitingforRecyclingInvoicePlans(String handleDepartCoding,String applicationOrgUnitCoding,String applicationType){
 		StringBuilder sb = new StringBuilder();
 		sb.append(String.format(" where (po.recyclingStatus in('%s','%s')) and po.committedStatus=true ", InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE, InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE));
 		
@@ -299,6 +300,16 @@
 			sb.append(tmp);
 			ftSbf.append(tmp);
 		}
+		
+		if(StringUtils.isNotBlank(applicationType)){
+			if(InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION.equals(applicationType)){
+				sb.append(" and 1=2 ");
+			}else{
+				ftSbf.append(" and 1=2 ");
+				sb.append(" and po.type = '" + applicationType + "' ");
+			}
+		}
+		
 		sb.append(String.format(" and ( po.includeRecyclingItems is null or po.includeRecyclingItems =%s) ", InvoicePlan.SIGNED_TRUE));
 
 		String orderSql = " order by po.sequence,po.departCoding,po.applicationTime";
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
===================================================================
diff -u -r14659 -r14736
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 14659)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 14736)
@@ -94,6 +94,25 @@
 
 <style type="text/css"> 
 .mouse_color{background-color: #EFEFEF;}
+
+.selectBox{
+	border:1px solid #F4F4F4;
+	width:175px;
+	height:40px;
+	font-size:22px;
+	clip:rect(0px,179px,16px,0px);
+	overflow:hidden;
+} 
+.selectBox option{
+	font-size:22px;
+	width:175px;
+	height:300px;
+	border:0px;
+	padding-top:50px;
+	padding-bottom:50px;
+	font-size:38px;
+	color:#909993;
+}
 </style> 
 
 <script type="text/javascript">
@@ -795,13 +814,14 @@
 	$("#awaitForRecycleTable").empty();
 	var id = $("#inputselect").val();
 	var txt = $("#item" + id).text();
+	var appType = $("#appTypeSelect").val();
 	CookieManager.setCookie("groupId",id);
 	CookieManager.setCookie("groupText",txt);
 	$.ajax({
         type:'post',
         url:WWWROOT + '/disinfectSystem/recyclingRecordAction!getAwaitForRecyclingInvoicePlan.do',
         dataType:'json',
-        data : {groupId:""+id+ ""},
+        data : {groupId:"" + id + "",appType:"" + appType + ""},
         success:function(msg){
         	getData(msg);
         },
@@ -1012,7 +1032,17 @@
                 <td width="126">科室</td>
                 <td width="217"><a href="javascript:void(0)" class="arrow">申请时间</a></td>
                 <td width="106">申请人</td>
-                <td width="170">类型</td>
+                <td width="170">
+                	<select class="selectBox" id="appTypeSelect" onChange="filterApplication();">
+                		<option selected = "selected" value="">类型</option>
+						<option value="通用申请单">通用申请单</option>
+						<option value="器械包申请单">器械包申请单</option>
+						<option value="消毒物品申请单">消毒物品申请单</option>
+						<option value="申请还物单">申请还物单</option>
+						<option value="自定义器械包申请单">自定义器械包申请单</option>
+						<option value="外来器械包申请单">外来器械包申请单</option>
+					</select>
+				</td>
                 <td width="100">手术间</td>
                 <td >备注</td>
               </tr>
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r14706 -r14736
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 14706)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 14736)
@@ -929,6 +929,7 @@
 		
 		String orgUnitCoding = StrutsParamUtils.getPraramValue("orgUnitCoding", "");
 		String groupId = StrutsParamUtils.getPraramValue("groupId", "");
+		String appType = StrutsParamUtils.getPraramValue("appType", "");
 		
 		String loginUserDeptCoding = AcegiHelper.getLoginUser()
 				.getOrgUnitCodingFromSupplyRoomConfig();
@@ -947,7 +948,7 @@
 				.getAwaitForRecyclingInvoicePlan(supplyRoomType,orgUnitCoding);*/
 		
 		List<InvoicePlan> tempInvoicePlans = invoicePlanManager
-				.getWaitingforRecyclingInvoicePlans(loginUserDeptCoding,orgUnitCoding);
+				.getWaitingforRecyclingInvoicePlans(loginUserDeptCoding,orgUnitCoding,appType);
 		
 		//消毒物品申请单排在最下边
 		List<InvoicePlan> disinfectApp = new ArrayList<InvoicePlan>();
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
===================================================================
diff -u -r13846 -r14736
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 13846)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 14736)
@@ -51,7 +51,7 @@
 
 	public List<InvoicePlan> getAwaitForRecyclingInvoicePlan(int supplyRoomType,String orgUnitCodings);
 	
-	public List<InvoicePlan> getWaitingforRecyclingInvoicePlans(String handleDepartCoding,String applicationOrgUnitCoding);
+	public List<InvoicePlan> getWaitingforRecyclingInvoicePlans(String handleDepartCoding,String applicationOrgUnitCoding,String applicationType);
 
 	public List<ApplicationItemVO> findApplicationItemVOListByInvoicePlanId(
 			String id);