Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recycledepartmentgroup/DepartmentGroup.java
===================================================================
diff -u -r15173 -r19034
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recycledepartmentgroup/DepartmentGroup.java	(.../DepartmentGroup.java)	(revision 15173)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recycledepartmentgroup/DepartmentGroup.java	(.../DepartmentGroup.java)	(revision 19034)
@@ -1,5 +1,8 @@
 package com.forgon.disinfectsystem.entity.recycledepartmentgroup;
 
+import java.util.Arrays;
+import java.util.Collection;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -91,6 +94,14 @@
 	public void setPrepareRecycleType(String prepareRecycleType) {
 		this.prepareRecycleType = StringTools.defaultString(prepareRecycleType);
 	}
-	
-	
+	/**
+	 * 获取分组下的所有科室编码
+	 * @return
+	 */
+	public Collection<String> departCodes(){
+		if(StringTools.isNotBlank(departCodes)){
+			return Arrays.asList(StringTools.split(departCodes, ';'));
+		}
+		return null;
+	}
 }
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
===================================================================
diff -u -r18786 -r19034
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 18786)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 19034)
@@ -659,6 +659,8 @@
         var color = "white";
         if(msg[i].type == '申请还物单'){
             color = 'yellow';
+        }else if(msg[i].isPrepareRecycled == 1){
+        	color = 'green';
         }
         var departName = msg[i].depart;
         if (sstsConfig.showSettleAccountsDepartInRecycling){
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r18806 -r19034
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 18806)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 19034)
@@ -1168,11 +1168,11 @@
 		String loginUserDeptCoding = AcegiHelper.getLoginUser()
 				.getOrgUnitCodingFromSupplyRoomConfig();
 
-		String deptCodes = null;
+		Collection<String> deptCodes = null;
 		if(StringUtils.isNotBlank(groupId)){
 			DepartmentGroup group = departmentGroupManager.getById(groupId);
 			if(group != null){
-				deptCodes = group.getDepartCodes();
+				deptCodes = group.departCodes();
 			}
 		}
 		List<InvoicePlan> invoicePlanList = invoicePlanManager
@@ -1182,7 +1182,7 @@
 		JSONArray jsonArray = new JSONArray();
 		if(invoicePlanList != null){
 			for(InvoicePlan ip : invoicePlanList){
-				if(deptCodes != null && deptCodes.indexOf(ip.getDepartCoding()) < 0){
+				if(deptCodes != null && !deptCodes.contains(ip.getDepartCoding())){
 					continue;
 				}
 				//如果选了按申请时间排序，消毒物品就不放在最后面
@@ -1210,6 +1210,7 @@
 		obj.put("type", StringTools.getDefaultString(ip.getType()));
 		obj.put("operationRoom", StringTools.getDefaultString(ip.getOperationRoom()));
 		obj.put("remark", StringTools.getDefaultString(ip.getRemark()));
+		obj.put("isPrepareRecycled", ip.getIsPrepareRecycled());
 		jsonArray.add(obj);
 	}