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 c66d2de..03676ca 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 @@ -63,7 +63,8 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye List> checkMonth = EnumUtil.toJson(CheckMonthEnums.class); /** (检查时间 */ List> highRisk = EnumUtil.toJson(EyeHighRiskEnums.class); /** 眼保健高危因素 */ List> handleOpinions = EnumUtil.toJson(HandleOpinionsEnums.class); /** 处理意见 */ - return RespBuilder.buildSuccess("addSubtract", addSubtract, "checkMonth", checkMonth, "highRisk", highRisk, "handleOpinions", handleOpinions); + List> eyePosition = EnumUtil.toJson(EyePositionEnums.class); /** 处理意见 */ + return RespBuilder.buildSuccess("eyePosition", "addSubtract", addSubtract, "checkMonth", checkMonth, "highRisk", highRisk, "handleOpinions", handleOpinions); } @Override @@ -110,7 +111,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye map.put("pupillaryRightReflex", parseYinYang(babyEyeCheck.getPupillaryRightReflex())); map.put("pupillaryLeftReflex", parseYinYang(babyEyeCheck.getPupillaryLeftReflex())); map.put("redRightReflex", parseYinYang(babyEyeCheck.getRedRightReflex())); - map.put("eyePositionId", parseYinYang(babyEyeCheck.getEyePositionId(), babyEyeCheck.getEyePositionOther())); + map.put("eyePositionId", EyePositionEnums.getName(babyEyeCheck.getEyePositionId())); map.put("redLeftReflex", parseYinYang(babyEyeCheck.getRedLeftReflex())); map.put("redReflex", parseYinYang(babyEyeCheck.getRedReflex(), babyEyeCheck.getRedReflexOther())); map.put("conjunctiva", parseYinYang(babyEyeCheck.getConjunctiva(), babyEyeCheck.getConjunctivaOther())); @@ -149,8 +150,9 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye Map map = ReflectionUtils.beanToMap(babyEyeCheck); map.put("checkTime", DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime())); map.put("nextCheckTime", DateUtil.getYyyyMmDd(babyEyeCheck.getNextCheckTime())); - map.put("riskFactorId", mongoUtil.findNameList(babyEyeCheck.getRiskFactorId())); - CollectionUtils.removeNullValue(map); + if(babyEyeCheck.getRiskFactorId() != null) { + map.put("riskFactorId", mongoUtil.findNameList(babyEyeCheck.getRiskFactorId())); + } return RespBuilder.buildSuccess(map); }