Commit 8ce05b764083d7314fbb160d9b69becdaf61b7f7
1 parent
c316e85965
Exists in
master
and in
8 other branches
修改新电子病历
Showing 1 changed file with 3 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
8ce05b7
| ... | ... | @@ -755,6 +755,9 @@ |
| 755 | 755 | if(size!=list.size()){ |
| 756 | 756 | list1 = new ArrayList(); |
| 757 | 757 | } |
| 758 | + /*if(null==dueDate){ | |
| 759 | + dueDate= new Date(); | |
| 760 | + }*/ | |
| 758 | 761 | List l = buildPatientList(dueDate, list, list1, min, true); |
| 759 | 762 | if (!l.isEmpty()) { |
| 760 | 763 | sort(l); |
| ... | ... | @@ -891,7 +894,6 @@ |
| 891 | 894 | } |
| 892 | 895 | |
| 893 | 896 | |
| 894 | - if (null != end) { | |
| 895 | 897 | //初诊记录 |
| 896 | 898 | AntExChuQuery antExChuQuery = new AntExChuQuery(); |
| 897 | 899 | antExChuQuery.setYn(YnEnums.YES.getId()); |
| ... | ... | @@ -939,7 +941,6 @@ |
| 939 | 941 | listData.add(new AntData(an, null != organization ? organization.getName() : "", patientses.get(0).getLastMenses())); |
| 940 | 942 | } |
| 941 | 943 | } |
| 942 | - } | |
| 943 | 944 | return listData; |
| 944 | 945 | } |
| 945 | 946 |