Commit 98f247f183831f50b60a7e88860e7e5ebc19127f
1 parent
adec7fa84a
Exists in
master
and in
6 other branches
儿童保健查看页面修改
Showing 1 changed file with 6 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
View file @
98f247f
| ... | ... | @@ -9,6 +9,7 @@ |
| 9 | 9 | import com.lyms.platform.common.utils.JsonUtil; |
| 10 | 10 | import com.lyms.platform.common.utils.StringUtils; |
| 11 | 11 | import com.lyms.platform.operate.web.utils.CommonsHelper; |
| 12 | +import com.lyms.platform.operate.web.utils.UnitConstants; | |
| 12 | 13 | import com.lyms.platform.pojo.BabyModel; |
| 13 | 14 | |
| 14 | 15 | import java.util.Date; |
| 15 | 16 | |
| ... | ... | @@ -512,14 +513,14 @@ |
| 512 | 513 | setMommyBirthday(DateUtil.getyyyy_MM_dd(destModel.getMbirth())); |
| 513 | 514 | if (destModel.getMbirth() != null) |
| 514 | 515 | { |
| 515 | - setMommyAge(DateUtil.getAge(destModel.getMbirth(), new Date()) + ""); | |
| 516 | + setMommyAge(DateUtil.getAge(destModel.getMbirth(), new Date()) + "岁"); | |
| 516 | 517 | } |
| 517 | 518 | |
| 518 | 519 | setFatherName(destModel.getFname()); |
| 519 | 520 | setFatherBirthday(DateUtil.getyyyy_MM_dd(destModel.getFbirth())); |
| 520 | 521 | if (destModel.getFbirth() != null) |
| 521 | 522 | { |
| 522 | - setFatherAge(DateUtil.getAge(destModel.getFbirth(), new Date()) + ""); | |
| 523 | + setFatherAge(DateUtil.getAge(destModel.getFbirth(), new Date()) + "岁"); | |
| 523 | 524 | } |
| 524 | 525 | |
| 525 | 526 | setFatherPhone(destModel.getFphone()); |
| 526 | 527 | |
| ... | ... | @@ -536,10 +537,10 @@ |
| 536 | 537 | setFetusCount("第"+destModel.getFetusCount()+"胎/第"+destModel.getDueCount()+"次"); |
| 537 | 538 | } |
| 538 | 539 | |
| 539 | - setBabyWeight(destModel.getBabyWeight()); | |
| 540 | + setBabyWeight(destModel.getBabyWeight()+ UnitConstants.KG); | |
| 540 | 541 | |
| 541 | - setBabyHeight(destModel.getBabyHeight()); | |
| 542 | - setBabyHead(destModel.getBabyHead()); | |
| 542 | + setBabyHeight(destModel.getBabyHeight()+ UnitConstants.CM); | |
| 543 | + setBabyHead(destModel.getBabyHead()+ UnitConstants.CM); | |
| 543 | 544 | if (StringUtils.isNotEmpty(destModel.getApgarScore())) |
| 544 | 545 | { |
| 545 | 546 | Map<String,String> map = JsonUtil.getMap(destModel.getApgarScore()); |