Commit 580266b27be36c411900a71b77182adbd10e16ae
1 parent
16909b7049
Exists in
master
and in
1 other branch
增加设置parentid
Showing 1 changed file with 5 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
View file @
580266b
| ... | ... | @@ -43,7 +43,7 @@ |
| 43 | 43 | private String cardNo; |
| 44 | 44 | private String vcCardNo; |
| 45 | 45 | private String isSieve; |
| 46 | - private String isH="0"; | |
| 46 | + private String isH = "0"; | |
| 47 | 47 | //<!---------基本信息-----------> |
| 48 | 48 | |
| 49 | 49 | |
| 50 | 50 | |
| ... | ... | @@ -190,12 +190,14 @@ |
| 190 | 190 | setCardNo(patients.getCardNo()); |
| 191 | 191 | |
| 192 | 192 | setVcCardNo(patients.getVcCardNo()); |
| 193 | - if (3 == patients.getType()) { | |
| 193 | + if (null!=patients.getDueStatus() && 1 == patients.getDueStatus()) { | |
| 194 | + this.dueWeek = "终止妊娠"; | |
| 195 | + } else if (3 == patients.getType()) { | |
| 194 | 196 | this.dueWeek = "已分娩"; |
| 195 | 197 | } else { |
| 196 | 198 | if (null != patients.getLastMenses()) { |
| 197 | 199 | int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); |
| 198 | - this.dueWeek= StringUtils.dueWeek(days); | |
| 200 | + this.dueWeek = StringUtils.dueWeek(days); | |
| 199 | 201 | } |
| 200 | 202 | } |
| 201 | 203 |