Index: ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js =================================================================== diff -u -r14965 -r15299 --- ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 14965) +++ ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 15299) @@ -68,6 +68,7 @@ {name : 'fixedBarcode'}, {name : 'packer'}, {name : 'washOperator'}, + {name : 'washOperatorCode'}, {name : 'reviewer'}, {name : 'packTime'}, {name : 'sterileStartTime'}, @@ -79,6 +80,8 @@ {name : 'supplierName'}, {name : 'sterilizer'}, {name : 'frequency'}, + {name : 'sterilizationUser'}, + {name : 'sterilizationUserCode'}, {name : 'status'}, {name : 'isTraceable'}, {name : 'modifiedInfo'}, @@ -338,15 +341,19 @@ var operator = records[i].data['packer']; - tousseObj.washOperator = records[i].data['washOperator']; + var washOperator = records[i].data['washOperator']; var reviewer = records[i].data['reviewer']; + var sterilizationUser = records[i].data['sterilizationUser']; if(!printFullName){ operator = records[i].data['packerCode']; reviewer = records[i].data['reviewerCode']; + sterilizationUser = records[i].data['sterilizationUserCode']; + washOperator = records[i].data['washOperatorCode']; } - + tousseObj.washOperator = washOperator; tousseObj.operatorToPrint = operator; tousseObj.reviewerToPrint = reviewer; + tousseObj.sterilizationUserToPrint = sterilizationUser; tousseObj.sterilizerName = records[i].data['sterilizer']; tousseObj.sterileFrequency = records[i].data['frequency']; var materialTypeTotal = records[i].data['materialTypeTotal'];