diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/CheckMonthQhdEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/CheckMonthQhdEnums.java index fd77788..e2509b0 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/CheckMonthQhdEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/CheckMonthQhdEnums.java @@ -22,8 +22,8 @@ public enum CheckMonthQhdEnums { THREEYEARSOLD(36, "3岁"), FOURYEARSOLD(48, "4岁"), FIVEYEARSOLD(60, "5岁"), - SIXYEARSOLD(72, "6岁"); - + SIXYEARSOLD(72, "6岁"), + D(73, "7岁"); 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 15cdfcf..e2b8bba 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 @@ -784,6 +784,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC List> restMap = new ArrayList<>(); for (BabyEyeCheck babyEyeCheck : babyEyeChecks) { Map temp = new HashMap<>(); + temp.put("edition", babyEyeCheck.getEdition()); temp.put("id", babyEyeCheck.getId()); temp.put("babyId", babyEyeCheck.getBabyId()); temp.put("pid", babyEyeCheck.getPid()); @@ -807,7 +808,19 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC temp.put("birth", DateUtil.getYyyyMmDd(babyModel.getBirth())); } if (StringUtils.isNotEmpty(babyEyeCheck.getCheckMonthId())) { - temp.put("checkMonth", CheckMonthEnums.getName(babyEyeCheck.getCheckMonthId())); /** 检查月龄 */; + if(StringUtils.isNotEmpty(babyEyeCheck.getEdition())){ + //处理老数据 + if("0".equals(babyEyeCheck.getCheckMonthId())){ + babyEyeCheck.setCheckMonthId("1"); + }else if("9".equals(babyEyeCheck.getCheckMonthId())){ + babyEyeCheck.setCheckMonthId("12"); + }else if("18".equals(babyEyeCheck.getCheckMonthId())){ + babyEyeCheck.setCheckMonthId("24"); + } + temp.put("checkMonth", CheckMonthQhdEnums.getName(babyEyeCheck.getCheckMonthId())); + }else { + temp.put("checkMonth", CheckMonthEnums.getName(babyEyeCheck.getCheckMonthId())); /** 检查月龄 */; + } } StringBuilder positive = new StringBuilder(); /** 阳性项目 */