Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/recyclingDetailPrintConfig.js
===================================================================
diff -u -r19981 -r26272
--- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/recyclingDetailPrintConfig.js	(.../recyclingDetailPrintConfig.js)	(revision 19981)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/recyclingDetailPrintConfig.js	(.../recyclingDetailPrintConfig.js)	(revision 26272)
@@ -257,6 +257,14 @@
 			showDepart : '普放、CT',
 			depart : '普放、CT',
 			departCoding : '2001010701'
+	    },{
+			showDepart : '门诊外科',
+			depart : '门诊外科',
+			departCoding : '011'
+	    },{
+			showDepart : '血透室病区',
+			depart : '血透室病区',
+			departCoding : '1002012802'
 	    }
 	],
 
@@ -330,7 +338,18 @@
 			depart : '分院儿科病区',
 			departCoding : '1002020802'
 	    }
-	]
+	],
+	临床科室 : [
+		    {
+				showDepart : '新生儿区病区',
+				depart : '新生儿区病区',
+				departCoding : '1002013206'
+		    },{
+				showDepart : '内十科病区',
+				depart : '内十科病区',
+				departCoding : '1002013002'
+		    }
+		]
 
 
 }
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r26217 -r26272
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 26217)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 26272)
@@ -2344,7 +2344,8 @@
 	public static final String 住院专科 = "住院专科";
 	public static final String 门诊专科 = "门诊专科";
 	public static final String 分院 = "分院";
-	
+	public static final String CLINICALDEPARTMENTGROUP = "临床科室";
+
 	public Map<String, List<String>> getPrintTableConfigInfo(JSONObject printConfig){
 		JSONArray commonTousse = printConfig.optJSONArray(commonMaterial);
 		List<String> 普通器械包Ids = new ArrayList<String>();
@@ -2365,6 +2366,10 @@
 		JSONArray 分院Array = printConfig.optJSONArray(分院);
 		List<String> 分院code = new ArrayList<String>();
 		getModelIncludeDepart(分院Array,分院code);
+		//临床科室
+		JSONArray clinicalDepartmentGroupArray = printConfig.optJSONArray(CLINICALDEPARTMENTGROUP);
+		List<String> clinicalDepartmentGroupCode = new ArrayList<String>();
+		getModelIncludeDepart(clinicalDepartmentGroupArray,clinicalDepartmentGroupCode);
 		
 		Map<String, List<String>> data = new HashMap<String, List<String>>();
 		
@@ -2373,6 +2378,7 @@
 		data.put(住院专科, 住院专科code);
 		data.put(门诊专科, 门诊专科code);
 		data.put(分院, 分院code);
+		data.put(CLINICALDEPARTMENTGROUP, clinicalDepartmentGroupCode);
 		return data;
 	}
 
@@ -2452,6 +2458,8 @@
 		Map<String, List<DepartRecycleTousse>> 住院专科回收清单map = new HashMap<String, List<DepartRecycleTousse>>();
 		Map<String, List<DepartRecycleTousse>> 门诊专科回收清单map = new HashMap<String, List<DepartRecycleTousse>>();
 		Map<String, List<DepartRecycleTousse>> 分院回收清单map = new HashMap<String, List<DepartRecycleTousse>>();
+		//临床科室
+		Map<String, List<DepartRecycleTousse>> clinicalDepartmentGroupMap = new HashMap<String, List<DepartRecycleTousse>>();
 		Map<String, List<DepartRecycleTousse>> 其他器械回收清单map = new HashMap<String, List<DepartRecycleTousse>>();
 		
 		try {
@@ -2522,6 +2530,12 @@
 							tousseName, amount);
 					continue;
 				}
+				boolean isExist6 = isConfigExist(configMap.get(CLINICALDEPARTMENTGROUP), departCode);
+				if (isExist6) {
+					buildTousseItemJson(clinicalDepartmentGroupMap, departCode, depart,
+							tousseName, amount);
+					continue;
+				}
 				buildTousseItemJson(其他器械回收清单map, departCode, depart,
 						tousseName, amount);
 			}
@@ -2537,6 +2551,7 @@
 		data.put(住院专科, buildDepartToussJson(住院专科回收清单map,printConfig.optJSONArray(住院专科)));
 		data.put(门诊专科, buildDepartToussJson(门诊专科回收清单map,printConfig.optJSONArray(门诊专科)));
 		data.put(分院, buildDepartToussJson(分院回收清单map,printConfig.optJSONArray(分院)));
+		data.put(CLINICALDEPARTMENTGROUP, buildDepartToussJson(clinicalDepartmentGroupMap,printConfig.optJSONArray(CLINICALDEPARTMENTGROUP)));
 		data.put("其他", buildDepartToussJson(其他器械回收清单map,printConfig.optJSONArray("")));
 		
 		data.put("配置文件", printConfig);
Index: ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js
===================================================================
diff -u -r26178 -r26272
--- ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js	(.../printRecyclingDetailWin.js)	(revision 26178)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js	(.../printRecyclingDetailWin.js)	(revision 26272)
@@ -926,6 +926,10 @@
 	htmlTable += "<tr><td>";
 	htmlTable += buildDepartTable(recyclingDetail,"分院");
 	htmlTable += "</td></tr>";
+	//临床科室组
+	htmlTable += "<tr><td>";
+	htmlTable += buildDepartTable(recyclingDetail,"临床科室");
+	htmlTable += "</td></tr>";
 	//其他
 	htmlTable += "<tr><td>";
 	htmlTable += buildDepartTable(recyclingDetail,"其他");