Index: ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js
===================================================================
diff -u -r15619 -r16076
--- ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js	(.../printRecyclingDetailWin.js)	(revision 15619)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js	(.../printRecyclingDetailWin.js)	(revision 16076)
@@ -292,7 +292,7 @@
 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;'>";
+	htmlTable += "<tr style='font-size:13px;'>";
 	var config = data["配置文件"];
 	var titleConfig = config[model];
 	var columnLength = 0;
@@ -304,9 +304,15 @@
 		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>";
+			var width = "15mm;";
+			if(columnName == "其他器械"){
+				width = "45mm;";
+			}
+			if(columnName == "便提式呼吸管道" || columnName == "便捷式呼吸机管道"){
+				width = "30mm;";
+			}
+			htmlTable += "<td style='width: "+width+"height: 9mm;' align='center'>" + columnName + "</td>";
 		}
-		htmlTable += "<td style='width: 50mm;height: 9mm;' align='center'>其他器械</td>";
 	}
 	htmlTable += "</tr>";
 	//数据填充
@@ -320,19 +326,33 @@
 				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;
+					if(value == undefined || value == null){
+						value = 0;
 					}
-					totalColumnName[tmpColumnName] = (oldAmount + value);
-					if(value == 0){
-						value = "";
+					if(!isNaN(value)){
+						//合计
+						var oldAmount = totalColumnName[tmpColumnName];
+						if(oldAmount == null ||oldAmount　== ""){
+							oldAmount = 0;
+						}
+						totalColumnName[tmpColumnName] = (oldAmount + value);
+						if(value == 0){
+							value = "";
+						}
+					}else{
+						var others = value;
+						var tdValue = "";
+						for(var m = 0 ; m < others.length ; m++){
+							if(tdValue != ""){
+								tdValue += ", ";
+							}
+							tdValue += (others[m].tousseName + " " + others[m].amount);
+						}
+						value = tdValue;
 					}
 					htmlTable += "<td style='width: 15mm;' align='center'>" + value + "</td>";
 				}
 			}
-			htmlTable += "<td style='width: 50mm;' align='center'></td>";
 			htmlTable += "</tr>";
 		}
 	}
@@ -344,7 +364,6 @@
 			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>";
 		}
 	}
@@ -361,7 +380,6 @@
 			}
 			htmlTable += "<td style='width: 15mm;' align='center'>" + totalAmount + "</td>";
 		}
-		htmlTable += "<td style='width: 50mm;' align='center'></td>";
 	}
 	
 	htmlTable += "</table>";
@@ -374,13 +392,16 @@
 		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++){ 
+		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 += (tousseItem.tousseName + tousseItem.amount) + "    ";
 			}
 			html += "<br>";
+			html += "--------------------------------------------------------------------------------------------";
+			html += "-----------------------------------------";
+			html += "<br>";
 		}
 		html += "</td>"; 
 		html += "</tr>";
@@ -400,11 +421,11 @@
 	var htmlTable ="<table border ='0' style='width: 200mm'>";
 	//普通器械
 	htmlTable += "<tr><td>";
-	htmlTable += buildTable(recyclingDetail,"普通器械",25);
+	htmlTable += buildTable(recyclingDetail,"普通器械列头",24);
 	htmlTable += "</td></tr>";
 	//呼吸机管道
 	htmlTable += "<tr><td>";
-	htmlTable += buildTable(recyclingDetail,"呼吸机管道",9);
+	htmlTable += buildTable(recyclingDetail,"呼吸机管道",8);
 	htmlTable += "</td></tr>";
 	//住院科室
 	htmlTable += "<tr><td>";