Commit a57923a1fd0ed7913ef3e971e3bfd3d378b8c8fe
1 parent
2d3c8c2402
Exists in
master
and in
6 other branches
解决自动分娩的孕妇再次建档后，电子病历的展示及产检页面的展示不正确
Showing 1 changed file with 8 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
a57923a
| ... | ... | @@ -2128,11 +2128,18 @@ |
| 2128 | 2128 | |
| 2129 | 2129 | stopPregQuery.setPid(patients.getPid()); |
| 2130 | 2130 | stopPregQuery.setYn(YnEnums.YES.getId()); |
| 2131 | + | |
| 2132 | + | |
| 2131 | 2133 | //查询终止妊娠 |
| 2132 | 2134 | List<StopPregModel> list2 = stopPregnancyService.queryStopPreg(stopPregQuery); |
| 2135 | + //已经分娩的产程 | |
| 2136 | + Patients fmPatient = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, currentGroupHospital, 3, false, null, og.getbStatus() == 1); | |
| 2133 | 2137 | |
| 2134 | - | |
| 2135 | 2138 | List<SortIn> sortList = new ArrayList<>(); |
| 2139 | + if(fmPatient!=null){ | |
| 2140 | + fmPatient.setBookbuildingDate(fmPatient.getFmDate()); | |
| 2141 | + sortList.add(new SortIn(fmPatient)); | |
| 2142 | + } | |
| 2136 | 2143 | if (CollectionUtils.isNotEmpty(list1)) { |
| 2137 | 2144 | for (MaternalDeliverModel model : list1) { |
| 2138 | 2145 | sortList.add(new SortIn(model)); |