jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 67c550980342b2e20c1002d59c8493e31ccf3136

Authored by Administrator
1 parent 2cd8d85b87
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 1 changed file with 175 additions and 26 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java View file @ 67c5509
... ... @@ -107,68 +107,87 @@
107 107 babyEyeCheck.setDoctorJudgement("2");
108 108 }
109 109  
110   -/*
111   - if ("yang".equals(babyEyeCheck.getEyePositionId2())) {
112   - positive.append("眼位(医生判定)");
  110 + /* if ("yang".equals(babyEyeCheck.getEyePositionId2())) {
  111 + //positive.append("眼位(医生判定)");
  112 + babyEyeCheck.setEyePositionId2Yang("2");
113 113 }
114 114 if ("yang".equals(babyEyeCheck.getRedLeft2())) {
115   - positive.append("红光反射（医生判定）");
  115 + //positive.append("红光反射（医生判定）");
  116 + babyEyeCheck.setRedLeft2Yang("2");
116 117 }
117 118 if ("yang".equals(babyEyeCheck.getVision2())) {
118   - positive.append("视力（医生判定）");
  119 + //positive.append("视力（医生判定）");
  120 + babyEyeCheck.setVision2Yang("2");
119 121 }
120 122 if ("yang".equals(babyEyeCheck.getY2())) {
121   - positive.append("手持眼光仪（医生判定）");
  123 + //positive.append("手持眼光仪（医生判定）");
  124 + babyEyeCheck.setOptometryYnag("2");
122 125 }
123 126 if ("yang".equals(babyEyeCheck.getRedLeft2())) {
124   - positive.append("屈光（医生判定）");
125   - }*/
  127 + //positive.append("屈光（医生判定）");
  128 + babyEyeCheck.setRedLeft2Yang("2");
  129 + }
126 130  
127 131  
128   -
129   - /*if ("yang".equals(babyEyeCheck.getExtRightEyelook())) {
130   - babyEyeCheck.setEXtr("外眼观察(右) ");
  132 + if ("yang".equals(babyEyeCheck.getExtRightEyelook())) {
  133 + // babyEyeCheck.setEXtr("外眼观察(右) ");
  134 + babyEyeCheck.setExtRightEyelookYang("2");
131 135 }
132 136 if ("yang".equals(babyEyeCheck.getExtLeftEyelook())) {
133   - positive.append("外眼观察(左) ");
  137 + //positive.append("外眼观察(左) ");
  138 + babyEyeCheck.setExtLeftEyelookYang("2");
134 139 }
135 140 if ("yang".equals(babyEyeCheck.getBlinkRightReflex())) {
136   - positive.append("瞬目反射(右) ");
  141 + //positive.append("瞬目反射(右) ");
  142 + babyEyeCheck.setBlinkRightReflexYang("2");
137 143 }
138 144 if ("yang".equals(babyEyeCheck.getBlinkLefttReflex())) {
139   - positive.append("瞬目反射(左) ");
  145 + //positive.append("瞬目反射(左) ");
  146 + babyEyeCheck.setBlinkLefttReflexYang("2");
140 147 }
141 148 if ("yang".equals(babyEyeCheck.getPupillaryRightReflex())) {
142   - positive.append("瞳孔对光反射(右) ");
  149 + //positive.append("瞳孔对光反射(右) ");
  150 + babyEyeCheck.setPupillaryRightReflexYang("2");
143 151 }
144 152 if ("yang".equals(babyEyeCheck.getPupillaryLeftReflex())) {
145   - positive.append("瞳孔对光反射(左) ");
  153 + //positive.append("瞳孔对光反射(左) ");
  154 + babyEyeCheck.setPupillaryLeftReflexYang("2");
146 155 }
147 156 if ("yang".equals(babyEyeCheck.getRedRightReflex())) {
148   - positive.append("瞳孔红光反射(右) ");
  157 + // positive.append("瞳孔红光反射(右) ");
  158 + babyEyeCheck.setRedRightReflexYang("2");
149 159 }
150 160 if ("yang".equals(babyEyeCheck.getRedLeftReflex())) {
151   - positive.append("瞳孔红光反射(左) ");
  161 + //positive.append("瞳孔红光反射(左) ");
  162 + babyEyeCheck.setRedLeftReflexYang("2");
152 163 }
153 164 if ("yang".equals(babyEyeCheck.getRedReflex())) {
154   - positive.append("红光反射 ");
  165 + //positive.append("红光反射 ");
  166 + babyEyeCheck.setRedReflexYang("2");
155 167 }
156 168 if ("yang".equals(babyEyeCheck.getConjunctiva())) {
157   - positive.append("结膜 ");
  169 + //positive.append("结膜 ");
  170 + babyEyeCheck.setConjunctivaYang("2");
158 171 }
159 172 if ("yang".equals(babyEyeCheck.getCorneal())) {
160   - positive.append("角膜 ");
  173 + //positive.append("角膜 ");
  174 + babyEyeCheck.setCornealYang("2");
161 175 }
162 176 if ("yang".equals(babyEyeCheck.getLacrimalApparatus())) {
163   - positive.append("泪器 ");
  177 + // positive.append("泪器 ");
  178 + babyEyeCheck.setLacrimalApparatusYang("2");
164 179 }
165 180  
166 181 if ("yang".equals(babyEyeCheck.getNystagmus())) {
167   - positive.append("视动性眼震 ");
  182 + // positive.append("视动性眼震 ");
  183 + babyEyeCheck.setNystagmusYang("2");
168 184 }
169 185 if ("yang".equals(babyEyeCheck.getExtEyelook())) {
170   - positive.append("外眼观察 ");
171   - }*/
  186 + // positive.append("外眼观察 ");
  187 + babyEyeCheck.setExtEyelookYang("2");
  188 + }
  189 +*/
  190 +
172 191 babyEyeCheck.setCreated(new Date());
173 192 babyEyeCheck.setYn("1");
174 193 babyEyeCheck.setOperaterId(userId + "");
... ... @@ -432,6 +451,91 @@
432 451 if (StringUtils.isNotEmpty(doctorPositive)) {
433 452 criteria.and("doctorJudgement").is(doctorPositive);
434 453 }
  454 + /* List<String> positives = CollectionUtils.asList(positiveIds, String.class);
  455 + if (CollectionUtils.isNotEmpty(positives)) {
  456 + if (positives.contains("eyePosition2")) {
  457 + //positive.append("眼位(医生判定)");
  458 + criteria.and("eyePosition2Yang").is("2");
  459 + }
  460 + if (positives.contains("redLeft2")) {
  461 + //positive.append("红光反射（医生判定）");
  462 + criteria.and("redLeft2Yang").is("2");
  463 + }
  464 + if (positives.contains("vision2")) {
  465 + //positive.append("视力（医生判定）");
  466 + //babyEyeCheck.setVision2Yang("2");
  467 + criteria.and("vision2Yang").is("2");
  468 + }
  469 + if ("yang".equals(babyEyeCheck.getY2())) {
  470 + //positive.append("手持眼光仪（医生判定）");
  471 + babyEyeCheck.setOptometryYnag("2");
  472 + }
  473 + if ("yang".equals(babyEyeCheck.getRedLeft2())) {
  474 + //positive.append("屈光（医生判定）");
  475 + babyEyeCheck.setRedLeft2Yang("2");
  476 + }
  477 +
  478 +
  479 + if ("yang".equals(babyEyeCheck.getExtRightEyelook())) {
  480 + // babyEyeCheck.setEXtr("外眼观察(右) ");
  481 + babyEyeCheck.setExtRightEyelookYang("2");
  482 + }
  483 + if ("yang".equals(babyEyeCheck.getExtLeftEyelook())) {
  484 + //positive.append("外眼观察(左) ");
  485 + babyEyeCheck.setExtLeftEyelookYang("2");
  486 + }
  487 + if ("yang".equals(babyEyeCheck.getBlinkRightReflex())) {
  488 + //positive.append("瞬目反射(右) ");
  489 + babyEyeCheck.setBlinkRightReflexYang("2");
  490 + }
  491 + if ("yang".equals(babyEyeCheck.getBlinkLefttReflex())) {
  492 + //positive.append("瞬目反射(左) ");
  493 + babyEyeCheck.setBlinkLefttReflexYang("2");
  494 + }
  495 + if ("yang".equals(babyEyeCheck.getPupillaryRightReflex())) {
  496 + //positive.append("瞳孔对光反射(右) ");
  497 + babyEyeCheck.setPupillaryRightReflexYang("2");
  498 + }
  499 + if ("yang".equals(babyEyeCheck.getPupillaryLeftReflex())) {
  500 + //positive.append("瞳孔对光反射(左) ");
  501 + babyEyeCheck.setPupillaryLeftReflexYang("2");
  502 + }
  503 + if ("yang".equals(babyEyeCheck.getRedRightReflex())) {
  504 + // positive.append("瞳孔红光反射(右) ");
  505 + babyEyeCheck.setRedRightReflexYang("2");
  506 + }
  507 + if ("yang".equals(babyEyeCheck.getRedLeftReflex())) {
  508 + //positive.append("瞳孔红光反射(左) ");
  509 + babyEyeCheck.setRedLeftReflexYang("2");
  510 + }
  511 + if ("yang".equals(babyEyeCheck.getRedReflex())) {
  512 + //positive.append("红光反射 ");
  513 + babyEyeCheck.setRedReflexYang("2");
  514 + }
  515 + if ("yang".equals(babyEyeCheck.getConjunctiva())) {
  516 + //positive.append("结膜 ");
  517 + babyEyeCheck.setConjunctivaYang("2");
  518 + }
  519 + if ("yang".equals(babyEyeCheck.getCorneal())) {
  520 + //positive.append("角膜 ");
  521 + babyEyeCheck.setCornealYang("2");
  522 + }
  523 + if ("yang".equals(babyEyeCheck.getLacrimalApparatus())) {
  524 + // positive.append("泪器 ");
  525 + babyEyeCheck.setLacrimalApparatusYang("2");
  526 + }
  527 +
  528 + if ("yang".equals(babyEyeCheck.getNystagmus())) {
  529 + // positive.append("视动性眼震 ");
  530 + babyEyeCheck.setNystagmusYang("2");
  531 + }
  532 + if ("yang".equals(babyEyeCheck.getExtEyelook())) {
  533 + // positive.append("外眼观察 ");
  534 + babyEyeCheck.setExtEyelookYang("2");
  535 + }
  536 + }
  537 +*/
  538 +
435 539 if (org.apache.commons.lang.StringUtils.isNotBlank(key)) {
436 540 Criteria c = new Criteria();
437 541 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 @@
451 555 doFilter(babyEyeChecks, ids);
452 556 }
453 557 }
454   -
455 558 Integer count = babyEyeChecks.size();
456 559  
457 560 List<BabyEyeCheck> datas = CollectionUtils.getPageIds(babyEyeChecks, page, limit);
... ... @@ -594,6 +697,7 @@
594 697 && !"yang".equals(babyEyeCheck.getNystagmus())
595 698 && !"yang".equals(babyEyeCheck.getLacrimalApparatus())
596 699 && !"yang".equals(babyEyeCheck.getEyePositionId())
  700 + && !"yang".equals(babyEyeCheck.getEyePositionId2())
597 701 && !"yang".equals(babyEyeCheck.getRedLeft2())
598 702 && !"yang".equals(babyEyeCheck.getVision2())
599 703 && !"yang".equals(babyEyeCheck.getY2())
... ... @@ -709,6 +813,32 @@
709 813 lacrimalApparatusMap.put("name", "泪器");
710 814 positive.add(lacrimalApparatusMap);
711 815  
  816 + Map<String, Object> eyePosition2Map = new HashMap<>();
  817 + eyePosition2Map.put("id", "eyePosition2");
  818 + eyePosition2Map.put("name", "眼位（医生判定阳性）");
  819 + positive.add(eyePosition2Map);
  820 +
  821 + Map<String, Object> redLeft2Map = new HashMap<>();
  822 + redLeft2Map.put("id", "redLeft2Map");
  823 + redLeft2Map.put("name", "红光反射（医生判定阳性）");
  824 + positive.add(redLeft2Map);
  825 +
  826 +
  827 + Map<String, Object> vision2Map = new HashMap<>();
  828 + vision2Map.put("id", "vision2");
  829 + vision2Map.put("name", "视力（医生判定阳性）");
  830 + positive.add(vision2Map);
  831 +
  832 + Map<String, Object> y2Map = new HashMap<>();
  833 + y2Map.put("id", "y2");
  834 + y2Map.put("name", "手持验光仪（医生判定阳性）");
  835 + positive.add(y2Map);
  836 +
  837 + Map<String, Object> refraction2Map = new HashMap<>();
  838 + refraction2Map.put("id", "refraction2");
  839 + refraction2Map.put("name", "屈光（医生判定阳性）");
  840 + positive.add(refraction2Map);
  841 +
712 842 return RespBuilder.buildSuccess("checkMonth", checkMonth, "positive", positive, "currentMonth", currentMonth);
713 843 }
714 844  
... ... @@ -769,5 +899,24 @@
769 899 ExceptionUtils.catchException(e, "眼保健数据同步");
770 900 }
771 901 }
  902 +
  903 +
  904 + public static void main(String[] args) {
  905 + List<String> ls = new ArrayList<>();
  906 + ls.add("1");
  907 + ls.add("2");
  908 + ls.add("3");
  909 + ls.add("4");
  910 +
  911 + List<String> ls2 = new ArrayList<>();
  912 + ls2.add("1");
  913 + ls2.add("6");
  914 +
  915 + System.out.println(ls.containsAll(ls2));
  916 +
  917 +
  918 + }
  919 +
  920 +
772 921 }