diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 5bff9f9..e89dd89 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1930,6 +1930,10 @@ public class BabyBookbuildingFacade { buildInfo = build; } + if (build != null && build.getYn() == YnEnums.YES.getId()) { + result.setIsBuild(true); + } + Map buildRecords = new HashMap<>(); buildRecords.put("id", build.getId()); buildRecords.put("buildDate", DateUtil.getyyyy_MM_dd(build.getBuildDate())); 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 e3935e9..41e522c 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 @@ -889,81 +889,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC temp.put("checkMonth", CheckMonthEnums.getName(babyEyeCheck.getCheckMonthId())); /** 检查月龄 */; } } - - 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("泪器 "); - } - if ("yang".equals(babyEyeCheck.getNystagmus())) { - positive.append("视动性眼震 "); - } - if ("yang".equals(babyEyeCheck.getExtEyelook())) { - positive.append("外眼观察 "); - } - if ("yang".equals(babyEyeCheck.getEyePositionId2())) { - positive.append("眼位(医生判定)"); - } - if ("yang".equals(babyEyeCheck.getRedLeft2())) { - positive.append("红光反射(医生判定阳性)"); - } - if ("yang".equals(babyEyeCheck.getVision2())) { - positive.append("视力(医生判定阳性)"); - } - if ("yang".equals(babyEyeCheck.getY2())) { - positive.append("手持眼光仪(医生判定阳性)"); - } - if ("yang".equals(babyEyeCheck.getRefraction2())) { - if ("197".equals(babyEyeCheck.getHospitalId())) { - positive.append("屈光不正"); - } else { - positive.append("屈光(医生判定阳性)"); - } - - } - - if ("ruoyang".equals(babyEyeCheck.getRedRightReflex())) { - positive.append("瞳孔红光反射(右)(稍减弱)"); - } - if ("ruoyang".equals(babyEyeCheck.getRedLeftReflex())) { - positive.append("瞳孔红光反射(左)(稍减弱)"); - } - if ("ruoyang".equals(babyEyeCheck.getRedReflex())) { - positive.append("红光反射(稍减弱)"); - } - + StringBuilder positive = getYxxm(babyEyeCheck);//阳性项目 temp.put("positive", positive.toString()); temp.put("doctor", couponMapper.getUserName(babyEyeCheck.getDoctor())); temp.put("checkTime", DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime())); @@ -974,6 +900,115 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC return restMap; } + /** + * 阳性项目 + * + * @param babyEyeCheck + * @Author: 武涛涛 + * @Date: 2020/7/23 14:28 + */ + private StringBuilder getYxxm(BabyEyeCheck babyEyeCheck) { + 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("泪器 "); + } + if ("yang".equals(babyEyeCheck.getNystagmus())) { + positive.append("视动性眼震 "); + } + if ("yang".equals(babyEyeCheck.getExtEyelook())) { + positive.append("外眼观察 "); + } + if ("yang".equals(babyEyeCheck.getEyePositionId2())) { + positive.append("眼位(医生判定)"); + } + if ("yang".equals(babyEyeCheck.getRedLeft2())) { + positive.append("红光反射(医生判定阳性)"); + } + if ("yang".equals(babyEyeCheck.getVision2())) { + positive.append("视力(医生判定阳性)"); + } + if ("yang".equals(babyEyeCheck.getY2())) { + positive.append("手持眼光仪(医生判定阳性)"); + } + if ("yang".equals(babyEyeCheck.getRefraction2())) { + if ("197".equals(babyEyeCheck.getHospitalId())) { + positive.append("屈光不正"); + } else { + positive.append("屈光(医生判定阳性)"); + } + + } + + if ("ruoyang".equals(babyEyeCheck.getRedRightReflex())) { + positive.append("瞳孔红光反射(右)(稍减弱)"); + } + if ("ruoyang".equals(babyEyeCheck.getRedLeftReflex())) { + positive.append("瞳孔红光反射(左)(稍减弱)"); + } + if ("ruoyang".equals(babyEyeCheck.getRedReflex())) { + positive.append("红光反射(稍减弱)"); + } + + if("2".equals(babyEyeCheck.getEyeAppearance())){ + positive.append("眼外观 "); + } + if("2".equals(babyEyeCheck.getRedReflexQhd())){ + positive.append("红光反射 "); + } + if("2".equals(babyEyeCheck.getBlinkReflex())){ + positive.append("瞬目反射 "); + } + if("2".equals(babyEyeCheck.getRedBallTest())){ + positive.append("红球试验 "); + } + if("2".equals(babyEyeCheck.getBehaviorObservation())){ + positive.append("视物行为观察 "); + } + if("2".equals(babyEyeCheck.getRefractiveScreening())){ + positive.append("屈光筛查 "); + } + if("2".equals(babyEyeCheck.getEyePositionExamination())){ + positive.append("眼位检查 "); + } + if("2".equals(babyEyeCheck.getEyeMovement())){ + positive.append("眼球运动 "); + } + return positive; + } + private void doFilter(List babyEyeChecks) { Iterator iterator = babyEyeChecks.iterator(); while (iterator.hasNext()) {