Index: ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js
===================================================================
diff -u -r24830 -r24981
--- ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js	(.../printRecyclingDetailWin.js)	(revision 24830)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js	(.../printRecyclingDetailWin.js)	(revision 24981)
@@ -699,19 +699,41 @@
 	LODOP.ADD_PRINT_TEXT(35,270,"100%",5,"结束时间:" + endDateTime);
 	LODOP.ADD_PRINT_TEXT(35,520,"100%",5,"打印时间:" + new Date().format('Y-m-d H:i:s'));
 	
-	var htmlTable ="<table border ='1' cellspacing=0 cellpadding=0 style='border-collapse:collapse' bordercolor='#000000' style='width: 200mm;'>";
+	var htmlTable ="<table border ='1' cellspacing=0 cellpadding=0 style='border-collapse:collapse' bordercolor='#000000' width='99%'>";
 	//供应室器械包(一行抬头+一行数据)
-	htmlTable += "<tr><td colspan='2' style='font-size:16px;text-align:center;'><b>供应室器械包</b></td></tr>";
-	if(recyclingDetail.supplyRoomTousse){
-		htmlTable += "<tr><td colspan='2' style='font-size:14px;'>"+ recyclingDetail.supplyRoomTousse +"</td></tr>";
+	htmlTable += "<tr><td colspan='10' style='font-size:16px;text-align:center;'><b>供应室器械</b></td></tr>";
+	if(recyclingDetail.supplyRoomTousse && recyclingDetail.supplyRoomTousse.length > 0){
+		//htmlTable += "<tr><td colspan='2' style='font-size:14px;'>"+ recyclingDetail.supplyRoomTousse +"</td></tr>";
+		htmlTable += "<tr><td width='15%' style='text-align:center;'>物品名称</td><td width='5%' style='text-align:center;'>数量</td><td width='15%' style='text-align:center;'>物品名称</td><td width='5%' style='text-align:center;'>数量</td><td width='15%' style='text-align:center;'>物品名称</td><td width='5%' style='text-align:center;'>数量</td><td width='15%' style='text-align:center;'>物品名称</td><td width='5%' style='text-align:center;'>数量</td><td width='15%' style='text-align:center;'>物品名称</td><td width='5%' style='text-align:center;'>数量</td></tr>";
+		var tousseCountPerRow = 5;
+		var rowLineCount = (recyclingDetail.supplyRoomTousse.length + 4) / tousseCountPerRow;
+		for(var i = 0;i < Math.floor(rowLineCount);i++){
+			htmlTable += "<tr><td>"+ recyclingDetail.supplyRoomTousse[i * rowLineCount]["tousseName"] +"</td><td style='text-align:center;'>"+ recyclingDetail.supplyRoomTousse[i * rowLineCount]["amount"] +"</td>";
+			for(var j = 1;j < tousseCountPerRow;j++){
+				var tousseName;
+				var amount;
+				if(recyclingDetail.supplyRoomTousse.length > (i * rowLineCount + j)){
+					tousseName = recyclingDetail.supplyRoomTousse[i * rowLineCount + j]["tousseName"];
+					amount = recyclingDetail.supplyRoomTousse[i * rowLineCount + j]["amount"];
+				}else{
+					tousseName = "&nbsp;";
+					amount = "&nbsp;";
+				}
+				htmlTable += "<td>"+ tousseName +"</td><td style='text-align:center;'>"+ amount +"</td>";
+				if(j == tousseCountPerRow - 1){
+					htmlTable += "</tr>";
+				}
+			}
+			
+		}
 	}
 	//专科器械包(一行抬头+多行数据(每个科室1行、需要遍历))
-	htmlTable += "<tr><td colspan='2' style='font-size:16px;text-align:center;'><b>专科器械包</b></td></tr>";
+	htmlTable += "<tr><td colspan='10' style='font-size:16px;text-align:center;'><b>各科器械</b></td></tr>";
 
 	if(recyclingDetail.specializedTousse && recyclingDetail.specializedTousse.length){
 		for(var i = 0;i < recyclingDetail.specializedTousse.length;i++){
 			var specializedTousse = recyclingDetail.specializedTousse[i];
-			htmlTable += "<tr style='font-size:14px;'><td width='25%'>"+ specializedTousse.departName +"</td><td width='75%'>"+ specializedTousse.tousseDetail +"</td></tr>";
+			htmlTable += "<tr style='font-size:14px;'><td width='15%'>"+ specializedTousse.departName +"</td><td colspan='9' width='85%'>"+ specializedTousse.tousseDetail +"</td></tr>";
 		}
 	}
 
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r24974 -r24981
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 24974)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 24981)
@@ -2079,7 +2079,8 @@
 							supplyRoomTousseNote.append(vo.getTousseName() + "*" + vo.getAmount());
 						}
 					}
-					JSONUtil.addProperty(json, supplyRoomTousseKey, supplyRoomTousseNote.toString());
+					//JSONUtil.addProperty(json, supplyRoomTousseKey, supplyRoomTousseNote.toString());
+					JSONUtil.addProperty(json, supplyRoomTousseKey, JSONArray.fromObject(list));
 					//专科器械包
 					list = map.get(specializedTousseKey);
 					JSONArray jsonArray = new JSONArray();