diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index d947eb6..dfc5b4b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -517,20 +517,9 @@ public class AntenatalExaminationFacade { } } if(!listData.isEmpty()){ + sort(listData); sortList.add(listData); } - Collections.sort(listData, new Comparator() { - @Override - public int compare(AntData o1, AntData o2) { - if (o1.getCreated().after(o2.getCreated())) { - return -1; - } - if (o1.getCreated().before(o2.getCreated())) { - return 1; - } - return 0; - } - }); } PatientsQuery patientsQuery1=new PatientsQuery(); patientsQuery1.setYn(YnEnums.YES.getId()); @@ -541,12 +530,14 @@ public class AntenatalExaminationFacade { List list1=new ArrayList(); List l= buildPatientList(dueDate, patientsList, list1); if(!l.isEmpty()){ + sort(l); sortList.add(l); } }else{ List list1=new ArrayList(); List l=buildPatientList(dueDate, list, list1); if(!l.isEmpty()){ + sort(l); sortList.add(l); } } @@ -554,7 +545,20 @@ public class AntenatalExaminationFacade { antexListResult.setData(sortList); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult); } - + private void sort(List listData){ + Collections.sort(listData, new Comparator() { + @Override + public int compare(AntData o1, AntData o2) { + if (o1.getCreated().after(o2.getCreated())) { + return 1; + } + if (o1.getCreated().before(o2.getCreated())) { + return -1; + } + return 0; + } + }); + }