Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilisation/Sterilisation.java =================================================================== diff -u -r18261 -r23209 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilisation/Sterilisation.java (.../Sterilisation.java) (revision 18261) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/sterilisation/Sterilisation.java (.../Sterilisation.java) (revision 23209) @@ -1,5 +1,6 @@ package com.forgon.disinfectsystem.entity.basedatamanager.sterilisation; +import java.util.Comparator; import java.util.LinkedHashMap; import java.util.Map; @@ -200,4 +201,21 @@ this.chemistryResultDefault = chemistryResultDefault; } + public static final Comparator NAME_COMPARATOR = new Comparator() { + @Override + public int compare(Sterilisation o1, + Sterilisation o2) { + String s1 = o1.getSterilisation(); + String s2 = o2.getSterilisation(); + if(s1 == null && s2 == null){ + return 0; + }else if(s1 == null){ + return -1; + }else if(s2 == null){ + return 1; + }else{ + return s1.compareTo(s2); + } + } + }; } Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp =================================================================== diff -u -r23157 -r23209 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp (.../invoicePlanExtractedView.jsp) (revision 23157) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp (.../invoicePlanExtractedView.jsp) (revision 23209) @@ -1,3 +1,4 @@ +<%@page import="java.util.Collections"%> <%@page import="org.apache.velocity.runtime.directive.Foreach"%> <%@page import="net.sf.json.JSONArray"%> <%@page import="java.text.SimpleDateFormat"%> @@ -52,6 +53,7 @@ JSONArray allSterilisationJSONArray = new JSONArray(); if(allSterilisationList != null){ + Collections.sort(allSterilisationList,Sterilisation.NAME_COMPARATOR); for(Sterilisation sterilisation : allSterilisationList){ JSONArray sterilisationJSONArray = new JSONArray(); sterilisationJSONArray.add(sterilisation.getSterilisation());