Commit 13b97b96bf434267e5b9909134e7ecdc77ec4e7d
1 parent
dece08c8a8
Exists in
master
and in
1 other branch
修改新电子病历
Showing 1 changed file with 11 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
13b97b9
| ... | ... | @@ -574,11 +574,20 @@ |
| 574 | 574 | Collections.sort(listData, new Comparator<AntData>() { |
| 575 | 575 | @Override |
| 576 | 576 | public int compare(AntData o1, AntData o2) { |
| 577 | - if (o1.getCreated().after(o2.getCreated())) { | |
| 577 | + | |
| 578 | + if(Integer.valueOf(o1.getType())>Integer.valueOf(o2.getType())){ | |
| 578 | 579 | return 1; |
| 579 | 580 | } |
| 580 | - if (o1.getCreated().before(o2.getCreated())) { | |
| 581 | + if(Integer.valueOf(o1.getType())<Integer.valueOf(o2.getType())){ | |
| 581 | 582 | return -1; |
| 583 | + } | |
| 584 | + if(Integer.valueOf(o1.getType())==Integer.valueOf(o2.getType())) { | |
| 585 | + if (o1.getCreated().after(o2.getCreated())) { | |
| 586 | + return 1; | |
| 587 | + } | |
| 588 | + if (o1.getCreated().before(o2.getCreated())) { | |
| 589 | + return -1; | |
| 590 | + } | |
| 582 | 591 | } |
| 583 | 592 | return 0; |
| 584 | 593 | } |