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) {