Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java =================================================================== diff -u -r36594 -r36678 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 36594) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java (.../SterilizationRecordAction.java) (revision 36678) @@ -1190,10 +1190,7 @@ } } } - - for (String key : resultMap.keySet()) { - resultJsonArray1.add(resultMap.get(key)); - } + resultJsonArray1.addAll(resultMap.values()); String includeImplant = TousseDefinition.STR_NO; for (Object object : resultJsonArray1) { JSONObject a=(JSONObject) object; @@ -1322,6 +1319,8 @@ returnDataJsonObject.put("name", tousseInstance.getTousseName()); returnDataJsonObject.put("typeForSterilizationStatistics", getTypeForSterilizationStatistics(tousseInstance)); returnDataJsonObject.put("includeImplant", tousseDefinition.getIncludeImplantStr()); + returnDataJsonObject.put("spelling", tousseDefinition.getSpelling()); + returnDataJsonObject.put("wbCode", tousseDefinition.getWbCode()); if(TousseDefinition.STR_NO.equals(tousseDefinition.getIsTraceable())){ returnDataJsonObject.put("fixedBarcode", tousseDefinitionIdToFixedBarodeMap.get(tousseDefinition.getId().toString())); returnDataJsonObject.put("sterilingMode", sterilisation == null ? "" : sterilisation.getSterilizationMode()); @@ -1423,6 +1422,8 @@ String fixedBarcode =""; returnDataJsonObject.put("fixedBarcode", fixedBarcode); returnDataJsonObject.put("includeImplant", tousseDefinition.getIncludeImplantStr()); + returnDataJsonObject.put("spelling", tousseDefinition.getSpelling()); + returnDataJsonObject.put("wbCode", tousseDefinition.getWbCode()); if(TousseDefinition.STR_NO.equals(tousseDefinition.getIsTraceable())){ fixedBarcode = tousseInstanceManager. getTousseFixedBarcodeByBarcode(tousseInstance.getBarcode(),TousseDefinition.STR_NO); returnDataJsonObject.put("fixedBarcode", fixedBarcode); @@ -1535,6 +1536,8 @@ jsonObject.put("name", tousseInstance.getTousseName()); jsonObject.put("typeForSterilizationStatistics", getTypeForSterilizationStatistics(tousseInstance)); jsonObject.put("includeImplant", tousseDefinition.getIncludeImplantStr()); + jsonObject.put("spelling", tousseDefinition.getSpelling()); + jsonObject.put("wbCode", tousseDefinition.getWbCode()); tousseInstanceArr.add(jsonObject); } }