Commit 59654db548e0987a6d52370ed41299bd345c7bb6
1 parent
05915d507e
Exists in
master
and in
8 other branches
修改新电子病历
Showing 1 changed file with 4 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
59654db
| ... | ... | @@ -627,7 +627,7 @@ |
| 627 | 627 | sortList(listDate); |
| 628 | 628 | |
| 629 | 629 | //需要过滤掉建档就分娩的情况 |
| 630 | - Date dueDate = new Date(); | |
| 630 | + Date dueDate =null; | |
| 631 | 631 | if (CollectionUtils.isNotEmpty(listDate)) { |
| 632 | 632 | String pid = ""; |
| 633 | 633 | int count = 0; |
| ... | ... | @@ -789,7 +789,9 @@ |
| 789 | 789 | listData.add(new AntData(patients, null != organization ? organization.getName() : "")); |
| 790 | 790 | iterator.remove(); |
| 791 | 791 | |
| 792 | - | |
| 792 | + if(null==dueDate &&null!=patients.getFmDate()){ | |
| 793 | + dueDate=patients.getFmDate(); | |
| 794 | + } | |
| 793 | 795 | PostReviewQuery postReviewQuery = new PostReviewQuery(); |
| 794 | 796 | if (list.size() - 1 > i) { |
| 795 | 797 | postReviewQuery.setStart(dueDate); |