Commit 9a2b1a7980bc48cc2535d191c141358cfd3460bb
1 parent
8ea3a080bd
Exists in
master
and in
6 other branches
隆化:入园体检屈光筛查获取
Showing 3 changed files with 56 additions and 5 deletions
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyKindergartenCheckController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyKindergartenCheckController.java
View file @
9a2b1a7
... | ... | @@ -164,6 +164,21 @@ |
164 | 164 | |
165 | 165 | } |
166 | 166 | |
167 | + /** | |
168 | + * 根据母亲手机号码、孩子姓名查询眼保健信息 | |
169 | + * @param mPhone | |
170 | + * @param childName | |
171 | + * @param request | |
172 | + * @return | |
173 | + */ | |
174 | + @RequestMapping(value = "/queryEyeInfoByPhoneOrName", method = RequestMethod.GET) | |
175 | + @ResponseBody | |
176 | + @TokenRequired | |
177 | + public BaseResponse queryEyeInfoByPhoneOrName(@RequestParam(required = true) String mPhone, | |
178 | + @RequestParam(required = true) String childName, | |
179 | + HttpServletRequest request) { | |
180 | + return babyKindergartenCheckFacade.queryEyeInfoByPhoneOrName(mPhone,childName, getUserId(request)); | |
181 | + } | |
167 | 182 | |
168 | 183 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java
View file @
9a2b1a7
... | ... | @@ -29,6 +29,7 @@ |
29 | 29 | import org.apache.commons.collections.CollectionUtils; |
30 | 30 | import org.apache.commons.lang.math.NumberUtils; |
31 | 31 | import org.springframework.beans.factory.annotation.Autowired; |
32 | +import org.springframework.data.domain.Sort; | |
32 | 33 | import org.springframework.stereotype.Component; |
33 | 34 | |
34 | 35 | import javax.servlet.http.HttpServletResponse; |
... | ... | @@ -63,6 +64,8 @@ |
63 | 64 | private BasicConfigService basicConfigService; |
64 | 65 | @Autowired |
65 | 66 | private BabyCheckService babyCheckService; |
67 | + @Autowired | |
68 | + private LhBabyEyeCheckService lhBabyEyeCheckService; | |
66 | 69 | /** |
67 | 70 | * 构造保存对象 |
68 | 71 | * |
... | ... | @@ -758,6 +761,34 @@ |
758 | 761 | cnames.put("checkDate", "检查时间"); |
759 | 762 | |
760 | 763 | ResponseUtil.responseExcel(cnames, results, response); |
764 | + } | |
765 | + | |
766 | + public BaseResponse queryEyeInfoByPhoneOrName(String mPhone, String childName, Integer userId) { | |
767 | + Map map=new HashMap(); | |
768 | + String hospitalId = autoMatchFacade.getHospitalId(userId); | |
769 | + BabyModelQuery babyModelQuery=new BabyModelQuery(); | |
770 | + babyModelQuery.setHospitalId(hospitalId); | |
771 | + babyModelQuery.setYn(YnEnums.YES.getId()); | |
772 | + babyModelQuery.setMphone(mPhone); | |
773 | + babyModelQuery.setName(childName); | |
774 | + List<BabyModel> babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery,"created", Sort.Direction.DESC); | |
775 | + if(CollectionUtils.isNotEmpty(babyModels) && StringUtils.isNotEmpty(babyModels.get(0).getLhEyeCheckId())){ | |
776 | + LhBabyEyeCheck lhBabyEyeCheck = lhBabyEyeCheckService.queryById(babyModels.get(0).getLhEyeCheckId()); | |
777 | + if(null!=lhBabyEyeCheck){ | |
778 | + map.put("lhdsr",lhBabyEyeCheck.getLhdsr()); | |
779 | + map.put("lhdcr",lhBabyEyeCheck.getLhdcr()); | |
780 | + map.put("lhaxisr",lhBabyEyeCheck.getLhaxisr()); | |
781 | + map.put("lhdsl",lhBabyEyeCheck.getLhdsl()); | |
782 | + map.put("lhdcl",lhBabyEyeCheck.getLhdcl()); | |
783 | + map.put("lhaxisl",lhBabyEyeCheck.getLhaxisl()); | |
784 | + } | |
785 | + | |
786 | + } | |
787 | + BaseObjectResponse objectResponse = new BaseObjectResponse(); | |
788 | + objectResponse.setData(map); | |
789 | + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); | |
790 | + objectResponse.setErrormsg("成功"); | |
791 | + return objectResponse; | |
761 | 792 | } |
762 | 793 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java
View file @
9a2b1a7
... | ... | @@ -67,9 +67,12 @@ |
67 | 67 | "2".equals(babyCheck.getLhgzfyRight()) || "2".equals(babyCheck.getLhgzfyLeft()) || "2".equals(babyCheck.getLhhqsy()) || |
68 | 68 | "2".equals(babyCheck.getLhhgfsRight()) || "2".equals(babyCheck.getLhhgfsLeft()) || "2".equals(babyCheck.getLhkyqgbzRight()) || |
69 | 69 | "2".equals(babyCheck.getLhkyqgbzLeft()) || "2".equals(babyCheck.getLhdyyesyRight()) || "2".equals(babyCheck.getLhdyyesyLeft()) || |
70 | - "2".equals(babyCheck.getLhywjc()) || (null !=babyCheck.getLhsljcstRight() && (3.5d<babyCheck.getLhsljcstRight() || 7.5d>babyCheck.getLhsljcstRight())) || | |
71 | - (null !=babyCheck.getLhsljcstLeft() && (3.5d<babyCheck.getLhsljcstLeft() || 7.5d>babyCheck.getLhsljcstLeft())) || "2".equals(babyCheck.getLhsldcRight()) || | |
72 | - "2".equals(babyCheck.getLhsldcLeft()) | |
70 | + "2".equals(babyCheck.getLhywjc()) || ("48".equals(babyCheck.getCheckMonthId()) && 0.6>babyCheck.getLhsljcstRight()) || | |
71 | + (("60".equals(babyCheck.getCheckMonthId()) || "72".equals(babyCheck.getCheckMonthId())) && 0.8>babyCheck.getLhsljcstRight()) || | |
72 | + ("48".equals(babyCheck.getCheckMonthId()) && 0.6>babyCheck.getLhsljcstLeft()) || | |
73 | + (("60".equals(babyCheck.getCheckMonthId()) || "72".equals(babyCheck.getCheckMonthId())) && 0.8>babyCheck.getLhsljcstLeft()) || | |
74 | + "2".equals(babyCheck.getLhsldcRight()) || "2".equals(babyCheck.getLhsldcLeft()) | |
75 | + | |
73 | 76 | ){ |
74 | 77 | babyCheck.setPositiveType("2"); |
75 | 78 | babyCheck.setChuPositiveType("2"); |
76 | 79 | |
... | ... | @@ -383,10 +386,12 @@ |
383 | 386 | if("2".equals(babyCheck.getLhywjc())){ |
384 | 387 | abnormal+="眼位检查;"; |
385 | 388 | } |
386 | - if("2".equals(babyCheck.getLhsljcstRight())){ | |
389 | + if(("48".equals(babyCheck.getCheckMonthId()) && 0.6>babyCheck.getLhsljcstRight()) || | |
390 | + (("60".equals(babyCheck.getCheckMonthId()) || "72".equals(babyCheck.getCheckMonthId())) && 0.8>babyCheck.getLhsljcstRight())){ | |
387 | 391 | abnormal+="视力检查(右);"; |
388 | 392 | } |
389 | - if("2".equals(babyCheck.getLhsljcstLeft())){ | |
393 | + if(("48".equals(babyCheck.getCheckMonthId()) && 0.6>babyCheck.getLhsljcstLeft()) || | |
394 | + (("60".equals(babyCheck.getCheckMonthId()) || "72".equals(babyCheck.getCheckMonthId())) && 0.8>babyCheck.getLhsljcstLeft())){ | |
390 | 395 | abnormal+="视力检查(左);"; |
391 | 396 | } |
392 | 397 | if("2".equals(babyCheck.getLhsldcRight())){ |