diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java index 0121e78..ef1cdff 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java @@ -18,7 +18,7 @@ public class BabyEyeCheck extends BaseModel { private static final long serialVersionUID = SerialIdEnum.BabyEyeCheck.getCid(); //检查是儿童月龄 - private String monthAge; + private String checkMonthAge; /** * start 秦皇岛新增的眼保健字段 @@ -835,12 +835,12 @@ public class BabyEyeCheck extends BaseModel { this.lacrimalApparatus = lacrimalApparatus; } - public String getMonthAge() { - return monthAge; + public String getCheckMonthAge() { + return checkMonthAge; } - public void setMonthAge(String monthAge) { - this.monthAge = monthAge; + public void setCheckMonthAge(String checkMonthAge) { + this.checkMonthAge = checkMonthAge; } public String getEyeMovementsId() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java index b02c1bd..e3745e9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java @@ -451,6 +451,8 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC if (StringUtils.isNotEmpty(doctor)) { map.put("doctor", couponMapper.getUserName(doctor)); } + map.put("checkMonthAge", babyEyeCheck.getCheckMonthAge());//检查月龄是儿童月龄 + /** * start 秦皇岛眼保健新增的 * @Author: 武涛涛 @@ -668,6 +670,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC Map map = ReflectionUtils.beanToMap(babyEyeCheck); map.put("checkTime", DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime())); map.put("uncooperative", babyEyeCheck.isUncooperative()); + map.put("checkMonthAge", babyEyeCheck.getCheckMonthAge()); if (StringUtils.isNotEmpty(babyEyeCheck.getCheckMonthId())) { //处理老数据 if ("0".equals(babyEyeCheck.getCheckMonthId())) {