Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r14910 -r14975
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 14910)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 14975)
@@ -99,6 +99,9 @@
 	
 	private HttpOptionManager httpOptionManager;
 	
+	private static final String FOREIGNTOUSSE_APP_AWAITRECEIVE = "(待接收)外来器械包申请单";
+	private static final String FOREIGNTOUSSE_APP_AWAITRECYCLE = "(待回收)外来器械包申请单";
+	
 	public void setHttpOptionManager(HttpOptionManager httpOptionManager) {
 		this.httpOptionManager = httpOptionManager;
 	}
@@ -288,8 +291,10 @@
 		sb.append(String.format(" where (po.recyclingStatus in('%s','%s')) and po.committedStatus=true ", InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE, InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE));
 		
 		StringBuilder ftSbf = new StringBuilder();
-		ftSbf.append(String.format(" where (po.recyclingStatus in('%s','%s')) and po.committedStatus=true ", InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVE, InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE));
+		ftSbf.append("where po.committedStatus=true ");
 		
+		String ftRecyclingStatusSQL = String.format(" and po.recyclingStatus in('%s','%s') ", InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVE, InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE);
+		
 		if (StringUtils.isNotBlank(handleDepartCoding)) {
 			String tmp = String.format(" and po.handleDepartCoding='%s' ", handleDepartCoding);
 			sb.append(tmp);
@@ -302,16 +307,22 @@
 		}
 		
 		if(StringUtils.isNotBlank(applicationType)){
-			if(InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION.equals(applicationType)){
+			if(FOREIGNTOUSSE_APP_AWAITRECEIVE.equals(applicationType)){
 				sb.append(" and 1=2 ");
+				ftRecyclingStatusSQL = String.format(" and po.recyclingStatus = '%s' ", InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVE);
+			}else if(FOREIGNTOUSSE_APP_AWAITRECYCLE.equals(applicationType)){
+				sb.append(" and 1=2 ");
+				ftRecyclingStatusSQL = String.format(" and po.recyclingStatus = '%s' ", InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE);
 			}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));
-
+		
+		ftSbf.append(ftRecyclingStatusSQL);
+		
 		String orderSql = " order by po.sequence,po.departCoding,po.applicationTime";
 		sb.append(orderSql);
 		ftSbf.append(orderSql);
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
===================================================================
diff -u -r14736 -r14975
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 14736)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 14975)
@@ -1040,7 +1040,8 @@
 						<option value="消毒物品申请单">消毒物品申请单</option>
 						<option value="申请还物单">申请还物单</option>
 						<option value="自定义器械包申请单">自定义器械包申请单</option>
-						<option value="外来器械包申请单">外来器械包申请单</option>
+						<option value="(待接收)外来器械包申请单">(待接收)外来器械包申请单</option>
+						<option value="(待回收)外来器械包申请单">(待回收)外来器械包申请单</option>
 					</select>
 				</td>
                 <td width="100">手术间</td>