Commit 738aa44d122a7f584cc4dc5b9d34bfb6fd11f410
1 parent
331e88b1c9
Exists in
master
and in
6 other branches
秦皇岛-孕产妇围产管理-体重管理-临时体重管理-临时体重列表打印显示年龄（如果孕妇没写这里不会显示）和预产期
Showing 1 changed file with 7 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java
View file @
738aa44
| ... | ... | @@ -316,6 +316,10 @@ |
| 316 | 316 | temp.put("id", patientWeight.getId()); |
| 317 | 317 | temp.put("userName", temporaryUser.getUserName()); |
| 318 | 318 | temp.put("age", DateUtil.getAge(temporaryUser.getBirth())); |
| 319 | + temp.put("phone", temporaryUser.getPhone()); | |
| 320 | + //末次月经 | |
| 321 | + Date dueDate = DateUtil.addDay(temporaryUser.getLastMenses(), 280); | |
| 322 | + temp.put("dueDate",DateUtil.getyyyy_MM_dd(dueDate)); | |
| 319 | 323 | temp.put("weeks", DateUtil.getWeekDesc(temporaryUser.getLastMenses(), new Date())); |
| 320 | 324 | temp.put("beforeWeight", temporaryUser.getBeforeWeight()); |
| 321 | 325 | temp.put("beforeHeight", temporaryUser.getBeforeHeight()); |
| ... | ... | @@ -443,7 +447,9 @@ |
| 443 | 447 | if (temporaryUser != null) { |
| 444 | 448 | map.put("username", temporaryUser.getUserName()); |
| 445 | 449 | map.put("phone", temporaryUser.getPhone()); |
| 446 | - // map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); | |
| 450 | + //末次月经 | |
| 451 | + Date dueDate = DateUtil.addDay(temporaryUser.getLastMenses(), 280); | |
| 452 | + map.put("dueDate",DateUtil.getyyyy_MM_dd(dueDate)); | |
| 447 | 453 | map.put("age", DateUtil.getAge(temporaryUser.getBirth()) + " 岁"); |
| 448 | 454 | week = DateUtil.getWeek2(temporaryUser.getLastMenses(), new Date()); |
| 449 | 455 | String yunqi = "孕" + String.valueOf(week) + "周"; |