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 6ceac55..139fe6a 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 @@ -243,13 +243,52 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye if(StringUtils.isNotEmpty(babyEyeCheck.getCheckMonthId())) { temp.put("checkMonth", CheckMonthEnums.getName(babyEyeCheck.getCheckMonthId())); /** 检查月龄 */; } - temp.put("positive", null); /** 阳性项目 */ + + StringBuilder positive = new StringBuilder(); /** 阳性项目 */ + if("yang".equals(babyEyeCheck.getExtRightEyelook())) { + positive.append("外眼观察(右) "); + } + if("yang".equals(babyEyeCheck.getExtLeftEyelook())) { + positive.append("外眼观察(左) "); + } + if("yang".equals(babyEyeCheck.getBlinkRightReflex())) { + positive.append("瞬目反射(右) "); + } + if("yang".equals(babyEyeCheck.getBlinkLefttReflex())) { + positive.append("瞬目反射(左) "); + } + if("yang".equals(babyEyeCheck.getPupillaryRightReflex())) { + positive.append("瞳孔对光反射(右) "); + } + if("yang".equals(babyEyeCheck.getPupillaryLeftReflex())) { + positive.append("瞳孔对光反射(左) "); + } + if("yang".equals(babyEyeCheck.getRedRightReflex())) { + positive.append("瞳孔红光反射(右) "); + } + if("yang".equals(babyEyeCheck.getRedLeftReflex())) { + positive.append("瞳孔红光反射(左) "); + } + if("yang".equals(babyEyeCheck.getRedReflex())) { + positive.append("红光反射 "); + } + if("yang".equals(babyEyeCheck.getConjunctiva())) { + positive.append("结膜 "); + } + if("yang".equals(babyEyeCheck.getCorneal())) { + positive.append("角膜 "); + } + if("yang".equals(babyEyeCheck.getLacrimalApparatus())) { + positive.append("泪器 "); + } + + temp.put("positive", positive.toString()); temp.put("doctor", couponMapper.getUserName(babyEyeCheck.getDoctor())); temp.put("checkTime", DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime())); CollectionUtils.removeNullValue(temp); restMap.add(temp); } - return null; + return restMap; } private void doFilter(List babyEyeChecks) {