Commit 61e49a378aefda63173e2cd387f5c5cf94b17960
1 parent
0351761fdb
Exists in
master
and in
1 other branch
孕妇分娩后 变成产妇
Showing 1 changed file with 9 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java
View file @
61e49a3
| ... | ... | @@ -10,6 +10,8 @@ |
| 10 | 10 | import com.lyms.platform.pojo.Patients; |
| 11 | 11 | import com.lyms.platform.pojo.PuerperaModel; |
| 12 | 12 | |
| 13 | +import java.util.Date; | |
| 14 | + | |
| 13 | 15 | /** |
| 14 | 16 | * 高危孕妇管理查询 |
| 15 | 17 | * <p> |
| ... | ... | @@ -164,7 +166,6 @@ |
| 164 | 166 | setId(destModel.getId()); |
| 165 | 167 | setName(destModel.getUsername()); |
| 166 | 168 | setAge(destModel.getAge()); |
| 167 | - setDueWeek("孕周"); | |
| 168 | 169 | setrLevel(destModel.getRiskLevelId()); |
| 169 | 170 | setrFactor(destModel.getRiskFactorId() == null ? "" : JsonUtil.array2JsonString(destModel.getRiskFactorId())); |
| 170 | 171 | sethScore(destModel.getRiskScore()); |
| ... | ... | @@ -172,7 +173,13 @@ |
| 172 | 173 | setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate())); |
| 173 | 174 | setPhone(StringUtils.encryPhone(destModel.getPhone())); |
| 174 | 175 | setCheckDoctor(destModel.getLastReportDoctorName()); |
| 175 | - setlName("登记人"); | |
| 176 | + if(null!=destModel.getLastMenses()){ | |
| 177 | + int days= DateUtil.daysBetween(destModel.getLastMenses(),new Date()); | |
| 178 | + String week= (days/7)+""; | |
| 179 | + int day = (days%7); | |
| 180 | + this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":""); | |
| 181 | + } | |
| 182 | + setlName(destModel.getPublishName()); | |
| 176 | 183 | setPid(destModel.getPid()); |
| 177 | 184 | return this; |
| 178 | 185 | } |