Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r15580 -r15619
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 15580)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 15619)
@@ -556,8 +556,6 @@
 	}
 
 	public String loadRecyclingRecord() {
-		HttpServletResponse response = StrutsParamUtils.getResponse();
-
 		JsonConfig config = new JsonConfig();
 		PropertyFilter propertyFilter = new JsonPropertyFilter(new String[] {
 				"tasks", "recyclingRecord" });
@@ -578,7 +576,6 @@
 	public String getOrgUnitByBarcode() {
 		String recyclingRecordId = StrutsParamUtils.getPraramValue(
 				"recyclingRecordId", null);
-		HttpServletResponse response = StrutsParamUtils.getResponse();
 		OrgUnit orgUnit = null;
 		ClassifyBasket classifyBasket = null;
 		String basketStatus = null;
@@ -722,7 +719,6 @@
 	public String getBarcodeInfo() {
 		String recyclingRecordId = StrutsParamUtils.getPraramValue(
 				"recyclingRecordId", null);
-		HttpServletResponse response = StrutsParamUtils.getResponse();
 		OrgUnit orgUnit = null;
 		ClassifyBasket classifyBasket = null;
 		String basketStatus = null;
@@ -1181,7 +1177,6 @@
 		String type = StrutsParamUtils.getPraramValue("type", "");
 		Integer tousseAmount = StrutsParamUtils.getPraramValue("tousseAmount",1);
 		if (StringUtils.isNotBlank(tousseDefinitionID)) {
-			HttpServletResponse response = StrutsParamUtils.getResponse();
 			TousseDefinition td = tousseDefinitionManager.getTousseDefinitionById(tousseDefinitionID);
 			List<RecyclingErrorVo> recyclingErrorVos = new ArrayList<RecyclingErrorVo>();
 			if(td != null){
@@ -1304,8 +1299,6 @@
 	public String getMaterialInstancesByTousseId() {
 		String id = StrutsParamUtils.getPraramValue("id", "");
 		if (StringUtils.isNotBlank(id)) {
-			String jsonStr = "";
-			HttpServletResponse response = StrutsParamUtils.getResponse();
 			List<MaterialInstance> materialInstances = tousseDefinitionManager
 					.findMaterialInstances(id);
 			JsonConfig config = new JsonConfig();
@@ -1515,59 +1508,344 @@
 	}
 
 	// 长沙市中心医院专用的方法，资产归属的判断为硬编码
-	public void getPrintRecyclingDetailList(){
-		try{
-		String fromTime = StrutsParamUtils.getPraramValue("startDateTime",
-				"");
-		String toTime = StrutsParamUtils.getPraramValue("endDateTime", "");
-		// 打印器械包的处理科室
-		String departType = StrutsParamUtils.getPraramValue("departType", "");
+	public void getPrintRecyclingDetailList() {
+		try {
+			String fromTime = StrutsParamUtils.getPraramValue("startDateTime",
+					"");
+			String toTime = StrutsParamUtils.getPraramValue("endDateTime", "");
+			// 打印器械包的处理科室
+			String departType = StrutsParamUtils.getPraramValue("departType",
+					"");
 
-		int resultAmount = 0;
-		if (StringUtils.isNotBlank(fromTime)
-				&& StringUtils.isNotBlank(toTime)) {
-			List<RecyclingDetailVo> voList = new ArrayList<RecyclingDetailVo>();
-			List<DisinfectionDetailVo> disinfectionGoodsList = new ArrayList<DisinfectionDetailVo>();
-			String userName = AcegiHelper.getLoginUserFullName();
-			boolean success = true;
-				
-			fromTime = dateQueryAdapter.dateAdapter(fromTime);
-			toTime = dateQueryAdapter.dateAdapter(toTime);
+			int resultAmount = 0;
+			if (StringUtils.isNotBlank(fromTime)
+					&& StringUtils.isNotBlank(toTime)) {
+				List<RecyclingDetailVo> voList = new ArrayList<RecyclingDetailVo>();
+				List<DisinfectionDetailVo> disinfectionGoodsList = new ArrayList<DisinfectionDetailVo>();
+				String userName = AcegiHelper.getLoginUserFullName();
+				boolean success = true;
 
-			String sql = "where po.recyclingTime between " + fromTime
-					+ " and " + toTime + "";
+				fromTime = dateQueryAdapter.dateAdapter(fromTime);
+				toTime = dateQueryAdapter.dateAdapter(toTime);
 
-			List<RecyclingRecord> recyclingRecords = recyclingRecordManager
-					.getRecyclingRecordBySql(sql);
-			//  科室名称               物品名称        数量
-			Map<String, Map<String, Integer>> departTousseMap = new HashMap<String, Map<String, Integer>>();
-			// 调用长沙中心医院的打印处理代码
-			resultAmount = changshaZhongxingHospitalProcess(departType,
-					voList, disinfectionGoodsList,
-					recyclingRecords, departTousseMap);
+				String sql = "where po.recyclingTime between " + fromTime
+						+ " and " + toTime + "";
 
-			//设置每一张表显示多少行
-			int tableCount = 3;
-			int rowSize = resultAmount / tableCount;
-			if(resultAmount % tableCount != 0){
-				rowSize++;
+				List<RecyclingRecord> recyclingRecords = recyclingRecordManager
+						.getRecyclingRecordBySql(sql);
+				// 科室名称 物品名称 数量
+				Map<String, Map<String, Integer>> departTousseMap = new HashMap<String, Map<String, Integer>>();
+				// 调用长沙中心医院的打印处理代码
+				resultAmount = changshaZhongxingHospitalProcess(departType,
+						voList, disinfectionGoodsList, recyclingRecords,
+						departTousseMap);
+
+				// 设置每一张表显示多少行
+				int tableCount = 3;
+				int rowSize = resultAmount / tableCount;
+				if (resultAmount % tableCount != 0) {
+					rowSize++;
+				}
+
+				JSONObject obj = new JSONObject();
+				obj.put("success", success);
+				obj.put("printUser", userName);
+				obj.put("tableRowSize", rowSize);
+				obj.put("data", voList);
+				obj.put("disinfectionGoods", disinfectionGoodsList);
+
+				StrutsResponseUtils.output(obj);
+
 			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+	
+	/**
+	 * 东莞中医院回收清单定制方法
+	 */
+	public void dongGuanZhongYiYuanProcess(){
+		String fromTime = StrutsParamUtils.getPraramValue("startDateTime","");
+		String toTime = StrutsParamUtils.getPraramValue("endDateTime", "");
+		String handlerDepartCoding = StrutsParamUtils.getPraramValue("handlerDepartCoding","");
+		if (StringUtils.isNotBlank(fromTime) && StringUtils.isNotBlank(toTime) && StringUtils.isNotBlank(handlerDepartCoding)) {
+			fromTime = dateQueryAdapter.dateAdapter(fromTime);
+			toTime = dateQueryAdapter.dateAdapter(toTime);
+
+			String sql = String
+					.format("select min(po.depart),po.departCode,td.ancestorID,min(bo.tousseName),sum(bo.amount) from %s po, %s bo,%s td "
+							+ "where po.id = bo.recyclingRecord_id and td.id = bo.tousseDefinitionId and po.recyclingTime "
+							+ "between %s and %s and po.orgUnitCoding = '%s' group by po.departCode,td.ancestorID",
+							RecyclingRecord.class.getSimpleName(), TousseItem.class.getSimpleName(),
+							TousseDefinition.class.getSimpleName(),fromTime, toTime, handlerDepartCoding);
+
+			ResultSet rs = objectDao.executeSql(sql);
 			
-			JSONObject obj = new JSONObject();
-			obj.put("success", success);
-			obj.put("printUser", userName);
-			obj.put("tableRowSize", rowSize);
-			obj.put("data", voList);
-			obj.put("disinfectionGoods", disinfectionGoodsList);
-			
-			StrutsResponseUtils.output(obj);
-			
+			tousseItemClassification(rs);
 		}
-		}catch(Exception e){
+	}
+	
+	public static final String 普通器械 = "普通器械";
+	public static final String 呼吸机管道 = "呼吸机管道";
+	public static final String 住院专科 = "住院专科";
+	public static final String 门诊专科 = "门诊专科";
+	public static final String 分院 = "分院";
+	
+	public Map<String, List<String>> getPrintTableConfigInfo(JSONObject printConfig){
+		JSONArray commonTousse = printConfig.optJSONArray(普通器械);
+		List<String> 普通器械包Ids = new ArrayList<String>();
+		getModelIncludeTousseIds(commonTousse,普通器械包Ids);
+		
+		JSONArray 呼吸机管道Array = printConfig.optJSONArray(呼吸机管道);
+		List<String> 呼吸机管道Ids = new ArrayList<String>();
+		getModelIncludeTousseIds(呼吸机管道Array,呼吸机管道Ids);
+		
+		JSONArray 住院专科Array = printConfig.optJSONArray(住院专科);
+		List<String> 住院专科code = new ArrayList<String>();
+		getModelIncludeDepart(住院专科Array,住院专科code);
+		
+		JSONArray 门诊专科Array = printConfig.optJSONArray(门诊专科);
+		List<String> 门诊专科code = new ArrayList<String>();
+		getModelIncludeDepart(门诊专科Array,门诊专科code);
+		
+		JSONArray 分院Array = printConfig.optJSONArray(分院);
+		List<String> 分院code = new ArrayList<String>();
+		getModelIncludeDepart(分院Array,分院code);
+		
+		Map<String, List<String>> data = new HashMap<String, List<String>>();
+		
+		data.put(普通器械, 普通器械包Ids);
+		data.put(呼吸机管道, 呼吸机管道Ids);
+		data.put(住院专科, 住院专科code);
+		data.put(门诊专科, 门诊专科code);
+		data.put(分院, 分院code);
+		return data;
+	}
+	
+	private void getModelIncludeDepart(JSONArray jsonArray,List<String> codes){
+		if(jsonArray != null){
+			for (int i = 0; i < jsonArray.size(); i++) {
+				JSONObject jsonItem = jsonArray.optJSONObject(i);
+				codes.add(jsonItem.optString("departCoding"));
+			}
+		}
+	}
+	
+	private void getModelIncludeTousseIds(JSONArray jsonArray,List<String> ids){
+		if(jsonArray != null){
+			for (int i = 0; i < jsonArray.size(); i++) {
+				JSONObject jsonItem = jsonArray.optJSONObject(i);
+				JSONArray includeTousse = jsonItem.optJSONArray("includeTousse");
+				if(includeTousse != null){
+					for (int j = 0; j < includeTousse.size(); j++) {
+						JSONObject tousseItemJson = includeTousse.optJSONObject(j);
+						ids.add(tousseItemJson.optString("id"));
+					}
+				}
+			}
+		}
+	}
+	
+	
+	/**
+	 * 器械包分类
+	 */
+	public void tousseItemClassification(ResultSet rs){
+		JSONObject printConfig = CssdUtils.getWebConfigInfo(CssdUtils.getConfigProperty("project")
+				+ "/print/recyclingDetailPrintConfig.js");
+		if(printConfig == null){
+			StrutsResponseUtils.output(false, "回收清单参数配置有误！");
+			return;
+		}
+		
+		Map<String, List<String>> configMap = getPrintTableConfigInfo(printConfig);
+		 
+		Map<String, JSONObject> 普通器械map = new HashMap<String, JSONObject>();
+		Map<String, JSONObject> 呼吸机管道map = new HashMap<String, JSONObject>();
+		
+		Map<String, List<JSONObject>> 住院专科回收清单map = new HashMap<String, List<JSONObject>>();
+		Map<String, List<JSONObject>> 门诊专科回收清单map = new HashMap<String, List<JSONObject>>();
+		Map<String, List<JSONObject>> 分院回收清单map = new HashMap<String, List<JSONObject>>();
+		Map<String, List<JSONObject>> 其他器械回收清单map = new HashMap<String, List<JSONObject>>();
+		 
+		try {
+			while(rs.next()){
+				
+				String depart = rs.getString(1);
+				String departCode = rs.getString(2);
+				Long ancestorID = rs.getLong(3);
+				String tousseName = rs.getString(4);
+				Integer amount = rs.getInt(5);
+				//验证器械包属于那种打印类型
+				boolean isExist = isConfigExist(configMap.get(普通器械), "" + ancestorID);
+				if (isExist) {
+					JSONObject data = 普通器械map.get(departCode);
+					if (data == null) {
+						data = new JSONObject();
+						普通器械map.put(departCode, data);
+					}
+					buildDepartmentRecyclingItemJson(printConfig, 普通器械, depart,
+							departCode, ancestorID, tousseName, amount, data);
+					continue;
+				}
+				boolean isExist2 = isConfigExist(configMap.get(呼吸机管道), ""
+						+ ancestorID);
+				if (isExist2) {
+					JSONObject data = 呼吸机管道map.get(departCode);
+					if (data == null) {
+						data = new JSONObject();
+						呼吸机管道map.put(departCode, data);
+					}
+					buildDepartmentRecyclingItemJson(printConfig, 呼吸机管道, depart,
+							departCode, ancestorID, tousseName, amount, data);
+					continue;
+				}
+				boolean isExist3 = isConfigExist(configMap.get(住院专科), departCode);
+				if (isExist3) {
+					buildTousseItemJson(printConfig,住院专科回收清单map, departCode, depart,
+							tousseName, amount,住院专科);
+					continue;
+				}
+				boolean isExist4 = isConfigExist(configMap.get(门诊专科), departCode);
+				if (isExist4) {
+					buildTousseItemJson(printConfig,门诊专科回收清单map, departCode, depart,
+							tousseName, amount,门诊专科);
+					continue;
+				}
+				boolean isExist5 = isConfigExist(configMap.get(分院), departCode);
+				if (isExist5) {
+					buildTousseItemJson(printConfig,分院回收清单map, departCode, depart,
+							tousseName, amount,分院);
+					continue;
+				}
+				buildTousseItemJson(printConfig,其他器械回收清单map, departCode, depart,
+						tousseName, amount,"");
+			}
+		} catch (SQLException e) {
 			e.printStackTrace();
+		} finally {
+			DatabaseUtil.closeResultSetAndStatement(rs);
 		}
+		JSONObject data = new JSONObject();
+		data.put("success",true);
+		data.put(普通器械, 普通器械map.values());
+		data.put(呼吸机管道, 呼吸机管道map.values());
+		data.put(住院专科, buildDepartToussJson(住院专科回收清单map,printConfig.optJSONArray(住院专科)));
+		data.put(门诊专科, buildDepartToussJson(门诊专科回收清单map,printConfig.optJSONArray(门诊专科)));
+		data.put(分院, buildDepartToussJson(分院回收清单map,printConfig.optJSONArray(分院)));
+		data.put("其他", buildDepartToussJson(其他器械回收清单map,printConfig.optJSONArray("")));
+		
+		data.put("配置文件", printConfig);
+		data.put("printUser", AcegiHelper.getLoginUserFullName());
+		StrutsResponseUtils.output(data);
 	}
+	
+	private JSONArray buildDepartToussJson(Map<String, List<JSONObject>> map,JSONArray config){
+		JSONArray array = new JSONArray();
+		for (String departCode : map.keySet()) {
+			JSONObject obj = new JSONObject();
+			obj.put("departCode", departCode);
+			String showDepart = getShowDepart(config,departCode);
+			if(StringUtils.isBlank(showDepart)){
+				List<JSONObject> list = map.get(departCode);
+				if(list != null && list.size() > 0){
+					showDepart = list.get(0).optString("depart");
+				}
+			}
+			obj.put("showDepart", showDepart);
+			obj.put("items", map.get(departCode));
+			array.add(obj);
+		}
+		return array;
+	}
+	
+	/**
+	 * 配置文件中是否存在
+	 * @param list
+	 * @param result
+	 * @return
+	 */
+	private boolean isConfigExist(List<String> list,String result){
+		boolean isExist = false;
+		if(list != null){
+			for (String value : list) {
+				if(value.equals(result)){
+					isExist = true;
+					break;
+				}
+			}
+		}
+		return isExist;
+	}
 
+	public void buildTousseItemJson(JSONObject printConfig,Map<String, List<JSONObject>> map,
+			String departCode, String depart, String tousseName, Integer amount,String model) {
+		List<JSONObject> list = map.get(departCode);
+		if (list == null) {
+			list = new ArrayList<JSONObject>();
+			map.put(departCode, list);
+		}
+		JSONObject obj = new JSONObject();
+		obj.put("depart", depart);
+		obj.put("tousseName", tousseName);
+		obj.put("amount", amount);
+		list.add(obj);
+	}
+	
+	private String getShowDepart(JSONArray config,String departCode){
+		String showDepart = "";
+		if(config != null){
+			for (int i = 0; i < config.size(); i++) {
+				JSONObject obj = config.optJSONObject(i);
+				if(obj.optString("departCoding").equals(departCode)){
+					showDepart = obj.optString("showDepart");
+					break;
+				}
+			}
+		}
+		return showDepart;
+	}
+	
+	public void buildDepartmentRecyclingItemJson(JSONObject printConfig,String modelName,
+			String depart, String departCode, Long tousseDefinitionId,
+			String tousseName, Integer currentAmount,JSONObject data) {
+		data.put("depart", depart);
+		data.put("departCode", departCode);
+		if(printConfig != null){
+			JSONArray commonTousse = printConfig.optJSONArray(modelName);
+			if(commonTousse != null){
+				for (int i = 0; i < commonTousse.size(); i++) {
+					JSONObject jsonItem = commonTousse.optJSONObject(i);
+					String columnName = jsonItem.optString("columnName");
+					boolean isExist = isColumnNameIncludeThisTousse(jsonItem,tousseDefinitionId,tousseName);
+					Integer amount = data.optInt(columnName);
+					if(isExist){
+						amount += currentAmount;
+					}
+					data.put(columnName, amount);
+				}
+			}
+		}
+	}
+	
+	private boolean isColumnNameIncludeThisTousse(JSONObject json,long toussedefinitionId,String columnName){
+		boolean isExist = false;
+		if(json != null){
+			JSONArray includeTousse = json.optJSONArray("includeTousse");
+			if(includeTousse != null){
+				for (int i = 0; i < includeTousse.size(); i++) {
+					JSONObject tousseItemJson = includeTousse.optJSONObject(i);
+					if(tousseItemJson.optLong("id") == toussedefinitionId){
+						isExist = true;
+						break;
+					}
+				}
+			}
+		}
+		return isExist;
+	}
+
 	// 长沙中心医院的回收单打印处理逻辑
 	private int changshaZhongxingHospitalProcess(String departType,
 			List<RecyclingDetailVo> voList,
Index: ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js
===================================================================
diff -u -r15605 -r15619
--- ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js	(.../printRecyclingDetailWin.js)	(revision 15605)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js	(.../printRecyclingDetailWin.js)	(revision 15619)
@@ -168,9 +168,30 @@
 		alert('开始时间、结束时间跨度不能超过两天！！');
 		return ;
 	}
-
+	//东莞市中医院定制开发
+	if(projectName == "dgszyy"){
+		Ext.Ajax.request({
+			url :  WWWROOT + '/disinfectSystem/recyclingRecordAction!dongGuanZhongYiYuanProcess.do',
+			params : {
+				startDateTime : startDateTime,
+				endDateTime : endDateTime,
+				handlerDepartCoding : handlerDepartCoding
+			},
+			success : function(response, options) {
+				var obj = JSON.parse(response.responseText);
+				if(obj.success){
+					dongGuangZhongYiYuanRecyclingDetailPrint(printType,startDateTime,endDateTime,obj.printUser,obj);
+				}else{
+					showResult(obj.message);
+				}
+			},
+			failure : function(response, options) {
+				var result = Ext.decode(response.responseText);
+				showResult(result.cause);
+			}
+		});
 	// 按器械包的资产归属过滤打印范围，需要在器械包定义中进行设置
-	if (sstsConfig.recyclingRecordListFilterByAssetBelong){
+	}else if (sstsConfig.recyclingRecordListFilterByAssetBelong){
 		Ext.Ajax.request({
 			url :  WWWROOT + '/disinfectSystem/recyclingRecordAction!getPrintRecyclingDetailList.do',
 			params : {
@@ -268,6 +289,151 @@
 	return tableHtml;
 }
 
+function buildTable(data,model,defaultRow){
+	var htmlTable ="<table border ='1' cellspacing=0 cellpadding=0 style='border-collapse:collapse' bordercolor='#000000'>";
+	//表列头
+	htmlTable += "<tr style='font-size:21px;'>";
+	var config = data["配置文件"];
+	var titleConfig = config[model];
+	var columnLength = 0;
+	
+	var totalColumnName = {};
+	
+	if(titleConfig.length > 0){
+		htmlTable += "<td style='width: 60mm;height: 9mm;' align='center'>科室</td>";
+		columnLength = titleConfig.length;
+		for(var i = 0 ; i < titleConfig.length ; i++){
+			var columnName = titleConfig[i].columnName;
+			htmlTable += "<td style='width: 15mm;height: 9mm;' align='center'>" + columnName + "</td>";
+		}
+		htmlTable += "<td style='width: 50mm;height: 9mm;' align='center'>其他器械</td>";
+	}
+	htmlTable += "</tr>";
+	//数据填充
+	var result = data[model];
+	if(result.length > 0){
+		for(var i = 0 ; i < result.length ; i++){
+			htmlTable += "<tr style='height:7mm;font-size:13px;'>";
+			htmlTable += "<td style='width:15mm;' align='center'>" + result[i].depart + "</td>";
+			
+			if(titleConfig.length > 0){
+				for(var j = 0 ; j < titleConfig.length ; j++){
+					var tmpColumnName = titleConfig[j].columnName;
+					var value = result[i][tmpColumnName];
+					//合计
+					var oldAmount = totalColumnName[tmpColumnName];
+					if(oldAmount == null ||oldAmount　== ""){
+						oldAmount = 0;
+					}
+					totalColumnName[tmpColumnName] = (oldAmount + value);
+					if(value == 0){
+						value = "";
+					}
+					htmlTable += "<td style='width: 15mm;' align='center'>" + value + "</td>";
+				}
+			}
+			htmlTable += "<td style='width: 50mm;' align='center'></td>";
+			htmlTable += "</tr>";
+		}
+	}
+	//默认填充空行
+	if(defaultRow > result.length){
+		for(var i = 0 ; i < (defaultRow - result.length) ; i++){
+			htmlTable += "<tr style='height: 7mm;'>";
+			htmlTable += "<td style='width: 15mm;' align='center'></td>";
+			for(var j = 0 ; j < columnLength ; j++){
+				htmlTable += "<td style='width: 15mm;' align='center'></td>";
+			}
+			htmlTable += "<td style='width: 50mm;' align='center'></td>";
+			htmlTable += "</tr>";
+		}
+	}
+	
+	//合计
+	if(titleConfig.length > 0){
+		htmlTable += "<td style='width: 60mm;height: 7mm;' align='center'>合计</td>";
+		columnLength = titleConfig.length;
+		for(var i = 0 ; i < titleConfig.length ; i++){
+			var columnName = titleConfig[i].columnName;
+			var totalAmount = totalColumnName[columnName];
+			if(isUndefinedOrNull(totalAmount)){
+				totalAmount = "";
+			}
+			htmlTable += "<td style='width: 15mm;' align='center'>" + totalAmount + "</td>";
+		}
+		htmlTable += "<td style='width: 50mm;' align='center'></td>";
+	}
+	
+	htmlTable += "</table>";
+	return htmlTable;
+}
+
+function buildDepartTable(data,model){
+	var html ="<table border ='1' cellspacing=0 cellpadding=0 style='border-collapse:collapse' bordercolor='#000000'>";
+	    html += "<tr>";
+		html += "<td style='width: 15mm;height: 139mm;font-size:30px;' align='center'>" + model + "</td>";
+		html += "<td style='width: 195mm;height: 139mm;' valign='top'>";
+		var result = data[model];
+		for(var i = 0 ; i < result.length ; i++){ 
+			html += ("<strong>" + result[i].showDepart + "：</strong>");
+			for(var j = 0 ; j < result[i].items.length ; j++){
+				var tousseItem = result[i].items[j];
+				html += (tousseItem.tousseName + " x " + tousseItem.amount) + "; ";
+			}
+			html += "<br>";
+		}
+		html += "</td>"; 
+		html += "</tr>";
+		html += "</table>";
+		return html;
+}
+
+function dongGuangZhongYiYuanRecyclingDetailPrint(printType,startDateTime,endDateTime,printUser,recyclingDetail){
+	var LODOP = getLodop(document.getElementById('LODOP'), document.getElementById('LODOP_EM'));
+	LODOP.SET_PRINT_STYLE("FontSize",17);
+	LODOP.ADD_PRINT_TEXT(5,300,"100%",5,"CSSD每日回收登记表");
+	LODOP.SET_PRINT_STYLE("FontSize",11);
+	LODOP.ADD_PRINT_TEXT(35,50,"100%",5,"制单人： " + printUser);
+	LODOP.ADD_PRINT_TEXT(35,200,"100%",5,"开始时间：" + startDateTime);
+	LODOP.ADD_PRINT_TEXT(35,450,"100%",5,"结束时间： " + endDateTime);
+	
+	var htmlTable ="<table border ='0' style='width: 200mm'>";
+	//普通器械
+	htmlTable += "<tr><td>";
+	htmlTable += buildTable(recyclingDetail,"普通器械",25);
+	htmlTable += "</td></tr>";
+	//呼吸机管道
+	htmlTable += "<tr><td>";
+	htmlTable += buildTable(recyclingDetail,"呼吸机管道",9);
+	htmlTable += "</td></tr>";
+	//住院科室
+	htmlTable += "<tr><td>";
+	htmlTable += buildDepartTable(recyclingDetail,"住院专科");
+	htmlTable += "</td></tr>";
+	//门诊科室
+	htmlTable += "<tr><td>";
+	htmlTable += buildDepartTable(recyclingDetail,"门诊专科");
+	htmlTable += "</td></tr>";
+	//分院
+	htmlTable += "<tr><td>";
+	htmlTable += buildDepartTable(recyclingDetail,"分院");
+	htmlTable += "</td></tr>";
+	//其他
+	htmlTable += "<tr><td>";
+	htmlTable += buildDepartTable(recyclingDetail,"其他");
+	htmlTable += "</td></tr>";
+	
+	htmlContent = "<body leftmargin=0 topmargin=0>" + htmlTable + "</body>";
+	LODOP.ADD_PRINT_HTM(55,5,"100%","100%",htmlContent);
+	
+	if(printType == 0){//直接打印
+		LODOP.PRINT();
+	}else{//打印预览
+		LODOP.SET_SHOW_MODE("HIDE_PAPER_BOARD",1);
+		LODOP.PREVIEW();
+	}
+}
+
 function lodopPrint(printType,startDateTime,endDateTime,printUser,printDetail,disinfectionDetail,tableRowSize){
 	var LODOP = getLodop(document.getElementById('LODOP'), document.getElementById('LODOP_EM'));
 	LODOP.SET_PRINT_STYLE("FontSize",17);
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
===================================================================
diff -u -r15299 -r15619
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 15299)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 15619)
@@ -36,6 +36,9 @@
     request.setAttribute("today", dateFormat.format(new Date()));
     request.setAttribute("hospitalName", loginUser.getHospitalName());
     request.setAttribute("foreignDefaultLabelpaper", syscfg.getBarcodePaperType());
+    
+    String projectName = CssdUtils.getConfigProperty("project");
+    request.setAttribute("projectName", projectName);
 %>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -74,6 +77,7 @@
 var userName = '<%=request.getAttribute("userName")%>';
 var hospitalName = '<%=request.getAttribute("hospitalName")%>';
 var foreignDefaultLabelpaper = '<%=request.getAttribute("foreignDefaultLabelpaper")%>';
+var projectName = '<%=request.getAttribute("projectName")%>';
 var parm_s_type ="质量监测";
 //回收记录
 var taskType_recyclingRecord = '<%=PackingTask.TASK_RECYCLINGRECORD%>';
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
===================================================================
diff -u -r15515 -r15619
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java	(.../CssdUtils.java)	(revision 15515)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java	(.../CssdUtils.java)	(revision 15619)
@@ -170,6 +170,11 @@
 	 * 支持config.js中有中文注释
 	 */
 	public static JSONObject getWebConfigInfo(){
+		String configFilePath = getConfigProperty("project") + "/config.js";
+		return getWebConfigInfo(configFilePath);
+	}
+	
+	public static JSONObject getWebConfigInfo(String configFilePath){
 		JSONObject jsonObj = null;
 		
 		ObjectMapper mapper = new ObjectMapper().configure(
@@ -179,11 +184,8 @@
 		mapper.configure(Feature.ALLOW_SINGLE_QUOTES, true);
 		Scanner scan = null;
 		try {
-			String rootPath = Path.getWebAppRoot();
-			String project = getConfigProperty("project");
-			String filename = rootPath + "/disinfectsystem/config/" + project
-					+ "/config.js";
-			String content = readFullFile(filename);
+			String rootPath = Path.getWebAppRoot() + "/disinfectsystem/config/";
+			String content = readFullFile(rootPath + configFilePath);
 			int startIndex = content.indexOf("{");
 			int endIndex = (content.lastIndexOf("}") + 1);
 			if (startIndex != -1 && endIndex != -1 && startIndex < endIndex) {
@@ -202,7 +204,7 @@
 			}
 		}
 		return jsonObj;
-	}
+	} 
 	
 	/**
 	 * 根据key获取config.js的配置
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/recyclingDetailPrintConfig.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/recyclingDetailPrintConfig.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/recyclingDetailPrintConfig.js	(revision 15619)
@@ -0,0 +1,272 @@
+{
+	  普通器械 : [
+	    {
+		columnName : '湿化瓶',
+		includeTousse : [
+		    {id : 1070,tousseName : '湿化瓶'}
+		]
+	     },{
+		columnName : '拆线剪',
+		includeTousse : [
+		    {id : 903,tousseName : '拆线剪（16cm）'},
+		    {id : 904,tousseName : '拆线剪（14cm）'}
+		]
+	     },{
+		columnName : '组织剪',
+		includeTousse : [
+		    {id : 354,tousseName : '显微组织剪'},
+		    {id : 396,tousseName : '弯组织剪（22cm）'},
+		    {id : 397,tousseName : '弯组织剪（20cm）'},
+		    {id : 398,tousseName : '弯组织剪（18cm）'},
+		    {id : 399,tousseName : '弯组织剪（16cm）'},
+		    {id : 400,tousseName : '弯组织剪（14cm）'},
+
+		    {id : 694,tousseName : '尖组织剪(24cm)'},
+		    {id : 695,tousseName : '尖组织剪(22cm)'},
+		    {id : 696,tousseName : '尖组织剪(18cm)'},
+		    {id : 697,tousseName : '尖组织剪(16cm)'},
+		    {id : 698,tousseName : '尖组织剪(14cm)'},
+
+		    {id : 195,tousseName : '直组织剪14cm)'},
+		    {id : 196,tousseName : '直组织剪(22cm)'},
+		    {id : 197,tousseName : '直组织剪(20cm)'},
+		    {id : 198,tousseName : '直组织剪(18cm)'},
+		    {id : 199,tousseName : '直组织剪(16cm)'},
+		    {id : 200,tousseName : '直组织剪'}
+		]
+	     },{
+		columnName : '缝合包',
+		includeTousse : [
+		    {id : 144,tousseName : '综合科缝合包(3)'},
+		    {id : 1164,tousseName : '缝合包（手术室）'},
+		    {id : 134,tousseName : '五官缝合包'},
+		    {id : 118,tousseName : '缝合包'}
+		]
+	     },{
+		columnName : '吸痰盅',
+		includeTousse : [
+		    {id : 371,tousseName : '吸痰盅(中）'},
+		    {id : 372,tousseName : '吸痰盅(特大）'},
+		    {id : 373,tousseName : '吸痰盅(大）'}
+		]
+	     },{
+		columnName : '口腔包',
+		includeTousse : [
+		    {id : 655,tousseName : '口腔包'}
+		]
+	     },{
+		columnName : '铁钉',
+		includeTousse : [
+		    {id : 442,tousseName : '铁拆钉器'}
+		]
+	     },{
+		columnName : '胶钉',
+		includeTousse : [
+		    {id : 21,tousseName : '胶拆钉器'}
+		]
+	     },{
+		columnName : '骨钻包',
+		includeTousse : [
+		    {id : 1128,tousseName : '骨钻包'}
+		]
+	     },{
+		columnName : '直止',
+		includeTousse : [
+		    {id : 201,tousseName : '直止血钳（26cm）'},
+		    {id : 202,tousseName : '直止血钳（24cm）'},
+		    {id : 203,tousseName : '直止血钳（22cm）'},
+		    {id : 204,tousseName : '直止血钳（20cm）'},
+		    {id : 205,tousseName : '直止血钳(18cm)'},
+		    {id : 206,tousseName : '直止血钳(16cm)'},
+		    {id : 207,tousseName : '直止血钳（14cm）'},
+		    {id : 208,tousseName : '直止血钳（12.5cm）'},
+		    {id : 209,tousseName : '直止血钳'}
+		]
+	     },{
+		columnName : '弯止',
+		includeTousse : [
+		    {id : 401,tousseName : '弯止血钳(26cm)'},
+		    {id : 402,tousseName : '弯止血钳(24cm)'},
+		    {id : 403,tousseName : '弯止血钳(22cm)'},
+		    {id : 404,tousseName : '弯止血钳(20cm)'},
+		    {id : 405,tousseName : '弯止血钳(18cm)'},
+		    {id : 406,tousseName : '弯止血钳(16cm)'},
+		    {id : 407,tousseName : '弯止血钳(14cm)'},
+		    {id : 408,tousseName : '弯止血钳(12.5cm)'}
+		]
+	     }
+	  ],
+
+	  呼吸机管道 : [
+	    {
+			columnName : '管道',
+			includeTousse : [
+				{id : 1259,tousseName : '呼吸机管道'}
+			]
+	    },{
+			columnName : '集水杯',
+			includeTousse : [
+				
+			]
+	    },{
+			columnName : '湿化罐',
+			includeTousse : [
+				{id : 1071,tousseName : '湿化罐'}
+			]
+	    },{
+			columnName : 'Y接头',
+			includeTousse : [
+			   
+			]
+	    },{
+			columnName : '小接头',
+			includeTousse : [
+			   {id : 334,tousseName : '小接头'}
+			]
+	    },{
+			columnName : '过滤器',
+			includeTousse : [
+			   {id : 1154,tousseName : '过滤器'}
+			]
+	    },{
+			columnName : '回路',
+			includeTousse : [
+			   
+			]
+	    }
+	],
+
+	住院专科 : [
+	    {
+			showDepart : '五官',
+			depart : '眼、耳鼻喉科病区',
+			departCoding : '1002011002'
+	    },{
+			showDepart : '肛肠',
+			depart : '肛肠科病区',
+			departCoding : '1002011102'
+	    },{
+			showDepart : '妇科',
+			depart : '妇产科病区',
+			departCoding : '1002010802'
+	    }
+	],
+
+	门诊专科 : [
+	    {
+			showDepart : '五官',
+			depart : '门诊眼、耳鼻喉科',
+			departCoding : ''
+	    },{
+			showDepart : '妇科',
+			depart : '妇产科门诊',
+			departCoding : ''
+	    },{
+			showDepart : '口腔科',
+			depart : '门诊口腔科',
+			departCoding : ''
+	    },{
+			showDepart : '胃镜室',
+			depart : '内窥胃镜室',
+			departCoding : ''
+	    },{
+			showDepart : '皮肤科',
+			depart : '门诊皮肤科',
+			departCoding : ''
+	    },{
+			showDepart : '注射室',
+			depart : '门诊注射室',
+			departCoding : ''
+	    },{
+			showDepart : '介入室',
+			depart : '介入治疗室',
+			departCoding : '2001010703'
+	    },{
+			showDepart : '血透室',
+			depart : '血透室病区',
+			departCoding : '1002012802'
+	    },{
+			showDepart : '治未病科(康复科)',
+			depart : '治未病科(康复科)',
+			departCoding : ''
+	    },{
+			showDepart : '治未病科（辨识体验科）',
+			depart : '治未病科（辨识体验科）',
+			departCoding : ''
+	    },{
+			showDepart : '骨伤',
+			depart : '门诊骨伤科',
+			departCoding : ''
+	    },{
+			showDepart : '肛肠',
+			depart : '肛肠科门诊',
+			departCoding : ''
+	    },{
+			showDepart : '门外',
+			depart : '中心门诊手术室',
+			departCoding : ''
+	    },{
+			showDepart : '急诊',
+			depart : '急症病房（区）',
+			departCoding : ''
+	    }
+	],
+
+	分院 : [
+	    {
+			showDepart : '儿科',
+			depart : '分院门诊儿科',
+			departCoding : ''
+	    },{
+			showDepart : '皮肤科',
+			depart : '分院门诊皮肤科',
+			departCoding : ''
+	    },{
+			showDepart : '五官科',
+			depart : '分院门诊眼、耳鼻喉科',
+			departCoding : ''
+	    },{
+			showDepart : '妇科',
+			depart : '分院门诊妇科',
+			departCoding : ''
+	    },{
+			showDepart : '口腔科',
+			depart : '分院门诊口腔科',
+			departCoding : ''
+	    },{
+			showDepart : '骨伤科',
+			depart : '分院门诊骨伤科',
+			departCoding : ''
+	    },{
+			showDepart : '急诊',
+			depart : '分院急诊门诊',
+			departCoding : ''
+	    },{
+			showDepart : '门外',
+			depart : '分院门诊外科',
+			departCoding : ''
+	    },{
+			showDepart : '胃镜室',
+			depart : '分院内窥镜室',
+			departCoding : '20010204'
+	    },{
+			showDepart : '中医堂',
+			depart : '中医堂',
+			departCoding : '100104'
+	    },{
+			showDepart : '内六科病区',
+			depart : '内六科病区',
+			departCoding : '1002012402'
+	    },{
+			showDepart : '内八科病区',
+			depart : '内八科病区',
+			departCoding : '1002012602'
+	    },{
+			showDepart : '内七科病区',
+			depart : '内七科病区',
+			departCoding : '1002012502'
+	    }
+	]
+
+
+}