From 67c550980342b2e20c1002d59c8493e31ccf3136 Mon Sep 17 00:00:00 2001 From: Administrator <184677810@qq.com> Date: Mon, 16 Sep 2019 17:25:24 +0800 Subject: [PATCH] update --- .../web/service/impl/BabyEyeCheckServiceImpl.java | 201 ++++++++++++++++++--- 1 file changed, 175 insertions(+), 26 deletions(-) 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 604fec9..e22bb47 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 @@ -107,68 +107,87 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC babyEyeCheck.setDoctorJudgement("2"); } -/* - if ("yang".equals(babyEyeCheck.getEyePositionId2())) { - positive.append("眼位(医生判定)"); + /* if ("yang".equals(babyEyeCheck.getEyePositionId2())) { + //positive.append("眼位(医生判定)"); + babyEyeCheck.setEyePositionId2Yang("2"); } if ("yang".equals(babyEyeCheck.getRedLeft2())) { - positive.append("红光反射（医生判定）"); + //positive.append("红光反射（医生判定）"); + babyEyeCheck.setRedLeft2Yang("2"); } if ("yang".equals(babyEyeCheck.getVision2())) { - positive.append("视力（医生判定）"); + //positive.append("视力（医生判定）"); + babyEyeCheck.setVision2Yang("2"); } if ("yang".equals(babyEyeCheck.getY2())) { - positive.append("手持眼光仪（医生判定）"); + //positive.append("手持眼光仪（医生判定）"); + babyEyeCheck.setOptometryYnag("2"); } if ("yang".equals(babyEyeCheck.getRedLeft2())) { - positive.append("屈光（医生判定）"); - }*/ - + //positive.append("屈光（医生判定）"); + babyEyeCheck.setRedLeft2Yang("2"); + } - /*if ("yang".equals(babyEyeCheck.getExtRightEyelook())) { - babyEyeCheck.setEXtr("外眼观察(右) "); + if ("yang".equals(babyEyeCheck.getExtRightEyelook())) { + // babyEyeCheck.setEXtr("外眼观察(右) "); + babyEyeCheck.setExtRightEyelookYang("2"); } if ("yang".equals(babyEyeCheck.getExtLeftEyelook())) { - positive.append("外眼观察(左) "); + //positive.append("外眼观察(左) "); + babyEyeCheck.setExtLeftEyelookYang("2"); } if ("yang".equals(babyEyeCheck.getBlinkRightReflex())) { - positive.append("瞬目反射(右) "); + //positive.append("瞬目反射(右) "); + babyEyeCheck.setBlinkRightReflexYang("2"); } if ("yang".equals(babyEyeCheck.getBlinkLefttReflex())) { - positive.append("瞬目反射(左) "); + //positive.append("瞬目反射(左) "); + babyEyeCheck.setBlinkLefttReflexYang("2"); } if ("yang".equals(babyEyeCheck.getPupillaryRightReflex())) { - positive.append("瞳孔对光反射(右) "); + //positive.append("瞳孔对光反射(右) "); + babyEyeCheck.setPupillaryRightReflexYang("2"); } if ("yang".equals(babyEyeCheck.getPupillaryLeftReflex())) { - positive.append("瞳孔对光反射(左) "); + //positive.append("瞳孔对光反射(左) "); + babyEyeCheck.setPupillaryLeftReflexYang("2"); } if ("yang".equals(babyEyeCheck.getRedRightReflex())) { - positive.append("瞳孔红光反射(右) "); + // positive.append("瞳孔红光反射(右) "); + babyEyeCheck.setRedRightReflexYang("2"); } if ("yang".equals(babyEyeCheck.getRedLeftReflex())) { - positive.append("瞳孔红光反射(左) "); + //positive.append("瞳孔红光反射(左) "); + babyEyeCheck.setRedLeftReflexYang("2"); } if ("yang".equals(babyEyeCheck.getRedReflex())) { - positive.append("红光反射 "); + //positive.append("红光反射 "); + babyEyeCheck.setRedReflexYang("2"); } if ("yang".equals(babyEyeCheck.getConjunctiva())) { - positive.append("结膜 "); + //positive.append("结膜 "); + babyEyeCheck.setConjunctivaYang("2"); } if ("yang".equals(babyEyeCheck.getCorneal())) { - positive.append("角膜 "); + //positive.append("角膜 "); + babyEyeCheck.setCornealYang("2"); } if ("yang".equals(babyEyeCheck.getLacrimalApparatus())) { - positive.append("泪器 "); + // positive.append("泪器 "); + babyEyeCheck.setLacrimalApparatusYang("2"); } if ("yang".equals(babyEyeCheck.getNystagmus())) { - positive.append("视动性眼震 "); + // positive.append("视动性眼震 "); + babyEyeCheck.setNystagmusYang("2"); } if ("yang".equals(babyEyeCheck.getExtEyelook())) { - positive.append("外眼观察 "); - }*/ + // positive.append("外眼观察 "); + babyEyeCheck.setExtEyelookYang("2"); + } +*/ + babyEyeCheck.setCreated(new Date()); babyEyeCheck.setYn("1"); babyEyeCheck.setOperaterId(userId + ""); @@ -432,6 +451,91 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC if (StringUtils.isNotEmpty(doctorPositive)) { criteria.and("doctorJudgement").is(doctorPositive); } + /* List positives = CollectionUtils.asList(positiveIds, String.class); + if (CollectionUtils.isNotEmpty(positives)) { + if (positives.contains("eyePosition2")) { + //positive.append("眼位(医生判定)"); + criteria.and("eyePosition2Yang").is("2"); + } + if (positives.contains("redLeft2")) { + //positive.append("红光反射（医生判定）"); + criteria.and("redLeft2Yang").is("2"); + } + if (positives.contains("vision2")) { + //positive.append("视力（医生判定）"); + //babyEyeCheck.setVision2Yang("2"); + criteria.and("vision2Yang").is("2"); + } + if ("yang".equals(babyEyeCheck.getY2())) { + //positive.append("手持眼光仪（医生判定）"); + babyEyeCheck.setOptometryYnag("2"); + } + if ("yang".equals(babyEyeCheck.getRedLeft2())) { + //positive.append("屈光（医生判定）"); + babyEyeCheck.setRedLeft2Yang("2"); + } + + + if ("yang".equals(babyEyeCheck.getExtRightEyelook())) { + // babyEyeCheck.setEXtr("外眼观察(右) "); + babyEyeCheck.setExtRightEyelookYang("2"); + } + if ("yang".equals(babyEyeCheck.getExtLeftEyelook())) { + //positive.append("外眼观察(左) "); + babyEyeCheck.setExtLeftEyelookYang("2"); + } + if ("yang".equals(babyEyeCheck.getBlinkRightReflex())) { + //positive.append("瞬目反射(右) "); + babyEyeCheck.setBlinkRightReflexYang("2"); + } + if ("yang".equals(babyEyeCheck.getBlinkLefttReflex())) { + //positive.append("瞬目反射(左) "); + babyEyeCheck.setBlinkLefttReflexYang("2"); + } + if ("yang".equals(babyEyeCheck.getPupillaryRightReflex())) { + //positive.append("瞳孔对光反射(右) "); + babyEyeCheck.setPupillaryRightReflexYang("2"); + } + if ("yang".equals(babyEyeCheck.getPupillaryLeftReflex())) { + //positive.append("瞳孔对光反射(左) "); + babyEyeCheck.setPupillaryLeftReflexYang("2"); + } + if ("yang".equals(babyEyeCheck.getRedRightReflex())) { + // positive.append("瞳孔红光反射(右) "); + babyEyeCheck.setRedRightReflexYang("2"); + } + if ("yang".equals(babyEyeCheck.getRedLeftReflex())) { + //positive.append("瞳孔红光反射(左) "); + babyEyeCheck.setRedLeftReflexYang("2"); + } + if ("yang".equals(babyEyeCheck.getRedReflex())) { + //positive.append("红光反射 "); + babyEyeCheck.setRedReflexYang("2"); + } + if ("yang".equals(babyEyeCheck.getConjunctiva())) { + //positive.append("结膜 "); + babyEyeCheck.setConjunctivaYang("2"); + } + if ("yang".equals(babyEyeCheck.getCorneal())) { + //positive.append("角膜 "); + babyEyeCheck.setCornealYang("2"); + } + if ("yang".equals(babyEyeCheck.getLacrimalApparatus())) { + // positive.append("泪器 "); + babyEyeCheck.setLacrimalApparatusYang("2"); + } + + if ("yang".equals(babyEyeCheck.getNystagmus())) { + // positive.append("视动性眼震 "); + babyEyeCheck.setNystagmusYang("2"); + } + if ("yang".equals(babyEyeCheck.getExtEyelook())) { + // positive.append("外眼观察 "); + babyEyeCheck.setExtEyelookYang("2"); + } + } +*/ + if (org.apache.commons.lang.StringUtils.isNotBlank(key)) { Criteria c = new Criteria(); c.orOperator(Criteria.where("mphone").is(key), Criteria.where("name").regex(key), Criteria.where("mcertNo").is(key)).and("yn").ne(0); @@ -451,7 +555,6 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC doFilter(babyEyeChecks, ids); } } - Integer count = babyEyeChecks.size(); List datas = CollectionUtils.getPageIds(babyEyeChecks, page, limit); @@ -594,6 +697,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC && !"yang".equals(babyEyeCheck.getNystagmus()) && !"yang".equals(babyEyeCheck.getLacrimalApparatus()) && !"yang".equals(babyEyeCheck.getEyePositionId()) + && !"yang".equals(babyEyeCheck.getEyePositionId2()) && !"yang".equals(babyEyeCheck.getRedLeft2()) && !"yang".equals(babyEyeCheck.getVision2()) && !"yang".equals(babyEyeCheck.getY2()) @@ -709,6 +813,32 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC lacrimalApparatusMap.put("name", "泪器"); positive.add(lacrimalApparatusMap); + Map eyePosition2Map = new HashMap<>(); + eyePosition2Map.put("id", "eyePosition2"); + eyePosition2Map.put("name", "眼位（医生判定阳性）"); + positive.add(eyePosition2Map); + + Map redLeft2Map = new HashMap<>(); + redLeft2Map.put("id", "redLeft2Map"); + redLeft2Map.put("name", "红光反射（医生判定阳性）"); + positive.add(redLeft2Map); + + + Map vision2Map = new HashMap<>(); + vision2Map.put("id", "vision2"); + vision2Map.put("name", "视力（医生判定阳性）"); + positive.add(vision2Map); + + Map y2Map = new HashMap<>(); + y2Map.put("id", "y2"); + y2Map.put("name", "手持验光仪（医生判定阳性）"); + positive.add(y2Map); + + Map refraction2Map = new HashMap<>(); + refraction2Map.put("id", "refraction2"); + refraction2Map.put("name", "屈光（医生判定阳性）"); + positive.add(refraction2Map); + return RespBuilder.buildSuccess("checkMonth", checkMonth, "positive", positive, "currentMonth", currentMonth); } @@ -769,4 +899,23 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC ExceptionUtils.catchException(e, "眼保健数据同步"); } } + + + public static void main(String[] args) { + List ls = new ArrayList<>(); + ls.add("1"); + ls.add("2"); + ls.add("3"); + ls.add("4"); + + List ls2 = new ArrayList<>(); + ls2.add("1"); + ls2.add("6"); + + System.out.println(ls.containsAll(ls2)); + + + } + + } -- 1.8.3.1