Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java =================================================================== diff -u -r33055 -r36213 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java (.../SterilizerAction.java) (revision 33055) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java (.../SterilizerAction.java) (revision 36213) @@ -330,28 +330,30 @@ jsonArray.add(arryObj); } } - } else { - if (list != null && list.size() > 0) { - for (int i = 0; i < list.size(); i++) { - if (list.get(i) instanceof Sterilisation) { - Sterilisation sterilisation = list - .get(i); - String purpose = ""; - if(StringUtils.isNotBlank(sterilisation.getSterilizationPurpose())){ - purpose = "("+sterilisation.getSterilizationPurpose()+")"; - } - JSONArray arryObj = new JSONArray(); - arryObj.add(sterilisation.getId()); - arryObj.add(sterilisation.getSterilisation()); - arryObj.add(sterilisation.getSterilisation()+purpose); - arryObj.add(sterilisation.getSterilizationMode()); - jsonArray.add(arryObj); + StrutsResponseUtils.output(jsonArray); + return; + } + + if (list != null && list.size() > 0) { + for (int i = 0; i < list.size(); i++) { + if (list.get(i) instanceof Sterilisation) { + Sterilisation sterilisation = list + .get(i); + String purpose = ""; + if(StringUtils.isNotBlank(sterilisation.getSterilizationPurpose())){ + purpose = "("+sterilisation.getSterilizationPurpose()+")"; } + JSONArray arryObj = new JSONArray(); + arryObj.add(sterilisation.getId()); + arryObj.add(sterilisation.getSterilisation()); + arryObj.add(sterilisation.getSterilisation()+purpose); + arryObj.add(sterilisation.getSterilizationMode()); + jsonArray.add(arryObj); } } } - StrutsResponseUtils.output(jsonArray); + } /**