Commit 91029b84cb7d43cec4ae84e926529f8867a0ec78
1 parent
efe3843a40
Exists in
master
and in
6 other branches
补录产检
Showing 1 changed file with 21 additions and 10 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
91029b8
| ... | ... | @@ -2709,21 +2709,32 @@ |
| 2709 | 2709 | Patients fmPatient = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, currentGroupHospital, 3, false, null, og.getbStatus() == 1); |
| 2710 | 2710 | |
| 2711 | 2711 | List<SortIn> sortList = new ArrayList<>(); |
| 2712 | - if (fmPatient != null) { | |
| 2713 | - fmPatient.setBookbuildingDate(fmPatient.getFmDate()); | |
| 2714 | - sortList.add(new SortIn(fmPatient)); | |
| 2712 | + | |
| 2713 | + if (StringUtils.isNotEmpty(queryRequest.getSupplement())) | |
| 2714 | + { | |
| 2715 | + if (fmPatient != null) { | |
| 2716 | + sortList.add(new SortIn(fmPatient,"")); | |
| 2717 | + } | |
| 2715 | 2718 | } |
| 2716 | - if (CollectionUtils.isNotEmpty(list1)) { | |
| 2717 | - for (MaternalDeliverModel model : list1) { | |
| 2718 | - sortList.add(new SortIn(model)); | |
| 2719 | + else | |
| 2720 | + { | |
| 2721 | + if (fmPatient != null) { | |
| 2722 | + fmPatient.setBookbuildingDate(fmPatient.getFmDate()); | |
| 2723 | + sortList.add(new SortIn(fmPatient)); | |
| 2719 | 2724 | } |
| 2725 | + if (CollectionUtils.isNotEmpty(list1)) { | |
| 2726 | + for (MaternalDeliverModel model : list1) { | |
| 2727 | + sortList.add(new SortIn(model)); | |
| 2728 | + } | |
| 2720 | 2729 | |
| 2721 | - } | |
| 2722 | - if (CollectionUtils.isNotEmpty(list2)) { | |
| 2723 | - for (StopPregModel model : list2) { | |
| 2724 | - sortList.add(new SortIn(model)); | |
| 2725 | 2730 | } |
| 2731 | + if (CollectionUtils.isNotEmpty(list2)) { | |
| 2732 | + for (StopPregModel model : list2) { | |
| 2733 | + sortList.add(new SortIn(model)); | |
| 2734 | + } | |
| 2735 | + } | |
| 2726 | 2736 | } |
| 2737 | + | |
| 2727 | 2738 | |
| 2728 | 2739 | |
| 2729 | 2740 | AntexListResult antexListResult = new AntexListResult(); |