Commit b6882ce92b634ba1ff4303cf99591b5549e22943
1 parent
2c719ce12d
Exists in
master
and in
8 other branches
增加设置parentid
Showing 1 changed file with 9 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
View file @
b6882ce
| ... | ... | @@ -150,8 +150,15 @@ |
| 150 | 150 | setName(destModel.getUsername()); |
| 151 | 151 | setPhone(StringUtils.encryPhone(destModel.getPhone())); |
| 152 | 152 | if (null != destModel.getFmDate()) { |
| 153 | - setDueWeek(DateUtil.getyyyy_MM_dd(destModel.getFmDate())); | |
| 154 | - setcTime(DateUtil.daysBetween(destModel.getFmDate(),new Date())+"天"); | |
| 153 | + Integer dueStatus = destModel.getDueStatus(); | |
| 154 | + if(null==dueStatus){ | |
| 155 | + setDueWeek(DateUtil.getyyyy_MM_dd(destModel.getFmDate())); | |
| 156 | + }else if(1==dueStatus){ | |
| 157 | + setDueWeek("已分娩"); | |
| 158 | + }else{ | |
| 159 | + setDueWeek(DateUtil.getyyyy_MM_dd(destModel.getFmDate())); | |
| 160 | + } | |
| 161 | + setcTime(DateUtil.daysBetween(destModel.getFmDate(), new Date()) + "天"); | |
| 155 | 162 | } |
| 156 | 163 | setPid(destModel.getPid()); |
| 157 | 164 | setcTimes(33); |