Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
===================================================================
diff -u -r26032 -r26182
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 26032)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 26182)
@@ -68,9 +68,11 @@
 			Collection<String> departCodes, String applyDate, String tousseType,String disposableGoodsType,String sterilingMethods,String tousseGroupIds);
 
 	public int getInvoicePlanAmount(String sql);
-
-	public List<InvoicePlan> getAwaitForRecyclingInvoicePlan(int supplyRoomType,String orgUnitCodings);
 	/**
+	 * @param departmentGroupId 回收科室分组id
+	 */
+	public List<InvoicePlan> getAwaitForRecyclingInvoicePlan(int supplyRoomType,String orgUnitCodings,String departmentGroupId);
+	/**
 	 * 获取待交接物品的申请单
 	 * @param orgUnitCodings
 	 * @return
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r26032 -r26182
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 26032)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 26182)
@@ -1130,7 +1130,7 @@
 	@Override
 	@SuppressWarnings("unchecked")
 	public List<InvoicePlan> getAwaitForRecyclingInvoicePlan(
-			int supplyRoomType, String departCodings) {
+			int supplyRoomType, String departCodings, String deptCodes) {
 		String sql = "where (po.recyclingStatus = '"
 				+ InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE
 				+ "' or po.recyclingStatus = '"
@@ -1162,6 +1162,9 @@
 				+ "'";
 		sql += " and ( po.includeRecyclingItems is null or po.includeRecyclingItems = "
 				+ InvoicePlan.SIGNED_TRUE + " )";
+		if(StringUtils.isNotBlank(deptCodes)){
+			sql += String.format(" and po.departCoding in ('%s')", deptCodes);
+		}
 		sql += " order by po.sequence,po.departCoding,po.applicationTime";
 		
 		return getWaitingforRecyclingInvoicePlans(sql);
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r26151 -r26182
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 26151)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 26182)
@@ -701,6 +701,7 @@
 		JSONArray groupArray = new JSONArray();
 		JSONArray dataArray = new JSONArray();
 		String gorupId = "";
+		String departmentGroupId = params.optString("departmentGroupId");
 		//申请单分组设置
 		if(params != null){
 			gorupId = params.optString("groupId");
@@ -730,8 +731,16 @@
 				}
 			}
 		}
+		String deptCodes = null;
+		if(StringUtils.isNotBlank(departmentGroupId)){
+			DepartmentGroup group = departmentGroupManager.get(departmentGroupId);
+			if(group != null){
+				deptCodes = group.getDepartCodes();
+				deptCodes = deptCodes.replaceAll(";", "','");
+			}
+		}
 		List<InvoicePlan> invoicePlans = invoicePlanManager
-				.getAwaitForRecyclingInvoicePlan(supplyRoomType,orgUntiCodes);
+				.getAwaitForRecyclingInvoicePlan(supplyRoomType,orgUntiCodes,deptCodes);
 		
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 		if(invoicePlans != null){
@@ -776,7 +785,7 @@
 		return obj.toString();
 	}
 	/**
-	 * 获取待交接申请单
+	 * 获取待交接申请单,PDA回收清点调用
 	 * @param params
 	 * @return
 	 */
@@ -801,7 +810,7 @@
 					orgUntiCodes = "'" + codeStr + "'";
 				}
 			}
-		}		
+		}
 		JSONObject json = JSONUtil.buildJsonObject(true,tousseTransitionPlanManager.getWaitTransitionPlanJson(orgUntiCodes));
 		json.put("groups", groupArray);
 		return json.toString();
@@ -4240,4 +4249,11 @@
 		}
 		return diposableGoodsManager.getDisposableGoodsInfoByAmountAndIdsMap(amountAndIdMap,params.optLong("wareHouseId")).toString();
 	}
+	/**
+	 * 获取回收科室分组,只要id和name,供前台回收科室分组下拉框使用
+	 * @return 
+	 */
+	public String getDepartmentGroupIdAndName(JSONObject params){
+		return departmentGroupManager.getDepartmentGroupIdAndName().toString();
+	}
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/service/DepartmentGroupManager.java
===================================================================
diff -u -r22140 -r26182
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/service/DepartmentGroupManager.java	(.../DepartmentGroupManager.java)	(revision 22140)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/service/DepartmentGroupManager.java	(.../DepartmentGroupManager.java)	(revision 26182)
@@ -5,6 +5,7 @@
 import java.util.Map;
 
 import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
 
 import com.forgon.disinfectsystem.entity.recycledepartmentgroup.DepartmentGroup;
 import com.forgon.tools.hibernate.BasePoManager;
@@ -39,4 +40,9 @@
 	 * @return
 	 */
 	public DepartmentGroup findBelongTo(Collection<DepartmentGroup> departGroups,String departCode);
+	/**
+	 * 获取回收科室分组,只要id和name,供前台回收科室分组下拉框使用
+	 * @return 
+	 */
+	public JSONObject getDepartmentGroupIdAndName();
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/service/DepartmentGroupManagerImpl.java
===================================================================
diff -u -r22140 -r26182
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/service/DepartmentGroupManagerImpl.java	(.../DepartmentGroupManagerImpl.java)	(revision 22140)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/departmentgroup/service/DepartmentGroupManagerImpl.java	(.../DepartmentGroupManagerImpl.java)	(revision 26182)
@@ -1,5 +1,6 @@
 package com.forgon.disinfectsystem.basedatamanager.departmentgroup.service;
 
+import java.sql.ResultSet;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -10,6 +11,7 @@
 import org.apache.commons.collections4.CollectionUtils;
 
 import com.forgon.disinfectsystem.entity.recycledepartmentgroup.DepartmentGroup;
+import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.hibernate.BasePoManagerImpl;
 import com.forgon.tools.util.ExtJsUtil;
 
@@ -80,5 +82,31 @@
 		}
 		return null;
 	}
+	@Override
+	public JSONObject getDepartmentGroupIdAndName() {
+		String sql = "select id,name from DepartmentGroup";
+		ResultSet rs = null;
+		JSONObject returnObj = new JSONObject();
+		JSONArray jsonArr = new JSONArray();
+		try {
+			rs = objectDao.executeSql(sql);
+			while (rs.next()) {
+				Long id = rs.getLong("id");
+				String name = rs.getString("name");
+				JSONObject obj = new JSONObject();
+				obj.put("id", id);
+				obj.put("name", name);
+				jsonArr.add(obj);
+			}
+			returnObj.put("data", jsonArr);
+			returnObj.put("success", true);
+		} catch (Exception e) {
+			returnObj.put("success", false);
+			e.printStackTrace();
+		}finally{
+			DatabaseUtil.closeResultSetAndStatement(rs);
+		}
+		return returnObj;
+	}
 
 }