Commit 1b6b241353e675b264af6bba1ad13ef8270e042d
1 parent
63e83f5bc5
Exists in
master
and in
8 other branches
座机号 替换的问题
Showing 1 changed file with 2 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
1b6b241
... | ... | @@ -1121,10 +1121,10 @@ |
1121 | 1121 | Collections.sort(listDate, new Comparator<SortIn>() { |
1122 | 1122 | @Override |
1123 | 1123 | public int compare(SortIn o1, SortIn o2) { |
1124 | - if (o1.getDate() != null && o1.getDate().after(o2.getDate())) { | |
1124 | + if (o1.getDate() != null &&null != o2.getDate()&& o1.getDate().after(o2.getDate())) { | |
1125 | 1125 | return -1; |
1126 | 1126 | } |
1127 | - if (o1.getDate() != null && o1.getDate().before(o2.getDate())) { | |
1127 | + if (o1.getDate() != null &&null != o2.getDate()&& o1.getDate().before(o2.getDate())) { | |
1128 | 1128 | return 1; |
1129 | 1129 | } |
1130 | 1130 | return 0; |