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 a9d8bde..a851a66 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 @@ -1121,10 +1121,10 @@ public class AntenatalExaminationFacade { Collections.sort(listDate, new Comparator() { @Override public int compare(SortIn o1, SortIn o2) { - if (o1.getDate() != null && o1.getDate().after(o2.getDate())) { + if (o1.getDate() != null &&null != o2.getDate()&& o1.getDate().after(o2.getDate())) { return -1; } - if (o1.getDate() != null && o1.getDate().before(o2.getDate())) { + if (o1.getDate() != null &&null != o2.getDate()&& o1.getDate().before(o2.getDate())) { return 1; } return 0;