Index: ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js =================================================================== diff -u -r15986 -r16074 --- ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 15986) +++ ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 16074) @@ -433,7 +433,7 @@ printBarcode = tousseObj.fixedBarcode; } tousseObj.sterilizationUser = records[i].data['sterilizationUser']; - var printSummaryObj = {'barcode':printBarcode, 'name':tousseObj.tousseName, 'applicant':applicant, 'depart': depart, 'sterilizationDate':tousseObj.sterilizationDate, 'validDate':tousseObj.validDate, + var printSummaryObj = {'barcode':printBarcode, 'name':tousseObj.tousseName,'nameWithoutDepart':tousseObj.tousseNameWithoutDepart, 'applicant':applicant, 'depart': depart, 'sterilizationDate':tousseObj.sterilizationDate, 'validDate':tousseObj.validDate, 'hospitalName':hospitalName, 'sterilizer':sterilizer, 'frequency':frequency, 'material':material, 'sterilingType':tousseObj.sterilingType, 'maker':tousseObj.maker,'assistant':tousseObj.assistant}; top.Ext4.applyIf(printSummaryObj,tousseObj); @@ -442,6 +442,8 @@ } else{ top.Ext4.applyIf(tousseObj,records[i].data); + //先将名称存到另一个未含科室名的名称属性里(针对东莞中医院的打印调整) + tousseObj.nameWithoutDepart = tousseObj.tousseName; //打印消毒物品 if(tousseObj.isDisinfection){ printLabelOfDisinfection(tousseObj);