Index: ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/print/printConfig.js =================================================================== diff -u -r32797 -r32799 --- ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/print/printConfig.js (.../printConfig.js) (revision 32797) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/print/printConfig.js (.../printConfig.js) (revision 32799) @@ -831,6 +831,11 @@ var name = idCardInstance.tousseDefinition.name; var packageType = idCardInstance.tousseDefinition.packageType; var sterilingMethod = idCardInstance.tousseDefinition.sterilingMethod; + var sterilisationAbbreviation = idCardInstance.tousseDefinition.sterilisationAbbreviation || ''; + + if(sterilisationAbbreviation !== ''){ + sterilingMethod = sterilisationAbbreviation; + } var userName = idCardInstance.userName; var unit = idCardInstance.unit; var description = idCardInstance.description; @@ -1029,6 +1034,11 @@ var name = idCardInstance.tousseDefinition.name; var packageType = idCardInstance.tousseDefinition.packageType; var sterilingMethod = idCardInstance.tousseDefinition.sterilingMethod; + var sterilisationAbbreviation = idCardInstance.tousseDefinition.sterilisationAbbreviation || ''; + + if(sterilisationAbbreviation !== ''){ + sterilingMethod = sterilisationAbbreviation; + } var userName = idCardInstance.userName; var unit = idCardInstance.unit; var description = idCardInstance.description; @@ -1515,8 +1525,13 @@ var barcode = tousseDefinitionObj.barcode ? tousseDefinitionObj.barcode : ''; var packageType = tousseDefinitionObj.packageType; var sterilingMethod = tousseDefinitionObj.sterilingMethod; + var sterilisationAbbreviation = tousseDefinitionObj.sterilisationAbbreviation || ''; var amount = ret.amount; + if(sterilisationAbbreviation !== ''){ + sterilingMethod = sterilisationAbbreviation; + } + var tableHtml = ret.tableHtml + ""; tableHtml += "";