Index: ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js =================================================================== diff -u -r17492 -r18036 --- ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js (.../printConfig.js) (revision 17492) +++ ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js (.../printConfig.js) (revision 18036) @@ -1895,7 +1895,9 @@ }*/ //调整为消毒物品的器械包定义是否打印科室如果为是,则打印科室名称 if(tousseObj.printOrgSource != "无"){ - tousseName = "(" + department + ")" + tousseName; + if(tousseName.indexOf(departPrefix) == -1){// 此方法可能会被嵌套调用多次 + tousseName = "(" + department + ")" + tousseName; + } } } for ( var j = 0; j < barcodes.length; j++) { Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js =================================================================== diff -u -r18020 -r18036 --- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js (.../printConfig.js) (revision 18020) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js (.../printConfig.js) (revision 18036) @@ -1251,7 +1251,10 @@ }*/ //调整为消毒物品的器械包定义是否打印科室如果为是,则打印科室名称 if(tousseObj.printOrgSource != "无"){ - tousseName = "(" + department + ")" + tousseName; + var departPrefix = "(" + tousseObj.department + ")"; + if(tousseName.indexOf(departPrefix) == -1){// 此方法可能会被嵌套调用多次 + tousseName = "(" + department + ")" + tousseName; + } } } for ( var j = 0; j < barcodes.length; j++) { Index: ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js =================================================================== diff -u -r17989 -r18036 --- ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 17989) +++ ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 18036) @@ -478,7 +478,10 @@ // 打印器械包 else{ if(tousseObj.printOrgSource != "无"){ - tousseObj.tousseName = "(" + tousseObj.department + ")" + tousseObj.tousseName;; + var departPrefix = "(" + tousseObj.department + ")"; + if(tousseObj.tousseName.indexOf(departPrefix) == -1){// 此方法可能会被嵌套调用多次 + tousseObj.tousseName = "(" + tousseObj.department + ")" + tousseObj.tousseName;; + } } printLabel(tousseObj); }