Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r28653 -r28793 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 28653) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 28793) @@ -1452,7 +1452,7 @@ config.registerJsonValueProcessor(Date.class, _defaultDateJsonValueProcessor3); final String[] retainPropertys = { "id", "tousseDefinition", - "tousseName", "barcode", "validUntil", "sterilingType", + "tousseName", "barcode", "validUntil", "sterilingType","sterilingMode", "orgUnitCoding", "orgUnitName","sterilizerPosition","actualUsed","operator" }; PropertyFilter filter = new PropertyFilter() { @Override @@ -2087,7 +2087,7 @@ .value("containerStatus").key("data").object() .key("container").object().key("barcode") .value(container.getBarcode()).key("name") - .value(container.getContainerName()).endObject() + .value(container.getContainerName()).key("sterilingMode").value(container.getSterilingMode()).endObject() .key("tousseInstanceList").value(tousseInstanceJSONArray) .endObject().endObject().toString(); @@ -2314,6 +2314,8 @@ JSONObject result = new JSONObject(); result.put("barcode", sterilisation.getBarcode()); result.put("name", sterilisation.getSterilisation()); + result.put("name", sterilisation.getSterilisation()); + result.put("sterilizationMode", sterilisation.getSterilizationMode()); result.put("sterilizationPurpose", StringTools.defaultIfEmpty(sterilisation.getSterilizationPurpose(), "")); result.put("addTousse", sterilisation.canAddTousse()); return result; @@ -2516,6 +2518,8 @@ .getBarcode()); containerJSONObj.put("name", sterilingContainer .getContainerName()); + containerJSONObj.put("sterilingMode", sterilingContainer + .getSterilingMode()); result.put("container", containerJSONObj); List vos = tousseInstanceManager