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);