From 30b74223157228f0a88ad439fb46493b64285e48 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 18 Jul 2016 11:02:53 +0800 Subject: [PATCH] update code --- .../com/lyms/platform/operate/web/facade/BabyCheckFacade.java | 11 +++++++++++ .../com/lyms/platform/operate/web/result/BabyCheckResult.java | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 8078545..68d0623 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -518,6 +518,17 @@ public class BabyCheckFacade { model.setHighRisk(checkModel.getHighRisk()); model.setCheckDate(DateUtil.getyyyy_MM_dd(checkModel.getCheckDate())); + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setId(checkModel.getBuildId()); + babyQuery.setYn(YnEnums.YES.getId()); + + List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + + if (CollectionUtils.isNotEmpty(models)) + { + model.setMonthAge(DateUtil.getBabyMonthAge(models.get(0).getBirth(), checkModel.getCheckDate())); + } + model.setDrugGllergic(JsonUtil.str2Obj(checkModel.getDrugGllergic(), Map.class)); model.setChestw(checkModel.getChestw()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java index 727d3b3..4bcddcb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java @@ -208,6 +208,17 @@ public class BabyCheckResult { //检查时间 private String checkDate; + //月龄 + private String monthAge; + + public String getMonthAge() { + return monthAge; + } + + public void setMonthAge(String monthAge) { + this.monthAge = monthAge; + } + public String getCheckDate() { return checkDate; } -- 1.8.3.1