Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r23156 -r23257 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 23156) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 23257) @@ -2801,10 +2801,17 @@ JSONUtil.addProperty(json, "invoiceGroups", groups); JSONUtil.addProperty(json, "applyDateList", getInvoiceListApplyDateList(expressInvoice || todayDefaultInPDAInvoice)); JSONUtil.addProperty(json, "tousseTypeArray", getInvoicePlanListTousseTypeArray(expressInvoice)); + JSONUtil.addProperty(json, "sterileMethod", getInvoicePlanListSterileMethodArray()); return json.toString(); } + private JSONArray getInvoicePlanListSterileMethodArray(){ + List allSterilisationList = sterilisationManager.getAllSterilisation(); + Collections.sort(allSterilisationList,Sterilisation.NAME_COMPARATOR); + JsonConfig jc = JSONUtil.buildJsonConfig("sterilisation"); + return JSONArray.fromObject(allSterilisationList,jc); + } @SuppressWarnings("unchecked") @Override public String getProxyDisinfectionList(JSONObject params) {