Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java =================================================================== diff -u -r29592 -r29981 --- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java (.../IDCardDefinitionManagerImpl.java) (revision 29592) +++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java (.../IDCardDefinitionManagerImpl.java) (revision 29981) @@ -636,7 +636,15 @@ JsonObject tousseDefinitionObj = new JsonParser().parse( tousseDefinitionJsonStr).getAsJsonObject(); - + // 灭菌程序原值取的是包定义信息中的“灭菌程序”,需改成取灭菌程序中的“灭菌程序简称”,如果灭菌程序简称为空,则取“灭菌程序”的值(ZSRY-10) + String sterilingMethod = tousseDefinition.getSterilingMethod(); + Sterilisation sterilisation = sterilisationManager.getSterilisationByName(sterilingMethod); + if(sterilisation != null){ + String sterilisationAbbreviation = sterilisation.getSterilisationAbbreviation(); + tousseDefinitionObj.addProperty("sterilisationAbbreviation", sterilisationAbbreviation == null ? "" : sterilisationAbbreviation); + }else{ + tousseDefinitionObj.addProperty("sterilisationAbbreviation", ""); + } tousseDefinitionObj.addProperty("imagesCount", tousseDefinition.getImagesCount(objectDao)); idCardInstanceObj.add("tousseDefinition", tousseDefinitionObj);