Commit b86091467237d0df32da4d934ad759a29849cd4a
1 parent
54ca34607e
Exists in
master
and in
6 other branches
公共卫生统计
Showing 2 changed files with 91 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java
View file @
b860914
... | ... | @@ -631,7 +631,6 @@ |
631 | 631 | * @param limit |
632 | 632 | * @param areaId |
633 | 633 | * @param streetId |
634 | - * @param type | |
635 | 634 | * @param dateTime |
636 | 635 | * @return |
637 | 636 | */ |
... | ... | @@ -646,6 +645,30 @@ |
646 | 645 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
647 | 646 | return patientSyncMysqlFacade.getChFsCountList(page,limit,areaId,streetId,dateTime); |
648 | 647 | } |
648 | + | |
649 | + | |
650 | + /** | |
651 | + * 0-6岁儿童眼保健及视力筛查人次数 | |
652 | + * @param request | |
653 | + * @param page | |
654 | + * @param limit | |
655 | + * @param areaId | |
656 | + * @param streetId | |
657 | + * @param dateTime | |
658 | + * @return | |
659 | + */ | |
660 | + @RequestMapping(method = RequestMethod.GET, value = "/getBabyEyeCheckItems") | |
661 | + @ResponseBody | |
662 | + @TokenRequired | |
663 | + public BaseResponse getBabyEyeCheckItems(HttpServletRequest request, | |
664 | + Integer page, Integer limit, | |
665 | + @RequestParam String areaId, | |
666 | + @RequestParam( required = false) String streetId, | |
667 | + @RequestParam Date dateTime) { | |
668 | + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
669 | + return patientSyncMysqlFacade.getBabyEyeCheckItems(page,limit,areaId,streetId,dateTime); | |
670 | + } | |
671 | + | |
649 | 672 | |
650 | 673 | /** |
651 | 674 | * 公共卫生项目统计 中医指导明细 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
View file @
b860914
... | ... | @@ -3371,8 +3371,8 @@ |
3371 | 3371 | BabyCheckModelQuery checkModelQuery = new BabyCheckModelQuery(); |
3372 | 3372 | checkModelQuery.setHospitalId(hospitalId); |
3373 | 3373 | checkModelQuery.setYn(YnEnums.YES.getId()); |
3374 | - checkModelQuery.setBirthStart(start1); | |
3375 | - checkModelQuery.setBirthEnd(end1); | |
3374 | + checkModelQuery.setBirthStart(end1); | |
3375 | + checkModelQuery.setBirthEnd(start1); | |
3376 | 3376 | checkModelQuery.setLhdsl(true); |
3377 | 3377 | checkModelQuery.setCheckDateStart(DateUtil.addYear(new Date(),-20)); |
3378 | 3378 | checkModelQuery.setCheckDateEnd(endDate); |
... | ... | @@ -3575,7 +3575,6 @@ |
3575 | 3575 | checkModelQuery1.setPage(page); |
3576 | 3576 | checkModelQuery1.setLimit(limit); |
3577 | 3577 | checkModelQuery1.setNeed("true"); |
3578 | - System.out.println(checkModelQuery1.convertToQuery().convertToMongoQuery().toString()); | |
3579 | 3578 | List <BabyCheckModel> babyCheckModelList = babyCheckService.queryBabyCheckRecord(checkModelQuery1); |
3580 | 3579 | List <Map <String, Object>> list = new ArrayList(); |
3581 | 3580 | for (BabyCheckModel babyCheckModel : babyCheckModelList) { |
... | ... | @@ -3942,6 +3941,71 @@ |
3942 | 3941 | } |
3943 | 3942 | return new BaseListResponse(); |
3944 | 3943 | |
3944 | + } | |
3945 | + | |
3946 | + public BaseResponse getBabyEyeCheckItems(Integer page, Integer limit, String areaId, String streetId, Date dateTime) { | |
3947 | + //获得区县下的街道 | |
3948 | + List<BasicConfig> regions = getRegions(areaId,streetId); | |
3949 | + List<String> hospitalIds = new ArrayList<>(); | |
3950 | + for (BasicConfig region : regions) { | |
3951 | + //获得街道下的医院 | |
3952 | + List<Organization> organizations = getOrganization(region.getId()); | |
3953 | + for (Organization organization : organizations) { | |
3954 | + String hospitalId= StringUtils.getIntToVal(organization.getId()); | |
3955 | + hospitalIds.add(hospitalId); | |
3956 | + } | |
3957 | + } | |
3958 | + BabyCheckModelQuery checkModelQuery1 = new BabyCheckModelQuery(); | |
3959 | + if (CollectionUtils.isNotEmpty(hospitalIds)) | |
3960 | + { | |
3961 | + Date endDate = DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); | |
3962 | + | |
3963 | + Date currentDate1 = DateUtil.formatDate(new Date()); | |
3964 | + Date start1 = DateUtil.addMonth(currentDate1, 0); | |
3965 | + checkModelQuery1.setBirthEnd(start1); | |
3966 | + Date end1 = DateUtil.addDay(DateUtil.addMonth(currentDate1, -36 - 1), 1); | |
3967 | + | |
3968 | + checkModelQuery1.setHospitalIds(hospitalIds); | |
3969 | + checkModelQuery1.setYn(YnEnums.YES.getId()); | |
3970 | + checkModelQuery1.setBirthStart(end1); | |
3971 | + checkModelQuery1.setBirthEnd(start1); | |
3972 | + checkModelQuery1.setLhdsl(true); | |
3973 | + checkModelQuery1.setCheckDateStart(DateUtil.addYear(new Date(),-20)); | |
3974 | + checkModelQuery1.setCheckDateEnd(endDate); | |
3975 | + checkModelQuery1.setPage(page); | |
3976 | + checkModelQuery1.setLimit(limit); | |
3977 | + checkModelQuery1.setNeed("true"); | |
3978 | + List <BabyCheckModel> babyCheckModelList = babyCheckService.queryBabyCheckRecord(checkModelQuery1); | |
3979 | + List <Map <String, Object>> list = new ArrayList(); | |
3980 | + for (BabyCheckModel babyCheckModel : babyCheckModelList) { | |
3981 | + Map <String, Object> map = new HashMap <>(); | |
3982 | + map.put("checkId", babyCheckModel.getId()); | |
3983 | + if (StringUtils.isNotEmpty(babyCheckModel.getBuildId())) { | |
3984 | + BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(babyCheckModel.getBuildId())), BabyModel.class); | |
3985 | + if (babyModel == null) { | |
3986 | + System.out.println("no baby "+ babyCheckModel.getBuildId()); | |
3987 | + continue; | |
3988 | + } | |
3989 | + map.put("id", babyModel.getId()); | |
3990 | + map.put("babyName", babyModel.getName()); | |
3991 | + map.put("babySex", babyModel.getSex() != 0 ? "男" : "女"); | |
3992 | + map.put("mommyName", babyModel.getMname()); | |
3993 | + map.put("mommyCardNo", babyModel.getMcertNo()); | |
3994 | + map.put("checkAge", DateUtil.getMonth(babyModel.getBirth(), babyCheckModel.getCheckDate())); | |
3995 | + map.put("birth",DateUtil.getyyyy_MM_dd(babyModel.getBirth())); | |
3996 | + map.put("mommyPhone",babyModel.getMphone()); | |
3997 | + } | |
3998 | + map.put("checkTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getCheckDate())); | |
3999 | + map.put("nextCheckTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getNextDate())); | |
4000 | + map.put("height", babyCheckModel.getHeight()); | |
4001 | + map.put("weight", babyCheckModel.getWeight()); | |
4002 | + | |
4003 | + list.add(map); | |
4004 | + } | |
4005 | + return new BaseListResponse().setErrorcode(0).setErrormsg("成功") | |
4006 | + .setData(list).setPageInfo(checkModelQuery1.getPageInfo()); | |
4007 | + } | |
4008 | + return RespBuilder.buildSuccess(null); | |
3945 | 4009 | } |
3946 | 4010 | } |