Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r15074 -r15077 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 15074) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 15077) @@ -772,8 +772,11 @@ for (MaterialInstance materialInstance : materialInstances) { JSONObject obj = new JSONObject(); obj.put("id", materialInstance.getId()); - obj.put("materialName", - materialInstance.getMaterialName()); + String materialName = materialInstance.getMaterialName(); + if(materialInstance.getMaterialDefinition() != null){ + materialName = CssdUtils.getMaterialName(materialInstance.getMaterialDefinition()); + } + obj.put("materialName",materialName); obj.put("amount", materialInstance.getCount()); obj.put("includeImplant", materialInstance.getIncludeImplant());