Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r26253 -r26259
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 26253)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 26259)
@@ -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 && goodsArray[k].tousseType =="消毒物品"){
+					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'";
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/config.js
===================================================================
diff -u -r26256 -r26259
--- ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/config.js	(.../config.js)	(revision 26256)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/config.js	(.../config.js)	(revision 26259)
@@ -149,5 +149,8 @@
   //是否启用"一键扫描一次性物品"按钮，没配置或值为false，不启用该功能；值为true，启动该功能。 
   oneKeyScanDisposableGoodsForPDA : true,
   //科室申领视图列表的排序规则;最后对象的value为空,默认取对应js文件里的defaultSortDirection的value,现在为DESC;默认排序：committedStatus asc,printed asc,orderByFiled asc,applicationTime desc
-  orderRuleOfDepartApplicationView : '[{committedStatus:"ASC",},{printed:"ASC"},{depart:"ASC"},{orderByFiled:"ASC"},{applicationTime:""}]'
+  orderRuleOfDepartApplicationView : '[{committedStatus:"ASC",},{printed:"ASC"},{depart:"ASC"},{orderByFiled:"ASC"},{applicationTime:""}]',
+  //按包数打印消毒物品的数量
+   printDisinfectionGoodsAmountByPackage:true
+
 }
\ No newline at end of file