Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r37055 -r37160
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 37055)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 37160)
@@ -1246,7 +1246,7 @@
 			if("apply".equals(type)){
 				@SuppressWarnings("unchecked")
 				String where1 = SqlUtils.getNonStringFieldInLargeCollectionsPredicate("ti.recyclingApplication_ID", Arrays.asList(ids));
-				sql = "select ti.recyclingApplication_ID id, ti.tousseName tousseName, ti.amount amount, ti.tousseType tousseType, "
+				sql = "select ti.recyclingAmount,ti.recyclingApplication_ID id, ti.tousseName tousseName, ti.amount amount, ti.tousseType tousseType, "
 						+ "ti.urgentLevel urgentLevel, ti.urgentAmount urgentAmount, "
 						+ "ti.supplierName supplierName, ftp.surgery surgery, ftp.patient patient "
 						+ "from " + TousseItem.class.getSimpleName() + " ti left join " + ForeignTousseApplication.class.getSimpleName() + " ftp on ti.recyclingApplication_ID = ftp.id";
@@ -1272,6 +1272,21 @@
 			MultiValueMap<Long, RecyclingDetailItemVo> mvm = new MultiValueMap<Long,RecyclingDetailItemVo>();
 			while(rs.next()){
 				RecyclingDetailItemVo item = new RecyclingDetailItemVo();
+				if("apply".equals(type)){
+					Object recyclingAmount = rs.getObject("recyclingAmount");
+					if(recyclingAmount == null){
+						item.setRecyclingStatus("待回收");
+					}else{
+						try {
+							Integer.parseInt(recyclingAmount.toString());
+							item.setRecyclingStatus("已回收");
+						} catch (Exception e) {
+							item.setRecyclingStatus("待回收");
+						}
+					}
+				}else{
+					item.setRecyclingStatus("已回收");
+				}
 				String tousseType = rs.getString("tousseType");
 				String tousseName = TousseDefinitionUtils.getTousseRawName(rs.getString("tousseName"), tousseType);
 				item.setAmount(rs.getInt("amount"));
@@ -1302,6 +1317,7 @@
 					tousse.put("surgery", item.getSurgery());
 					tousse.put("patient", item.getPatient());
 					tousse.put("tousseType", item.getTousseType());
+					tousse.put("recyclingStatus", item.getRecyclingStatus());
 					tousses.add(tousse);
 				}
 				obj.put("id", id);
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingDetailItemVo.java
===================================================================
diff -u -r27222 -r37160
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingDetailItemVo.java	(.../RecyclingDetailItemVo.java)	(revision 27222)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingDetailItemVo.java	(.../RecyclingDetailItemVo.java)	(revision 37160)
@@ -24,7 +24,10 @@
 	private String patient;
 	
 	private String tousseType;
-	
+	/**
+	 * 回收状态
+	 */
+	private String recyclingStatus;
 	public String getTousseName() {
 		return tousseName;
 	}
@@ -88,5 +91,13 @@
 	public void setTousseType(String tousseType) {
 		this.tousseType = tousseType;
 	}
+
+	public String getRecyclingStatus() {
+		return recyclingStatus;
+	}
+
+	public void setRecyclingStatus(String recyclingStatus) {
+		this.recyclingStatus = recyclingStatus;
+	}
 	
 }