Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r14928 -r15149
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 14928)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 15149)
@@ -997,71 +997,32 @@
 				}
 			}
 		}
-		List<InvoicePlan> invoicePlans = invoicePlanManager
-				.getAwaitForRecyclingInvoicePlan(supplyRoomType,"");
+		List<TousseItem> tousseItems = invoicePlanManager.getExpressRecyclingTousse(supplyRoomType,"");
 		List<ExpressRecyclingVo> quickRecyclingList = new ArrayList<ExpressRecyclingVo>();
-		Map<String, TousseDefinition> tousseDefinitionMap = new HashMap<String, TousseDefinition>();
 		String ids = "";
-		if(invoicePlans != null){
-			for (InvoicePlan invoicePlan : invoicePlans) {
-				for (TousseItem ti : invoicePlan.getApplicationItems()) {
-					//验证申请物品是否是快速回收物品
-					TousseDefinition td = tousseDefinitionMap.get(ti
-							.getTousseName());
-					if (td == null) {
-						td = tousseDefinitionManager
-								.getTousseDefinitionByName(ti.getTousseName());
-						tousseDefinitionMap.put(ti.getTousseName(), td);
-					}
-					if (StringUtils.isNotBlank(ti.getExpressRecycling())) {
-						if (TousseDefinition.STR_NO.equals(ti
-								.getExpressRecycling())) {
-							continue;
+		if(tousseItems != null){
+			for (TousseItem item : tousseItems) {
+				Integer recyclingAmount = item.getRecyclingAmount();
+				if(recyclingAmount == null){
+					InvoicePlan invoicePlan = item.getInvoicePlan();
+					if(!InvoicePlan.READED.equals(invoicePlan.getReaded())){
+						if(StringUtils.isNotBlank(ids)){
+							ids += ",";
 						}
-					} else {
-						if (td != null) {
-							if (StringUtils.isBlank(td.getExpressRecycling())
-									|| TousseDefinition.STR_NO.equals(td
-											.getExpressRecycling())) {
-								continue;
-							}
-						} else {
-							continue;
-						}
+						ids += invoicePlan.getId();
 					}
-					//标识牌不做快速回收
-					if(Constants.STR_YES.equals(ti.getIsThereIdentificationCard()) || 
-							(td != null && Constants.STR_NO.equals(td.getIsDisableIDCard()))){
-						continue;
-					}
-					
-					Integer recyclingAmount = ti.getRecyclingAmount();
-					if(recyclingAmount == null){
-						if(!InvoicePlan.READED.equals(invoicePlan.getReaded())){
-							if(StringUtils.isNotBlank(ids)){
-								ids += ",";
-							}
-							ids += invoicePlan.getId();
-						}
-						
-						ExpressRecyclingVo vo = new ExpressRecyclingVo();
-						vo.setApplicationId(invoicePlan.getId());
-						vo.setDepart(invoicePlan.getDepart());
-						vo.setApplicationTime(invoicePlan.getApplicationTime());
-						vo.setTousseName(ti.getTousseName());
-						vo.setAmount(ti.getAmount());
-						vo.setPrepareRecycleAmount(ti.getPrepareRecycleAmount());
-						vo.setTousseDefinitionID(ti.getTousseDefinitionId());
-						if(td != null){
-							vo.setIsCleanedEntirely(td.getIsCleanedEntirely());
-							vo.setIsApplyEntireTousse(td.getIsApplyEntireTousse());
-							vo.setTousseType(td.getTousseType());
-						}else{
-							vo.setIsCleanedEntirely("是");
-							vo.setIsApplyEntireTousse("是");
-						}
-						quickRecyclingList.add(vo);
-					}
+					ExpressRecyclingVo vo = new ExpressRecyclingVo();
+					vo.setApplicationId(invoicePlan.getId());
+					vo.setDepart(invoicePlan.getDepart());
+					vo.setApplicationTime(invoicePlan.getApplicationTime());
+					vo.setTousseName(item.getTousseName());
+					vo.setAmount(item.getAmount());
+					vo.setPrepareRecycleAmount(item.getPrepareRecycleAmount());
+					vo.setTousseDefinitionID(item.getTousseDefinitionId());
+					vo.setIsCleanedEntirely(StringUtils.isBlank(item.getIsCleanedEntirely())?"是":item.getIsCleanedEntirely());
+					vo.setIsApplyEntireTousse(StringUtils.isBlank(item.getIsApplyEntireTousse())?"是":item.getIsApplyEntireTousse());
+					vo.setTousseType(item.getTousseType());
+					quickRecyclingList.add(vo);
 				}
 			}
 		}
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
===================================================================
diff -u -r14736 -r15149
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 14736)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 15149)
@@ -128,4 +128,6 @@
 	 */
 	public void computeAndSetPrintStatus(InvoicePlan invoicePlan);
 	
+	public List<TousseItem> getExpressRecyclingTousse(int supplyRoomType, String handleDepartCodings);
+	
 }
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r15042 -r15149
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 15042)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 15149)
@@ -276,6 +276,24 @@
 		return getWaitingforRecyclingInvoicePlans(sql);
 	}
 	
+	public List<TousseItem> getExpressRecyclingTousse(int supplyRoomType, String handleDepartCodings){
+		String sql = String.format("where po.invoicePlan.recyclingStatus in('%s','%s') and po.invoicePlan.committedStatus=true", 
+				InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE,InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE);
+		
+		if (StringUtils.isNotBlank(handleDepartCodings)) {
+			if (!handleDepartCodings.startsWith("'")){
+				handleDepartCodings = "'" + handleDepartCodings + "'";
+			}
+			sql += " and po.invoicePlan.handleDepartCoding in (" + handleDepartCodings + ")";
+		}
+		sql += " and po.invoicePlan.type != '" + InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION + "'";
+		sql += " and ( po.invoicePlan.includeRecyclingItems is null or po.invoicePlan.includeRecyclingItems = " + InvoicePlan.SIGNED_TRUE + " )";
+		sql += " and (po.isThereIdentificationCard is null or po.isThereIdentificationCard = '" + Constants.STR_NO + "')";
+		sql += " and po.expressRecycling = '" + Constants.STR_YES + "'";
+		sql += " order by po.tousseName asc";
+		return objectDao.findBySql(TousseItem.class.getSimpleName(), sql);
+	}
+	
 	private List<InvoicePlan> getWaitingforRecyclingInvoicePlans(String sql){
 		List<InvoicePlan> list = null;
 		try {
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r15122 -r15149
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 15122)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 15149)
@@ -28,7 +28,7 @@
         			tmpWashClassifyTypeNum++;
         		}
         		if(tmpWashClassifyTypeNum % 2 == 0){
-        			return 'green-row';
+        			return 'white-row';
         		}else{
         			return 'yellow-row';
         		}