Commit 4751a3645e9c7ca8346de775ebd064e61b0028c3
1 parent
35688f1050
Exists in
master
and in
8 other branches
修改产检删除
Showing 1 changed file with 2 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
View file @
4751a36
... | ... | @@ -114,9 +114,9 @@ |
114 | 114 | Patients patients = patientsService.findOnePatientById(record.getParentId()); |
115 | 115 | String dueWeek = ""; |
116 | 116 | if (null != patients) { |
117 | - if (patients.getDueStatus() == 1) { | |
117 | + if (patients.getDueStatus() == 1&&patients.getType()==3) { | |
118 | 118 | dueWeek = "终止妊娠"; |
119 | - } else if (null != patients.getFmDate()) { | |
119 | + } else if (patients.getType()==3&&patients.getDueStatus() == 0) { | |
120 | 120 | dueWeek = "已分娩"; |
121 | 121 | } else { |
122 | 122 | int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); |