diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/CheckMonthEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/CheckMonthEnums.java index 312fcb7..3dfafc3 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/CheckMonthEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/CheckMonthEnums.java @@ -6,18 +6,18 @@ import com.lyms.platform.common.utils.StringUtils; * 检查月龄 */ public enum CheckMonthEnums { - ONE(1, "0月龄"), - TWO(2, "30-42天"), + ONE(0, "0月龄"), + TWO(1, "30-42天"), THREE(3, "3个月"), - FOUR(4, "6个月"), - FIVE(5, "9个月"), - SIX(6, "1岁"), - SEVEN(7, "1岁半"), - EIGHT(8, "2岁"), - NIGHT(9, "3岁"), - TEN(10, "4岁"), - ELEVEN(11, "5岁"), - TWELVE(12, "6岁"); + FOUR(6, "6个月"), + FIVE(9, "9个月"), + SIX(12, "1岁"), + SEVEN(18, "1岁半"), + EIGHT(24, "2岁"), + NIGHT(36, "3岁"), + TEN(48, "4岁"), + ELEVEN(60, "5岁"), + TWELVE(72, "6岁"); private Integer id; private String name; 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 a4bf715..d7a11ec 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 @@ -151,6 +151,9 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye BabyEyeCheck babyEyeCheck = mongoTemplate.findById(id, BabyEyeCheck.class); Map map = ReflectionUtils.beanToMap(babyEyeCheck); map.put("checkTime", DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime())); + if(StringUtils.isNotEmpty(babyEyeCheck.getCheckMonthId())) { + map.put("checkMonthId", babyEyeCheck.getCheckMonthId() + ""); + } map.put("nextCheckTime", DateUtil.getYyyyMmDd(babyEyeCheck.getNextCheckTime())); if(babyEyeCheck.getRiskFactorId() != null) { List riskFactorId = babyEyeCheck.getRiskFactorId();