diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java index 0016fec..a390ad4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java @@ -631,7 +631,6 @@ public class AreaCountController extends BaseController { * @param limit * @param areaId * @param streetId - * @param type * @param dateTime * @return */ @@ -647,6 +646,30 @@ public class AreaCountController extends BaseController { return patientSyncMysqlFacade.getChFsCountList(page,limit,areaId,streetId,dateTime); } + + /** + * 0-6岁儿童眼保健及视力筛查人次数 + * @param request + * @param page + * @param limit + * @param areaId + * @param streetId + * @param dateTime + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/getBabyEyeCheckItems") + @ResponseBody + @TokenRequired + public BaseResponse getBabyEyeCheckItems(HttpServletRequest request, + Integer page, Integer limit, + @RequestParam String areaId, + @RequestParam( required = false) String streetId, + @RequestParam Date dateTime) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return patientSyncMysqlFacade.getBabyEyeCheckItems(page,limit,areaId,streetId,dateTime); + } + + /** * 公共卫生项目统计 中医指导明细 * @param request diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java index 0b54859..2cee717 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java @@ -3371,8 +3371,8 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { BabyCheckModelQuery checkModelQuery = new BabyCheckModelQuery(); checkModelQuery.setHospitalId(hospitalId); checkModelQuery.setYn(YnEnums.YES.getId()); - checkModelQuery.setBirthStart(start1); - checkModelQuery.setBirthEnd(end1); + checkModelQuery.setBirthStart(end1); + checkModelQuery.setBirthEnd(start1); checkModelQuery.setLhdsl(true); checkModelQuery.setCheckDateStart(DateUtil.addYear(new Date(),-20)); checkModelQuery.setCheckDateEnd(endDate); @@ -3575,7 +3575,6 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { checkModelQuery1.setPage(page); checkModelQuery1.setLimit(limit); checkModelQuery1.setNeed("true"); - System.out.println(checkModelQuery1.convertToQuery().convertToMongoQuery().toString()); List babyCheckModelList = babyCheckService.queryBabyCheckRecord(checkModelQuery1); List > list = new ArrayList(); for (BabyCheckModel babyCheckModel : babyCheckModelList) { @@ -3943,4 +3942,69 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { return new BaseListResponse(); } + + public BaseResponse getBabyEyeCheckItems(Integer page, Integer limit, String areaId, String streetId, Date dateTime) { + //获得区县下的街道 + List regions = getRegions(areaId,streetId); + List hospitalIds = new ArrayList<>(); + for (BasicConfig region : regions) { + //获得街道下的医院 + List organizations = getOrganization(region.getId()); + for (Organization organization : organizations) { + String hospitalId= StringUtils.getIntToVal(organization.getId()); + hospitalIds.add(hospitalId); + } + } + BabyCheckModelQuery checkModelQuery1 = new BabyCheckModelQuery(); + if (CollectionUtils.isNotEmpty(hospitalIds)) + { + Date endDate = DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); + + Date currentDate1 = DateUtil.formatDate(new Date()); + Date start1 = DateUtil.addMonth(currentDate1, 0); + checkModelQuery1.setBirthEnd(start1); + Date end1 = DateUtil.addDay(DateUtil.addMonth(currentDate1, -36 - 1), 1); + + checkModelQuery1.setHospitalIds(hospitalIds); + checkModelQuery1.setYn(YnEnums.YES.getId()); + checkModelQuery1.setBirthStart(end1); + checkModelQuery1.setBirthEnd(start1); + checkModelQuery1.setLhdsl(true); + checkModelQuery1.setCheckDateStart(DateUtil.addYear(new Date(),-20)); + checkModelQuery1.setCheckDateEnd(endDate); + checkModelQuery1.setPage(page); + checkModelQuery1.setLimit(limit); + checkModelQuery1.setNeed("true"); + List babyCheckModelList = babyCheckService.queryBabyCheckRecord(checkModelQuery1); + List > list = new ArrayList(); + for (BabyCheckModel babyCheckModel : babyCheckModelList) { + Map map = new HashMap <>(); + map.put("checkId", babyCheckModel.getId()); + if (StringUtils.isNotEmpty(babyCheckModel.getBuildId())) { + BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(babyCheckModel.getBuildId())), BabyModel.class); + if (babyModel == null) { + System.out.println("no baby "+ babyCheckModel.getBuildId()); + continue; + } + map.put("id", babyModel.getId()); + map.put("babyName", babyModel.getName()); + map.put("babySex", babyModel.getSex() != 0 ? "男" : "女"); + map.put("mommyName", babyModel.getMname()); + map.put("mommyCardNo", babyModel.getMcertNo()); + map.put("checkAge", DateUtil.getMonth(babyModel.getBirth(), babyCheckModel.getCheckDate())); + map.put("birth",DateUtil.getyyyy_MM_dd(babyModel.getBirth())); + map.put("mommyPhone",babyModel.getMphone()); + } + map.put("checkTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getCheckDate())); + map.put("nextCheckTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getNextDate())); + map.put("height", babyCheckModel.getHeight()); + map.put("weight", babyCheckModel.getWeight()); + + list.add(map); + } + return new BaseListResponse().setErrorcode(0).setErrormsg("成功") + .setData(list).setPageInfo(checkModelQuery1.getPageInfo()); + } + return RespBuilder.buildSuccess(null); + } }