Commit 9f8132c0ea5d1c7f378197fc66613b367148efe2
1 parent
783536c3d0
Exists in
master
and in
6 other branches
改字段
Showing 1 changed file with 6 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
View file @
9f8132c
| ... | ... | @@ -63,7 +63,8 @@ |
| 63 | 63 | List<Map<String, Object>> checkMonth = EnumUtil.toJson(CheckMonthEnums.class); /** (检查时间 */ |
| 64 | 64 | List<Map<String, Object>> highRisk = EnumUtil.toJson(EyeHighRiskEnums.class); /** 眼保健高危因素 */ |
| 65 | 65 | List<Map<String, Object>> handleOpinions = EnumUtil.toJson(HandleOpinionsEnums.class); /** 处理意见 */ |
| 66 | - return RespBuilder.buildSuccess("addSubtract", addSubtract, "checkMonth", checkMonth, "highRisk", highRisk, "handleOpinions", handleOpinions); | |
| 66 | + List<Map<String, Object>> eyePosition = EnumUtil.toJson(EyePositionEnums.class); /** 处理意见 */ | |
| 67 | + return RespBuilder.buildSuccess("eyePosition", "addSubtract", addSubtract, "checkMonth", checkMonth, "highRisk", highRisk, "handleOpinions", handleOpinions); | |
| 67 | 68 | } |
| 68 | 69 | |
| 69 | 70 | @Override |
| ... | ... | @@ -110,7 +111,7 @@ |
| 110 | 111 | map.put("pupillaryRightReflex", parseYinYang(babyEyeCheck.getPupillaryRightReflex())); |
| 111 | 112 | map.put("pupillaryLeftReflex", parseYinYang(babyEyeCheck.getPupillaryLeftReflex())); |
| 112 | 113 | map.put("redRightReflex", parseYinYang(babyEyeCheck.getRedRightReflex())); |
| 113 | - map.put("eyePositionId", parseYinYang(babyEyeCheck.getEyePositionId(), babyEyeCheck.getEyePositionOther())); | |
| 114 | + map.put("eyePositionId", EyePositionEnums.getName(babyEyeCheck.getEyePositionId())); | |
| 114 | 115 | map.put("redLeftReflex", parseYinYang(babyEyeCheck.getRedLeftReflex())); |
| 115 | 116 | map.put("redReflex", parseYinYang(babyEyeCheck.getRedReflex(), babyEyeCheck.getRedReflexOther())); |
| 116 | 117 | map.put("conjunctiva", parseYinYang(babyEyeCheck.getConjunctiva(), babyEyeCheck.getConjunctivaOther())); |
| ... | ... | @@ -149,8 +150,9 @@ |
| 149 | 150 | Map<String, Object> map = ReflectionUtils.beanToMap(babyEyeCheck); |
| 150 | 151 | map.put("checkTime", DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime())); |
| 151 | 152 | map.put("nextCheckTime", DateUtil.getYyyyMmDd(babyEyeCheck.getNextCheckTime())); |
| 152 | - map.put("riskFactorId", mongoUtil.findNameList(babyEyeCheck.getRiskFactorId())); | |
| 153 | - CollectionUtils.removeNullValue(map); | |
| 153 | + if(babyEyeCheck.getRiskFactorId() != null) { | |
| 154 | + map.put("riskFactorId", mongoUtil.findNameList(babyEyeCheck.getRiskFactorId())); | |
| 155 | + } | |
| 154 | 156 | return RespBuilder.buildSuccess(map); |
| 155 | 157 | } |
| 156 | 158 |