jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 375639c6255822d3e5721621fcd657ebbd664b3e

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

公共卫生统计

Showing 1 changed file with 15 additions and 17 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java View file @ 375639c
... ... @@ -3484,9 +3484,11 @@
3484 3484 }
3485 3485 }
3486 3486 hospitalDate.put("data18",data17_data2+"%");
  3487 +
  3488 +
3487 3489 //产后访视人数
3488 3490 int data19= (int)mongoTemplate.count(new Query(Criteria.
3489   - where("hospitalId").is(hospitalId).and("visitDate").lte(endDate)),MatdeliverFollowModel.class);
  3491 + where("hospitalId").is(hospitalId).and("checkTime").lte(endDate).and("yn").is(1)),PostReviewModel.class);
3490 3492  
3491 3493 int lastDate19= null==hospitalDate.get("data19")?0:Integer.parseInt(hospitalDate.get("data19").toString());
3492 3494 hospitalDate.put("data19",data19+lastDate19);
... ... @@ -3501,6 +3503,7 @@
3501 3503 }
3502 3504 }
3503 3505 hospitalDate.put("data20",data19_data2+"%");
  3506 +
3504 3507 //孕产妇系统管理人数
3505 3508 hospitalDate.put("data21",data19);
3506 3509 //孕产妇系统管理率%
3507 3510  
3508 3511  
3509 3512  
3510 3513  
3511 3514  
3512 3515  
3513 3516  
... ... @@ -3978,38 +3981,33 @@
3978 3981 if (CollectionUtils.isNotEmpty(hospitalIds))
3979 3982 {
3980 3983 Criteria criteria = Criteria.
3981   - where("hospitalId").in(hospitalIds).and("visitDate").lte(endDate);
  3984 + where("hospitalId").in(hospitalIds).and("checkTime").lte(endDate).and("yn").is(1);
3982 3985  
3983   - PageResult pageResult = findMongoPage(MatdeliverFollowModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "visitDate")), page, limit);
3984   - List <MatdeliverFollowModel> followModels = (List <MatdeliverFollowModel>) pageResult.getGrid();
3985   - if (CollectionUtils.isNotEmpty(followModels))
  3986 + PageResult pageResult = findMongoPage(PostReviewModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "visitDate")), page, limit);
  3987 + List <PostReviewModel> postReviewModels = (List <PostReviewModel>) pageResult.getGrid();
  3988 + if (CollectionUtils.isNotEmpty(postReviewModels))
3986 3989 {
3987   - for (MatdeliverFollowModel followModel : followModels)
  3990 + for (PostReviewModel post : postReviewModels)
3988 3991 {
3989 3992 Map result = new HashMap();
3990   - MaternalDeliverModel maternalDeliverModel = mongoTemplate.findOne(Query.query(Criteria.where("id").is(followModel.getDeliverId())), MaternalDeliverModel.class);
3991 3993  
3992   - if (maternalDeliverModel == null)
3993   - {
3994   - continue;
3995   - }
3996   - Patients model = patientsService.findOnePatientById(maternalDeliverModel.getParentId());
  3994 + Patients model = patientsService.findOnePatientById(post.getParentId());
3997 3995 if (model == null)
3998 3996 {
3999 3997 continue;
4000 3998 }
4001 3999 result.put("username",model.getUsername());
4002   - result.put("age",DateUtil.getAge2(model.getBirth(),followModel.getVisitDate()));
4003   - result.put("chDay",DateUtil.getDays(maternalDeliverModel.getDueDate1(),followModel.getVisitDate()));
4004   - result.put("fsDate",DateUtil.getyyyy_MM_dd(followModel.getVisitDate()));
  4000 + result.put("age",DateUtil.getAge2(model.getBirth(),post.getCheckTime()));
  4001 + result.put("chDay",post.getDay());
  4002 + result.put("fsDate",DateUtil.getyyyy_MM_dd(post.getCheckTime()));
4005 4003 result.put("phone",model.getPhone());
4006 4004 result.put("cardNo",model.getCardNo());
4007 4005 result.put("address", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(),
4008 4006 model.getAreaId(), model.getStreetId(), model.getAddress(),
4009 4007 basicConfigService));
4010   - String fsHospital = organizationService.getOrganization(Integer.parseInt(followModel.getHospitalId())).getName();
  4008 + String fsHospital = organizationService.getOrganization(Integer.parseInt(post.getHospitalId())).getName();
4011 4009 result.put("fsHospital",fsHospital);
4012   - result.put("fsId",followModel.getId());
  4010 + result.put("fsId",post.getId());
4013 4011 results.add(result);
4014 4012 }
4015 4013 }