From 4ab7c94a91e3edc757170485242bf9032bb74c26 Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 28 Jun 2019 15:53:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=84=BF=E4=BF=9D=E6=A3=80?= =?UTF-8?q?=E6=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/facade/BabyCheckFacade.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 2a2d6cc..ede5d66 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 @@ -813,9 +813,11 @@ public class BabyCheckFacade extends BaseServiceImpl { map.put("sex", babyModel.getSex() != 0 ? "男" : "女"); map.put("mName", babyModel.getMname()); map.put("mCardNo", babyModel.getMcertNo()); - map.put("checkMonthAge", DateUtil.getBabyMonthAge(babyModel.getBirth(), babyCheckModel.getCheckDate())); + //map.put("checkMonthAge", DateUtil.getBabyMonthAge(babyModel.getBirth(), babyCheckModel.getCheckDate())); + map.put("monthAge", DateUtil.getMonth(babyModel.getBirth(), babyCheckModel.getCheckDate())); } + map.put("checkMonthAge", babyCheckModel.getCheckMonth() + "月龄"); map.put("checkTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getCheckDate())); map.put("nextCheckTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getNextDate())); if (null != babyCheckModel.getHighRisk()) { @@ -907,9 +909,10 @@ public class BabyCheckFacade extends BaseServiceImpl { map.put("sex", babyModel.getSex() != 0 ? "男" : "女"); map.put("mName", babyModel.getMname()); map.put("mCardNo", babyModel.getMcertNo()); - map.put("checkMonthAge", DateUtil.getBabyMonthAge(babyModel.getBirth(), babyCheckModel.getCheckDate())); + //map.put("checkMonthAge", DateUtil.getBabyMonthAge(babyModel.getBirth(), babyCheckModel.getCheckDate())); map.put("monthAge", DateUtil.getMonth(babyModel.getBirth(), babyCheckModel.getCheckDate())); } + map.put("checkMonthAge", babyCheckModel.getCheckMonth() + "月龄"); map.put("checkTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getCheckDate())); map.put("nextCheckTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getNextDate())); if (null != babyCheckModel.getHighRisk()) { @@ -926,11 +929,8 @@ public class BabyCheckFacade extends BaseServiceImpl { map.put("weight", babyCheckModel.getWeight()); list.add(map); } - pageResult.setGrid(list); return RespBuilder.buildSuccess(pageResult); - - } public void getBabyCheckList(String[] ids, PersonModel personModel, List> list) { -- 1.8.3.1