Commit 775be8d8efb593c4854b83f519d299576ddeda49
1 parent
4e8c60bed3
Exists in
master
and in
8 other branches
孕妇分娩后 变成产妇
Showing 1 changed file with 3 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
775be8d
| ... | ... | @@ -253,7 +253,7 @@ |
| 253 | 253 | } |
| 254 | 254 | } |
| 255 | 255 | PostReviewQuery postReviewQuery = new PostReviewQuery(); |
| 256 | - ; | |
| 256 | + ;postReviewQuery.setYn(YnEnums.YES.getId()); | |
| 257 | 257 | if (StringUtils.isNotEmpty(dueDate)) { |
| 258 | 258 | Date date = DateUtil.parseYMD(dueDate); |
| 259 | 259 | //初诊记录 |
| 260 | 260 | |
| 261 | 261 | |
| ... | ... | @@ -287,16 +287,15 @@ |
| 287 | 287 | } |
| 288 | 288 | } |
| 289 | 289 | |
| 290 | - postReviewQuery.setYn(YnEnums.YES.getId()); | |
| 290 | + | |
| 291 | 291 | if (list.size() - 1 > i) { |
| 292 | 292 | postReviewQuery.setStart(date); |
| 293 | 293 | //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示 |
| 294 | 294 | // postReviewQuery.setEnd(list.size() - 1 > i ? list.get(i).getCreated() :null/* new Date()*/); |
| 295 | 295 | postReviewQuery.setEnd(list.get(i).getCreated()); |
| 296 | 296 | } |
| 297 | - | |
| 298 | - postReviewQuery.setParentId(patients.getId()); | |
| 299 | 297 | } |
| 298 | + postReviewQuery.setParentId(patients.getId()); | |
| 300 | 299 | i++; |
| 301 | 300 | //分娩记录 |
| 302 | 301 | if (CollectionUtils.isNotEmpty(modelList)) { |