jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 0b0fc530a4f877ebc2591f6aec33952e389c50dc

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

工位

Showing 2 changed files with 103 additions and 51 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ 0b0fc53
... ... @@ -415,7 +415,26 @@
415 415 private Map<String,Object> cardArticle;
416 416 // 1 本县 2 外县
417 417 private Integer areaType;
  418 + //儿童眼保健最后检查时间
  419 + private Date babyCheckEyeLastDateStart;
  420 + private Date babyCheckEyeLastDateEnd;
418 421  
  422 + public Date getBabyCheckEyeLastDateStart() {
  423 + return babyCheckEyeLastDateStart;
  424 + }
  425 +
  426 + public void setBabyCheckEyeLastDateStart(Date babyCheckEyeLastDateStart) {
  427 + this.babyCheckEyeLastDateStart = babyCheckEyeLastDateStart;
  428 + }
  429 +
  430 + public Date getBabyCheckEyeLastDateEnd() {
  431 + return babyCheckEyeLastDateEnd;
  432 + }
  433 +
  434 + public void setBabyCheckEyeLastDateEnd(Date babyCheckEyeLastDateEnd) {
  435 + this.babyCheckEyeLastDateEnd = babyCheckEyeLastDateEnd;
  436 + }
  437 +
419 438 public List<String> getStreetIds() {
420 439 return streetIds;
421 440 }
... ... @@ -2653,6 +2672,14 @@
2653 2672 c = c.and("lhNextEyeCheckTime").gte(lhNextEyeCheckTimeStrat).lte(lhNextEyeCheckTimeEnd);
2654 2673 } else {
2655 2674 c = Criteria.where("lhNextEyeCheckTime").gte(lhNextEyeCheckTimeStrat).lte(lhNextEyeCheckTimeEnd);
  2675 + }
  2676 + }
  2677 +
  2678 + if (null != babyCheckEyeLastDateStart && babyCheckEyeLastDateEnd != null) {
  2679 + if (null != c) {
  2680 + c = c.and("babyCheckEyeLastDate").gte(babyCheckEyeLastDateStart).lte(babyCheckEyeLastDateEnd);
  2681 + } else {
  2682 + c = Criteria.where("babyCheckEyeLastDate").gte(babyCheckEyeLastDateStart).lte(babyCheckEyeLastDateEnd);
2656 2683 }
2657 2684 }
2658 2685 Criteria cor8=MongoCondition.newInstance().getCriteria();//这里不能给null return拼接不能为空
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java View file @ 0b0fc53
... ... @@ -3531,17 +3531,35 @@
3531 3531  
3532 3532  
3533 3533 //0-6岁儿童眼保健及视力检查人数
3534   - BabyCheckModelQuery checkModelQuery = new BabyCheckModelQuery();
3535   - checkModelQuery.setStreetIds(streetIds);
3536   - checkModelQuery.setYn(YnEnums.YES.getId());
3537   - checkModelQuery.setBirthStart(end1);
3538   - checkModelQuery.setBirthEnd(start1);
3539   - checkModelQuery.setLhdsl(true);
3540   - //checkModelQuery.setCheckDateStart(DateUtil.addYear(new Date(),-20));
3541   - checkModelQuery.setCheckDateStart(startDateFirst);
3542   - checkModelQuery.setCheckDateEnd(endDate);
3543   - System.out.println("===9"+checkModelQuery.convertToQuery().convertToMongoQuery().toString());
3544   - int data13 =babyCheckService.queryBabyCheckCount(checkModelQuery);
  3534 +// BabyCheckModelQuery checkModelQuery = new BabyCheckModelQuery();
  3535 +// checkModelQuery.setStreetIds(streetIds);
  3536 +// checkModelQuery.setYn(YnEnums.YES.getId());
  3537 +// checkModelQuery.setBirthStart(end1);
  3538 +// checkModelQuery.setBirthEnd(start1);
  3539 +// checkModelQuery.setLhdsl(true);
  3540 +// //checkModelQuery.setCheckDateStart(DateUtil.addYear(new Date(),-20));
  3541 +// checkModelQuery.setCheckDateStart(startDateFirst);
  3542 +// checkModelQuery.setCheckDateEnd(endDate);
  3543 +// System.out.println("===9"+checkModelQuery.convertToQuery().convertToMongoQuery().toString());
  3544 +// int data13 =babyCheckService.queryBabyCheckCount(checkModelQuery);
  3545 +
  3546 +
  3547 + BabyModelQuery babyQuery3 = new BabyModelQuery();
  3548 + babyQuery3.setExistSource(false);
  3549 + babyQuery3.setYn(YnEnums.YES.getId());
  3550 + babyQuery3.setStreetIds(streetIds);
  3551 + Date start3 = DateUtil.addMonth(currentDate1, 0);
  3552 + babyQuery3.setBirthEnd(start3);
  3553 + Date end3 = DateUtil.addDay(DateUtil.addMonth(currentDate1, -72 - 1), 1);
  3554 + babyQuery3.setBirthStart(end3);
  3555 + babyQuery3.setBuildDateEnd(endDate);
  3556 + babyQuery3.setBuildDateStart(startDateFirst);
  3557 + babyQuery3.setBabyCheckEyeLastDateStart(startDateFirst);
  3558 + babyQuery3.setBabyCheckEyeLastDateEnd(endDate);
  3559 +
  3560 + System.out.println("===9"+babyQuery3.convertToQuery().convertToMongoQuery().toString());
  3561 + int data13 = babyBookbuildingService.queryBabyCount(babyQuery3);
  3562 +
3545 3563 int lastDate13= null==hospitalDate.get("data13")?0:Integer.parseInt(hospitalDate.get("data13").toString());
3546 3564 hospitalDate.put("data13",data13+lastDate13);
3547 3565 //0-6岁儿童眼保健及视力检查覆盖率%
3548 3566  
3549 3567  
3550 3568  
3551 3569  
3552 3570  
3553 3571  
3554 3572  
... ... @@ -4270,58 +4288,65 @@
4270 4288 public BaseResponse getBabyEyeCheckItems(Integer page, Integer limit, String areaId, String streetId, Date dateTime) {
4271 4289 //获得区县下的街道
4272 4290 List<String> streetIds = getRegionsStreetIds( areaId, streetId);
4273   - BabyCheckModelQuery checkModelQuery1 = new BabyCheckModelQuery();
  4291 +
  4292 +
  4293 +
  4294 +
4274 4295 if (CollectionUtils.isNotEmpty(streetIds))
4275 4296 {
4276 4297 Date endDate = DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime));
4277   -
4278 4298 Date currentDate1 = DateUtil.formatDate(new Date());
4279   - Date start1 = DateUtil.addMonth(currentDate1, 0);
4280   - checkModelQuery1.setBirthEnd(start1);
4281   - Date end1 = DateUtil.addDay(DateUtil.addMonth(currentDate1, -72 - 1), 1);
4282   -
4283   - checkModelQuery1.setStreetIds(streetIds);
4284   - checkModelQuery1.setYn(YnEnums.YES.getId());
4285   - checkModelQuery1.setBirthStart(end1);
4286   - checkModelQuery1.setBirthEnd(start1);
4287   - checkModelQuery1.setLhdsl(true);
4288 4299 //传入的时间获取年的第一天
4289 4300 Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime));
4290   - checkModelQuery1.setCheckDateStart(startDateFirst);
4291   - //checkModelQuery1.setCheckDateStart(DateUtil.addYear(new Date(),-20));
4292   - checkModelQuery1.setCheckDateEnd(endDate);
4293   - checkModelQuery1.setPage(page);
4294   - checkModelQuery1.setLimit(limit);
4295   - checkModelQuery1.setNeed("true");
4296   - List <BabyCheckModel> babyCheckModelList = babyCheckService.queryBabyCheckRecord(checkModelQuery1);
  4301 +
  4302 +
  4303 + BabyModelQuery babyQuery3 = new BabyModelQuery();
  4304 + babyQuery3.setExistSource(false);
  4305 + babyQuery3.setYn(YnEnums.YES.getId());
  4306 + babyQuery3.setStreetIds(streetIds);
  4307 + Date start3 = DateUtil.addMonth(currentDate1, 0);
  4308 + babyQuery3.setBirthEnd(start3);
  4309 + Date end3 = DateUtil.addDay(DateUtil.addMonth(currentDate1, -72 - 1), 1);
  4310 + babyQuery3.setBirthStart(end3);
  4311 + babyQuery3.setBuildDateEnd(endDate);
  4312 + babyQuery3.setBuildDateStart(startDateFirst);
  4313 + babyQuery3.setBabyCheckEyeLastDateStart(startDateFirst);
  4314 + babyQuery3.setBabyCheckEyeLastDateEnd(endDate);
  4315 +
  4316 +// BabyCheckModelQuery checkModelQuery1 = new BabyCheckModelQuery();
  4317 +// checkModelQuery1.setBirthEnd(start1);
  4318 +// checkModelQuery1.setStreetIds(streetIds);
  4319 +// checkModelQuery1.setYn(YnEnums.YES.getId());
  4320 +// checkModelQuery1.setBirthStart(end1);
  4321 +// checkModelQuery1.setBirthEnd(start1);
  4322 +// checkModelQuery1.setLhdsl(true);
  4323 +//
  4324 +// checkModelQuery1.setCheckDateStart(startDateFirst);
  4325 +// //checkModelQuery1.setCheckDateStart(DateUtil.addYear(new Date(),-20));
  4326 +// checkModelQuery1.setCheckDateEnd(endDate);
  4327 + babyQuery3.setPage(page);
  4328 + babyQuery3.setLimit(limit);
  4329 + babyQuery3.setNeed("true");
  4330 + System.out.println("eye check "+babyQuery3.convertToQuery().convertToMongoQuery().toString());
  4331 + List <BabyModel> babyModels = babyBookbuildingService.queryBabyBuildByCond(babyQuery3);
4297 4332 List <Map <String, Object>> list = new ArrayList();
4298   - for (BabyCheckModel babyCheckModel : babyCheckModelList) {
  4333 + for (BabyModel babyModel : babyModels) {
4299 4334 Map <String, Object> map = new HashMap <>();
4300   - map.put("checkId", babyCheckModel.getId());
4301   - if (StringUtils.isNotEmpty(babyCheckModel.getBuildId())) {
4302   - BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(babyCheckModel.getBuildId())), BabyModel.class);
4303   - if (babyModel == null) {
4304   - System.out.println("no baby "+ babyCheckModel.getBuildId());
4305   - continue;
4306   - }
4307   - map.put("id", babyModel.getId());
4308   - map.put("babyName", babyModel.getName());
4309   - map.put("babySex", babyModel.getSex() != 0 ? "男" : "女");
4310   - map.put("mommyName", babyModel.getMname());
4311   - map.put("mommyCardNo", babyModel.getMcertNo());
4312   - map.put("checkAge", DateUtil.getBabyMonthAge(babyModel.getBirth(), babyCheckModel.getCheckDate()));
4313   - map.put("birth",DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
4314   - map.put("mommyPhone",babyModel.getMphone());
4315   - }
4316   - map.put("checkTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getCheckDate()));
4317   - map.put("nextCheckTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getNextDate()));
4318   - map.put("height", babyCheckModel.getHeight());
4319   - map.put("weight", babyCheckModel.getWeight());
4320 4335  
  4336 + map.put("id", babyModel.getId());
  4337 + map.put("babyName", babyModel.getName());
  4338 + map.put("babySex", babyModel.getSex() != 0 ? "男" : "女");
  4339 + map.put("mommyName", babyModel.getMname());
  4340 + map.put("mommyCardNo", babyModel.getMcertNo());
  4341 + map.put("checkAge", DateUtil.getBabyMonthAge(babyModel.getBirth(), babyModel.getBabyCheckEyeLastDate()));
  4342 + map.put("birth",DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
  4343 + map.put("mommyPhone",babyModel.getMphone());
  4344 + map.put("checkTime", DateUtil.getyyyy_MM_dd(babyModel.getBabyCheckEyeLastDate()));
  4345 +
4321 4346 list.add(map);
4322 4347 }
4323 4348 return new BaseListResponse().setErrorcode(0).setErrormsg("成功")
4324   - .setData(list).setPageInfo(checkModelQuery1.getPageInfo());
  4349 + .setData(list).setPageInfo(babyQuery3.getPageInfo());
4325 4350 }
4326 4351 return RespBuilder.buildSuccess(null);
4327 4352 }