jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c7e161004429db5752ca2ce6da8b8eb8086ebfc9

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

工位统计

Showing 1 changed file with 61 additions and 22 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java View file @ c7e1610
... ... @@ -3332,7 +3332,7 @@
3332 3332 int lastDate1= null==hospitalDate.get("data1")?0:Integer.parseInt(hospitalDate.get("data1").toString());
3333 3333 hospitalDate.put("data1",data1+lastDate1);
3334 3334 //累计活产数
3335   - babyModelQuery.setBirthStart(null);
  3335 + babyModelQuery.setBirthStart(startDateFirst);
3336 3336 int data2 = (int)mongoTemplate.count(babyModelQuery.convertToQuery().convertToMongoQuery(),BabyModel.class);
3337 3337  
3338 3338 int lastDate2= null==hospitalDate.get("data2")?0:Integer.parseInt(hospitalDate.get("data2").toString());
... ... @@ -3353,7 +3353,7 @@
3353 3353 int data3 = (int)mongoTemplate.count(new Query(Criteria.
3354 3354 where("yn").is("1")
3355 3355 .and("streetId").in(streetIds)
3356   - .and("checkTime").lte(endDate)),NewbornVisit.class);
  3356 + .and("checkTime").lte(endDate).gte(startDateFirst)),NewbornVisit.class);
3357 3357 int lastDate3= null==hospitalDate.get("data3")?0:Integer.parseInt(hospitalDate.get("data3").toString());
3358 3358 hospitalDate.put("data3",data3+lastDate3);
3359 3359  
... ... @@ -3380,6 +3380,7 @@
3380 3380 Date end1 = DateUtil.addDay(DateUtil.addMonth(currentDate1, -36 - 1), 1);
3381 3381 babyQuery.setBirthStart(end1);
3382 3382 babyQuery.setBuildDateEnd(endDate);
  3383 + babyQuery.setBuildDateStart(startDateFirst);
3383 3384 System.out.println("===4"+babyQuery.convertToQuery().convertToMongoQuery().toString());
3384 3385 int data5 = babyBookbuildingService.queryBabyCount(babyQuery);
3385 3386 int lastDate5= null==hospitalDate.get("data5")?0:Integer.parseInt(hospitalDate.get("data5").toString());
... ... @@ -3458,7 +3459,8 @@
3458 3459 checkModelQuery.setBirthStart(end1);
3459 3460 checkModelQuery.setBirthEnd(start1);
3460 3461 checkModelQuery.setLhdsl(true);
3461   - checkModelQuery.setCheckDateStart(DateUtil.addYear(new Date(),-20));
  3462 + //checkModelQuery.setCheckDateStart(DateUtil.addYear(new Date(),-20));
  3463 + checkModelQuery.setCheckDateStart(startDateFirst);
3462 3464 checkModelQuery.setCheckDateEnd(endDate);
3463 3465 System.out.println("===9"+checkModelQuery.convertToQuery().convertToMongoQuery().toString());
3464 3466 int data13 =babyCheckService.queryBabyCheckCount(checkModelQuery);
... ... @@ -3486,7 +3488,8 @@
3486 3488 patientsQuery.setIsAutoFm(YnEnums.NO.getId());
3487 3489 patientsQuery.setExtEnable(false);
3488 3490 patientsQuery.setBuildTypeNot(1);
3489   - patientsQuery.setBookbuildingDateStart(DateUtil.addYear(new Date(),-20));
  3491 + //patientsQuery.setBookbuildingDateStart(DateUtil.addYear(new Date(),-20));
  3492 + patientsQuery.setBookbuildingDateStart(startDateFirst);
3490 3493 patientsQuery.setBookbuildingDateEnd(endDate);
3491 3494 patientsQuery.setType(3); //产妇
3492 3495 System.out.println("===10"+patientsQuery.convertToQuery().convertToMongoQuery().toString());
... ... @@ -3518,7 +3521,8 @@
3518 3521 patientsQuery2.setExtEnable(false);
3519 3522 patientsQuery2.setBuildTypeNot(1);
3520 3523 patientsQuery2.setIsAutoFm(YnEnums.NO.getId());
3521   - patientsQuery2.setBookbuildingDateStart(DateUtil.addYear(new Date(),-20));
  3524 + //patientsQuery2.setBookbuildingDateStart(DateUtil.addYear(new Date(),-20));
  3525 + patientsQuery2.setBookbuildingDateStart(startDateFirst);
3522 3526 patientsQuery2.setBookbuildingDateEnd(endDate);
3523 3527 patientsQuery2.setYn(YnEnums.YES.getId());
3524 3528 patientsQuery2.setExistLastCheckEmployeeId(true);
3525 3529  
... ... @@ -3542,9 +3546,9 @@
3542 3546  
3543 3547 //产后访视人数
3544 3548 int data19= (int)mongoTemplate.count(new Query(Criteria.
3545   - where("streetId").in(streetIds).and("checkTime").lte(endDate).and("yn").is(1)),PostReviewModel.class);
  3549 + where("streetId").in(streetIds).and("checkTime").lte(endDate).gte(startDateFirst).and("yn").is(1)),PostReviewModel.class);
3546 3550 System.out.println("===12"+new Query(Criteria.
3547   - where("streetId").in(streetIds).and("checkTime").lte(endDate).and("yn").is(1)).toString());
  3551 + where("streetId").in(streetIds).and("checkTime").lte(endDate).gt(startDateFirst).and("yn").is(1)).toString());
3548 3552 int lastDate19= null==hospitalDate.get("data19")?0:Integer.parseInt(hospitalDate.get("data19").toString());
3549 3553 hospitalDate.put("data19",data19+lastDate19);
3550 3554 //产后访视率%
... ... @@ -3562,6 +3566,8 @@
3562 3566 PatientsQuery patientsQuery1 = new PatientsQuery();
3563 3567 patientsQuery1.setStreetRegisterIds(streetIds);
3564 3568 patientsQuery1.setIsComplete(2);
  3569 + patientsQuery1.setBookbuildingDateStart(startDateFirst);
  3570 + patientsQuery1.setBookbuildingDateEnd(endDate);
3565 3571 System.out.println("===13"+patientsQuery1.convertToQuery().convertToMongoQuery().toString());
3566 3572 int data21 = patientsService.queryPatientCount(patientsQuery1);
3567 3573 int lastDate21= null==hospitalDate.get("data21")?0:Integer.parseInt(hospitalDate.get("data21").toString());
... ... @@ -3587,7 +3593,8 @@
3587 3593 checkModelQuery1.setBirthStart(end1);
3588 3594 checkModelQuery1.setBirthEnd(start1);
3589 3595 checkModelQuery1.setArticleTypes(Arrays.asList(1,2,3,4,5));
3590   - checkModelQuery1.setCheckDateStart(DateUtil.addYear(new Date(),-20));
  3596 + checkModelQuery1.setCheckDateStart(startDateFirst);
  3597 + //checkModelQuery1.setCheckDateStart(DateUtil.addYear(new Date(),-20));
3591 3598 checkModelQuery1.setCheckDateEnd(endDate);
3592 3599 System.out.println("===14"+checkModelQuery1.convertToQuery().convertToMongoQuery().toString());
3593 3600 int data23 =babyCheckService.queryBabyCheckCount(checkModelQuery1);
... ... @@ -3713,7 +3720,10 @@
3713 3720 }
3714 3721 else
3715 3722 {
3716   - checkModelQuery1.setCheckDateStart(DateUtil.addYear(new Date(),-20));
  3723 + //传入的时间获取年的第一天
  3724 + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime));
  3725 + checkModelQuery1.setCheckDateStart(startDateFirst);
  3726 + // checkModelQuery1.setCheckDateStart(DateUtil.addYear(new Date(),-20));
3717 3727 checkModelQuery1.setCheckDateEnd(endDate);
3718 3728 }
3719 3729  
... ... @@ -3830,7 +3840,11 @@
3830 3840 babyModelQuery.setBirthEnd(endDate);
3831 3841 }
3832 3842 else
3833   - { //累计活产数
  3843 + {
  3844 + //传入的时间获取年的第一天
  3845 + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime));
  3846 + babyModelQuery.setBirthStart(startDateFirst);
  3847 + //累计活产数
3834 3848 babyModelQuery.setBirthEnd(endDate);
3835 3849 }
3836 3850 List<BabyModel> datas = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
... ... @@ -3891,8 +3905,11 @@
3891 3905 criteria.and("checkTime").gte(startDate).lte(endDate);
3892 3906 }
3893 3907 else
3894   - { //累计访视人数
3895   - criteria.and("checkTime").lte(endDate);
  3908 + {
  3909 + //传入的时间获取年的第一天
  3910 + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime));
  3911 + //累计访视人数
  3912 + criteria.and("checkTime").lte(endDate).gte(startDateFirst);
3896 3913 }
3897 3914 PageResult pageResult = findMongoPage(NewbornVisit.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit);
3898 3915 List <NewbornVisit> visits = (List <NewbornVisit>) pageResult.getGrid();
... ... @@ -3983,7 +4000,10 @@
3983 4000 babyQuery.setBirthEnd(start1);
3984 4001  
3985 4002 babyQuery.setBuildDateEnd(endDate);
3986   - babyQuery.setBuildDateStart(DateUtil.addYear(currentDate1,-20));
  4003 + //传入的时间获取年的第一天
  4004 + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime));
  4005 + babyQuery.setBuildDateStart(startDateFirst);
  4006 + //babyQuery.setBuildDateStart(DateUtil.addYear(currentDate1,-20));
3987 4007  
3988 4008 babyQuery.setPage(page);
3989 4009 babyQuery.setLimit(limit);
... ... @@ -4070,7 +4090,10 @@
4070 4090 patientsQuery.setIsAutoFm(YnEnums.NO.getId());
4071 4091 patientsQuery.setExtEnable(false);
4072 4092 patientsQuery.setBuildTypeNot(1);
4073   - patientsQuery.setBookbuildingDateStart(DateUtil.addYear(new Date(),-20));
  4093 + //patientsQuery.setBookbuildingDateStart(DateUtil.addYear(new Date(),-20));
  4094 + //传入的时间获取年的第一天
  4095 + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime));
  4096 + patientsQuery.setBookbuildingDateStart(startDateFirst);
4074 4097 patientsQuery.setBookbuildingDateEnd(endDate);
4075 4098 patientsQuery.setType(3); //产妇
4076 4099 patientsQuery.setPage(page);
4077 4100  
... ... @@ -4111,8 +4134,10 @@
4111 4134 Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime));
4112 4135 if (CollectionUtils.isNotEmpty(streetIds))
4113 4136 {
  4137 + //传入的时间获取年的第一天
  4138 + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime));
4114 4139 Criteria criteria = Criteria.
4115   - where("streetId").in(streetIds).and("checkTime").lte(endDate).and("yn").is(1);
  4140 + where("streetId").in(streetIds).and("checkTime").lte(endDate).gte(startDateFirst).and("yn").is(1);
4116 4141  
4117 4142 PageResult pageResult = findMongoPage(PostReviewModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "visitDate")), page, limit);
4118 4143 List <PostReviewModel> postReviewModels = (List <PostReviewModel>) pageResult.getGrid();
4119 4144  
... ... @@ -4160,14 +4185,17 @@
4160 4185 Date currentDate1 = DateUtil.formatDate(new Date());
4161 4186 Date start1 = DateUtil.addMonth(currentDate1, 0);
4162 4187 checkModelQuery1.setBirthEnd(start1);
4163   - Date end1 = DateUtil.addDay(DateUtil.addMonth(currentDate1, -36 - 1), 1);
  4188 + Date end1 = DateUtil.addDay(DateUtil.addMonth(currentDate1, -72 - 1), 1);
4164 4189  
4165 4190 checkModelQuery1.setStreetIds(streetIds);
4166 4191 checkModelQuery1.setYn(YnEnums.YES.getId());
4167 4192 checkModelQuery1.setBirthStart(end1);
4168 4193 checkModelQuery1.setBirthEnd(start1);
4169 4194 checkModelQuery1.setLhdsl(true);
4170   - checkModelQuery1.setCheckDateStart(DateUtil.addYear(new Date(),-20));
  4195 + //传入的时间获取年的第一天
  4196 + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime));
  4197 + checkModelQuery1.setCheckDateStart(startDateFirst);
  4198 + //checkModelQuery1.setCheckDateStart(DateUtil.addYear(new Date(),-20));
4171 4199 checkModelQuery1.setCheckDateEnd(endDate);
4172 4200 checkModelQuery1.setPage(page);
4173 4201 checkModelQuery1.setLimit(limit);
4174 4202  
4175 4203  
4176 4204  
... ... @@ -4217,19 +4245,23 @@
4217 4245 if (CollectionUtils.isNotEmpty(streetIds))
4218 4246 {
4219 4247  
4220   - babyQuery.setDataStatus(true);//排除自动建档数据
  4248 + babyQuery.setExistSource(false);
4221 4249 babyQuery.setYn(YnEnums.YES.getId());
4222 4250 babyQuery.setStreetIds(streetIds);
  4251 +
4223 4252 Date currentDate1 = DateUtil.formatDate(new Date());
4224 4253 Date start1 = DateUtil.addMonth(currentDate1, 0);
4225 4254 babyQuery.setBirthEnd(start1);
  4255 + Date end1 = DateUtil.addDay(DateUtil.addMonth(currentDate1, -72 - 1), 1);
  4256 + babyQuery.setBirthStart(end1);
  4257 +
  4258 + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime));
  4259 + babyQuery.setBuildDateStart(startDateFirst);
4226 4260 babyQuery.setBuildDateEnd(endDate);
4227 4261 babyQuery.setPage(page);
4228 4262 babyQuery.setLimit(limit);
4229 4263 babyQuery.setNeed("Need");
4230   - babyQuery.setOrder("birth");
4231   - Date end1 = DateUtil.addDay(DateUtil.addMonth(currentDate1, -72 - 1), 1);
4232   - babyQuery.setBirthStart(end1);
  4264 + babyQuery.setOrder("created");
4233 4265 babyQuery.setLastCheckDoctor2(true);
4234 4266 List<BabyModel> datas = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
4235 4267 if (CollectionUtils.isNotEmpty(datas))
... ... @@ -4274,6 +4306,8 @@
4274 4306 Date currentDate1 = DateUtil.formatDate(new Date());
4275 4307 Date start1 = DateUtil.addMonth(currentDate1, 0);
4276 4308 babyQuery.setBirthEnd(start1);
  4309 + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime));
  4310 + babyQuery.setBuildDateStart(startDateFirst);
4277 4311 babyQuery.setBuildDateEnd(endDate);
4278 4312 babyQuery.setCompleteCheck(2);
4279 4313 babyQuery.setPage(page);
... ... @@ -4333,7 +4367,9 @@
4333 4367 patientsQuery.setExtEnable(false);
4334 4368 patientsQuery.setBuildTypeNot(1);
4335 4369 patientsQuery.setIsAutoFm(YnEnums.NO.getId());
4336   - patientsQuery.setBookbuildingDateStart(DateUtil.addYear(new Date(),-20));
  4370 + //patientsQuery.setBookbuildingDateStart(DateUtil.addYear(new Date(),-20));
  4371 + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime));
  4372 + patientsQuery.setBookbuildingDateStart(startDateFirst);
4337 4373 patientsQuery.setBookbuildingDateEnd(endDate);
4338 4374 patientsQuery.setYn(YnEnums.YES.getId());
4339 4375 patientsQuery.setExistLastCheckEmployeeId(true);
... ... @@ -4390,6 +4426,9 @@
4390 4426 if (CollectionUtils.isNotEmpty(streetIds))
4391 4427 {
4392 4428 patientsQuery.setStreetRegisterIds(streetIds);
  4429 + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime));
  4430 + patientsQuery.setBookbuildingDateStart(startDateFirst);
  4431 + patientsQuery.setBookbuildingDateEnd(endDate);
4393 4432 patientsQuery.setIsComplete(2);
4394 4433 patientsQuery.setPage(page);
4395 4434 patientsQuery.setLimit(limit);