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 e2b8bba..493b443 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 @@ -1012,17 +1012,21 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC Map temp = new HashMap<>(); temp.put("id", babyEyeCheck.getId()); temp.put("hospitalId", babyEyeCheck.getHospitalId()); + temp.put("edition", babyEyeCheck.getEdition()); temp.put("pid", babyEyeCheck.getPid()); - - //处理老数据 - 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"); + 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())); } - temp.put("checkMonth", CheckMonthQhdEnums.getName(babyEyeCheck.getCheckMonthId())); BabyModel babyModel = mongoTemplate.findById(babyEyeCheck.getBabyId(), BabyModel.class); if (babyModel != null) { temp.put("name", babyModel.getName());