Index: ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js
===================================================================
diff -u -r26124 -r26146
--- ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js	(.../printRecyclingDetailWin.js)	(revision 26124)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js	(.../printRecyclingDetailWin.js)	(revision 26146)
@@ -391,9 +391,12 @@
 	
 }
 
-//打印回收清单对供应室器械的表格的物品进行排序（广州中医药附一）
+//打印回收清单对供应室器械的表格的物品进行排序
 function sortForsupplyRoomTousse(supplyRoomTousse){
 	var reSortSupplyRoomTousse = [];//含有排序规则(数组sortSupplyRoomTousseRule)里面的同名器械包的数组
+	if(typeof(supplyRoomTousse) == "undefined"){
+		return supplyRoomTousse;
+	}
 	for(var i = 0; i < sortSupplyRoomTousseRule.length; i++){
 		for(var j = 0; j < supplyRoomTousse.length; j++){
 			if(sortSupplyRoomTousseRule[i].tousseName == supplyRoomTousse[j].tousseName){
@@ -999,26 +1002,38 @@
 		//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 = Math.floor((recyclingDetail.supplyRoomTousse.length + 4) / tousseCountPerRow);
-		for(var i = 0;i < rowLineCount;i++){
-			htmlTable += "<tr><td>"+ recyclingDetail.supplyRoomTousse[i * tousseCountPerRow]["tousseName"] +"</td><td style='text-align:center;'>"+ recyclingDetail.supplyRoomTousse[i * tousseCountPerRow]["amount"] +"</td>";
-			for(var j = 1;j < tousseCountPerRow;j++){
-				var tousseName;
-				var amount;
-				if(recyclingDetail.supplyRoomTousse.length > (i * tousseCountPerRow + j)){
-					tousseName = recyclingDetail.supplyRoomTousse[i * tousseCountPerRow + j]["tousseName"];
-					amount = recyclingDetail.supplyRoomTousse[i * tousseCountPerRow + j]["amount"];
-				}else{
-					tousseName = "&nbsp;";
-					amount = "&nbsp;";
+		var tbarr = [];
+		var rowCount = 0;//总共需要显示的行数
+		var supplyRoomTousse = recyclingDetail.supplyRoomTousse;
+		if((supplyRoomTousse.length)%tousseCountPerRow == 0){
+			rowCount = supplyRoomTousse.length/tousseCountPerRow;
+		}else{
+			rowCount = Math.floor((supplyRoomTousse.length/tousseCountPerRow) + 1);
+		}
+		var inarr = [];
+		for(var i = 0; i < supplyRoomTousse.length; i++){
+			inarr.push(supplyRoomTousse[i]);
+			if((i+1)%rowCount == 0 || (i+1) == supplyRoomTousse.length){
+				tbarr.push(inarr);
+				inarr = [];
+			}
+		}
+		for(var j = 0; j < rowCount; j++){
+			htmlTable += "<tr>";
+			for(var k = 0; k < tousseCountPerRow; k++){
+				if(tbarr[k][j] != null){
+					htmlTable += "<td>";
+					htmlTable += tbarr[k][j].tousseName;
+					htmlTable += "</td>";
+					htmlTable += "<td style='text-align:center;'>";
+					htmlTable += tbarr[k][j].amount ;
+					htmlTable += "</td>";
 				}
-				htmlTable += "<td>"+ tousseName +"</td><td style='text-align:center;'>"+ amount +"</td>";
-				if(j == tousseCountPerRow - 1){
-					htmlTable += "</tr>";
+				else{
+					htmlTable += "<td></td><td></td>";
 				}
 			}
-			
+			htmlTable += "</tr>";
 		}
 	}
 	//专科器械包(一行抬头+多行数据(每个科室1行、需要遍历))