Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r26081 -r26248
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 26081)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 26248)
@@ -422,12 +422,14 @@
 		var goodsArray = printSummaryObj.goods;
 		for ( var k = 0; k < goodsArray.length; k++) {
 			var row = goodsArray[k];
-				
 			tableHtml = appendTableRowString(tableHtml, myObj.goodsTable.rowHeight , myObj.goodsTable.fontSize);
 			for (var i=0;i<columnCount;i++){
 				var item = myObj.goodsTable.columns[i];
-				
 				var value = row[item.dataIndex];
+				//广州中药附一消毒物品显示包的数量和材料的数量
+				if(item.dataIndex == "goodsAmount" && sstsConfig.printDisinfectionGoodsAmountByPackage){
+					value = goodsArray[k].packageAmount +"("+ goodsArray[k].materialsAmount +")";
+				}
 				if (item.dataIndex.toLowerCase().indexOf("price") >= 0){
 					value = formatMoney(value);
 				}
@@ -520,6 +522,9 @@
 						//江门中心市医院要求金额和数量右对齐
 						tableHtml += "'right'" + " style=" + "'BORDER: #000000 1px solid; padding-right:0px;'>" ;
 						tableHtml += value;
+					}else if(sstsConfig.printDisinfectionGoodsAmountByPackage){
+						tableHtml += "'right'" + " style=" + "'BORDER: #000000 1px solid; padding-right:0px;'>" ;
+						tableHtml += value;
 					}
 					else{
 						tableHtml += "'center'";
@@ -542,6 +547,9 @@
 						//江门中心市医院要求金额和数量右对齐
 						tableHtml += "'right'" + " style=" + "'BORDER: #000000 1px solid; padding-right:0px;'>" ;
 						tableHtml += value;
+					}else if(sstsConfig.printDisinfectionGoodsAmountByPackage){
+						tableHtml += "'right'" + " style=" + "'BORDER: #000000 1px solid; padding-right:0px;'>" ;
+						tableHtml += value;
 					}
 					else{
 						tableHtml += "'center'";