Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js =================================================================== diff -u -r37300 -r38099 --- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 37300) +++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 38099) @@ -598,6 +598,7 @@ }; printSummaryObj.washOperator = tousseObj.washOperator; printSummaryObj.tousseType = tousseObj.tousseType; + printSummaryObj.printAmount = tousseObj.printAmount; dingxiang_applyIf(printSummaryObj,tousseObj); dingxiang_applyIf(printSummaryObj,foreignTousseAppInfo); @@ -630,6 +631,7 @@ obj.tousseNameWithoutDepart = tousseObj.tousseNameWithoutDepart; obj.includedTousseAmount = tousseObj.includedTousseAmount; obj.name = obj.tousseName; + obj.printAmount = obj.printAmount; defaultPrintPackage(obj); } } Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r38074 -r38099 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 38074) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 38099) @@ -2028,6 +2028,11 @@ obj.time = time; obj.printMode = 2; resetPrint(obj); + + if(obj.printAmount && obj.printAmount > 1){ + obj.printAmount = obj.printAmount - 1; + defaultPrintPackage(obj, time); + } // LODOP.PRINT_DESIGN ();// 打印设计 // LODOP.PREVIEW();//打印预览 } else { @@ -2327,6 +2332,10 @@ printForeignTousse_50x30(barcode, name, material, operator, reviewer, sterilizationDate, validDate, foreignPackageObjectArray, sterilizer, frequency, hospitalName, total); } LODOP.PRINT(); + if(printSummaryObj.printAmount && printSummaryObj.printAmount > 1){ + printSummaryObj.printAmount = printSummaryObj.printAmount - 1; + defaultPrintForeignToussePackage(printSummaryObj); + } // LODOP.PREVIEW(); } //打印外来器械60x80标签 @@ -4941,6 +4950,10 @@ obj.time = time; obj.printMode = 3; resetPrint(obj); + if(obj.printAmount && obj.printAmount > 1){ + obj.printAmount = obj.printAmount - 1; + invokeTemplatePrintFunction(pageType, obj, labelTemplate, time); + } return true; } return false;