Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r40302 -r40876
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 40302)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 40876)
@@ -1325,6 +1325,8 @@
 			Long tousseGroupId = StrutsParamUtils.getPraramLongValue("tousseGroupId", null);
 			Long departmentGroupId = StrutsParamUtils.getPraramLongValue("departmentGroupId", null);
 			String type = StrutsParamUtils.getPraramValue("type", null);
+			String departCoding = StrutsParamUtils.getPraramValue("departCoding", null);
+			SqlUtils.checkInputParam(departCoding);
 			if("quickSecondaryRecyclingForgonTousse".equals(type)){
 				String queryContent = StrutsParamUtils.getPraramValue("queryContent", null);//查询内容 住院号或者包实例条码
 				JSONObject patientInfo = invoicePlanManager.getPatientInfoByQueryContent(queryContent);
@@ -1334,8 +1336,18 @@
 				result.put("patientInfo", patientInfo);
 				result.put("expressRecyclingVos", expressRecyclingVos);
 				StrutsResponseUtils.output(result);
+			}else if("departExpressRecycling".equals(type)){
+				if(StringUtils.isEmpty(departCoding)){
+					throw new SystemException("请选择科室");
+				}
+				Map<String, Map<String, List<ExpressRecyclingVo>>> resultMap = invoicePlanManager.getDepartExpressRecyclingTousseVo(tousseGroupId, departmentGroupId, departCoding);
+				if(MapUtils.isEmpty(resultMap)){
+					StrutsResponseUtils.output(JSONArray.fromObject(new JSONArray()));
+				}else{
+					StrutsResponseUtils.output(JSONArray.fromObject(resultMap));
+				}
 			}else{
-				StrutsResponseUtils.output(JSONArray.fromObject(invoicePlanManager.getExpressRecyclingTousseVo(tousseGroupId, departmentGroupId)));
+				StrutsResponseUtils.output(JSONArray.fromObject(invoicePlanManager.getExpressRecyclingTousseVo(tousseGroupId, departmentGroupId, departCoding)));
 			}
 		} catch (Exception e) {
 			e.printStackTrace();