Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js =================================================================== diff -u -r29817 -r29927 --- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 29817) +++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 29927) @@ -387,15 +387,17 @@ printBarcodeStr = fixedBarcode; } addDepartPrefixForTousseName(tousseObj); - var obj = {'barcode':printBarcodeStr,'virtualBasketSeqNum':seq, 'name':tousseObj.tousseName,'pageType':barcodePaperType, 'materials':tousseObj.materials, 'operator':operatorToPrint, 'reviewer': reviewerToPrint,'sterilizationUser':sterilizationUserToPrint, 'sterilizationDate':sterilizationDate, 'validDate':validDate, + var obj = {'barcode':printBarcodeStr,'virtualBasketSeqNum':seq, 'name':tousseName,'pageType':barcodePaperType, 'materials':tousseObj.materials, 'operator':operatorToPrint, 'reviewer': reviewerToPrint,'sterilizationUser':sterilizationUserToPrint, 'sterilizationDate':sterilizationDate, 'validDate':validDate, 'hospitalName':hospitalName, 'sterilizer':sterilizer, 'frequency':frequency, 'markTousse':markTousse, 'sterilingType':sterilingType,'materialAmount':jsonObj.materialAmount,'diposableGoodsAmount':jsonObj.diposableGoodsAmount,'totalAmount':jsonObj.totalAmount, 'idCardDefinitionUseAmount':idCardDefinitionUseAmount,'packageTypeAbbreviation':packageTypeAbbreviation,'storageLocationCode':storageLocationCode,'simpleName':simpleName,'operationDate':operationDate,'inspectorName':inspectorName,'remark':remark}; - obj.depart = tousseObj.depart; + obj.washOperator = tousseObj.washOperator; - obj.tousseType = tousseObj.tousseType; + obj.tousseType = tousseObj.tousseType; + dingxiang_applyIf(obj,tousseObj); + obj.nameWithoutDepart = tousseObj.tousseNameWithoutDepart; obj.tousseNameWithoutDepart = tousseObj.tousseNameWithoutDepart; obj.includedTousseAmount = tousseObj.includedTousseAmount; - defaultPrintPackage(obj); + defaultPrintPackage(obj); } }