Commit f5b7e8482d4687e62a1cdf1567ebb94caed9d243
1 parent
f88a16ba57
Exists in
master
and in
6 other branches
修改高危统计孕周显示不正确问题
Showing 1 changed file with 10 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java
View file @
f5b7e84
| ... | ... | @@ -335,10 +335,17 @@ |
| 335 | 335 | setcTime(DateUtil.getyyyy_MM_dd(destModel.getNextCheckTime())); |
| 336 | 336 | setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate())); |
| 337 | 337 | setPhone(StringUtils.encryPhone(destModel.getPhone())); |
| 338 | - if(null!=destModel.getLastMenses()){ | |
| 339 | - int days= DateUtil.daysBetween(destModel.getLastMenses(),new Date()); | |
| 340 | - this.dueWeek=StringUtils.dueWeek(days); | |
| 338 | + if (null != destModel.getDueStatus() && 1 == destModel.getDueStatus()) { | |
| 339 | + this.dueWeek = "终止妊娠"; | |
| 340 | + } else if (3 == destModel.getType()) { | |
| 341 | + this.dueWeek = "已分娩"; | |
| 342 | + } else { | |
| 343 | + if(null!=destModel.getLastMenses()){ | |
| 344 | + int days= DateUtil.daysBetween(destModel.getLastMenses(),new Date()); | |
| 345 | + this.dueWeek=StringUtils.dueWeek(days); | |
| 346 | + } | |
| 341 | 347 | } |
| 348 | + | |
| 342 | 349 | setPid(destModel.getPid()); |
| 343 | 350 | |
| 344 | 351 | if(null!=destModel.getServiceType()){ |