Commit 12f26b73ccf15568eebe9f84295246321380e1da
1 parent
de29a87c4e
Exists in
master
and in
1 other branch
增加设置parentid
Showing 1 changed file with 7 additions and 0 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
View file @
12f26b7
| ... | ... | @@ -159,6 +159,7 @@ |
| 159 | 159 | setAge(destModel.getAge()); |
| 160 | 160 | setName(destModel.getUsername()); |
| 161 | 161 | setPhone(StringUtils.encryPhone(destModel.getPhone())); |
| 162 | + | |
| 162 | 163 | if (null != destModel.getFmDate()) { |
| 163 | 164 | Integer dueStatus = destModel.getDueStatus(); |
| 164 | 165 | if(null==dueStatus){ |
| ... | ... | @@ -169,6 +170,12 @@ |
| 169 | 170 | setDueWeek(DateUtil.getyyyy_MM_dd(destModel.getFmDate())); |
| 170 | 171 | } |
| 171 | 172 | setcTime(DateUtil.daysBetween(destModel.getFmDate(), new Date()) + "天"); |
| 173 | + } | |
| 174 | +// 全部产妇管理-如果当前孕妇已终止妊娠则分娩日期显示为“终止妊娠” 2、全部产妇管理-如果当前孕妇自动分娩则分娩日期显示为“-” | |
| 175 | + if(null!=destModel.getDueStatus() &&1 ==destModel.getDueStatus()){ | |
| 176 | + setDueWeek("终止妊娠"); | |
| 177 | + }else if(null!=destModel.getBuildType() &&2==destModel.getBuildType()){ | |
| 178 | + setDueWeek("-"); | |
| 172 | 179 | } |
| 173 | 180 | setPid(destModel.getPid()); |
| 174 | 181 | return this; |