From c7e161004429db5752ca2ce6da8b8eb8086ebfc9 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 1 Dec 2022 14:33:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/PatientSyncMysqlFacade.java | 83 ++++++++++++++++------ 1 file changed, 61 insertions(+), 22 deletions(-) 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 9ac2aae..75cccbb 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 @@ -3332,7 +3332,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { int lastDate1= null==hospitalDate.get("data1")?0:Integer.parseInt(hospitalDate.get("data1").toString()); hospitalDate.put("data1",data1+lastDate1); //累计活产数 - babyModelQuery.setBirthStart(null); + babyModelQuery.setBirthStart(startDateFirst); int data2 = (int)mongoTemplate.count(babyModelQuery.convertToQuery().convertToMongoQuery(),BabyModel.class); int lastDate2= null==hospitalDate.get("data2")?0:Integer.parseInt(hospitalDate.get("data2").toString()); @@ -3353,7 +3353,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { int data3 = (int)mongoTemplate.count(new Query(Criteria. where("yn").is("1") .and("streetId").in(streetIds) - .and("checkTime").lte(endDate)),NewbornVisit.class); + .and("checkTime").lte(endDate).gte(startDateFirst)),NewbornVisit.class); int lastDate3= null==hospitalDate.get("data3")?0:Integer.parseInt(hospitalDate.get("data3").toString()); hospitalDate.put("data3",data3+lastDate3); @@ -3380,6 +3380,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { Date end1 = DateUtil.addDay(DateUtil.addMonth(currentDate1, -36 - 1), 1); babyQuery.setBirthStart(end1); babyQuery.setBuildDateEnd(endDate); + babyQuery.setBuildDateStart(startDateFirst); System.out.println("===4"+babyQuery.convertToQuery().convertToMongoQuery().toString()); int data5 = babyBookbuildingService.queryBabyCount(babyQuery); int lastDate5= null==hospitalDate.get("data5")?0:Integer.parseInt(hospitalDate.get("data5").toString()); @@ -3458,7 +3459,8 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { checkModelQuery.setBirthStart(end1); checkModelQuery.setBirthEnd(start1); checkModelQuery.setLhdsl(true); - checkModelQuery.setCheckDateStart(DateUtil.addYear(new Date(),-20)); + //checkModelQuery.setCheckDateStart(DateUtil.addYear(new Date(),-20)); + checkModelQuery.setCheckDateStart(startDateFirst); checkModelQuery.setCheckDateEnd(endDate); System.out.println("===9"+checkModelQuery.convertToQuery().convertToMongoQuery().toString()); int data13 =babyCheckService.queryBabyCheckCount(checkModelQuery); @@ -3486,7 +3488,8 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { patientsQuery.setIsAutoFm(YnEnums.NO.getId()); patientsQuery.setExtEnable(false); patientsQuery.setBuildTypeNot(1); - patientsQuery.setBookbuildingDateStart(DateUtil.addYear(new Date(),-20)); + //patientsQuery.setBookbuildingDateStart(DateUtil.addYear(new Date(),-20)); + patientsQuery.setBookbuildingDateStart(startDateFirst); patientsQuery.setBookbuildingDateEnd(endDate); patientsQuery.setType(3); //产妇 System.out.println("===10"+patientsQuery.convertToQuery().convertToMongoQuery().toString()); @@ -3518,7 +3521,8 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { patientsQuery2.setExtEnable(false); patientsQuery2.setBuildTypeNot(1); patientsQuery2.setIsAutoFm(YnEnums.NO.getId()); - patientsQuery2.setBookbuildingDateStart(DateUtil.addYear(new Date(),-20)); + //patientsQuery2.setBookbuildingDateStart(DateUtil.addYear(new Date(),-20)); + patientsQuery2.setBookbuildingDateStart(startDateFirst); patientsQuery2.setBookbuildingDateEnd(endDate); patientsQuery2.setYn(YnEnums.YES.getId()); patientsQuery2.setExistLastCheckEmployeeId(true); @@ -3542,9 +3546,9 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { //产后访视人数 int data19= (int)mongoTemplate.count(new Query(Criteria. - where("streetId").in(streetIds).and("checkTime").lte(endDate).and("yn").is(1)),PostReviewModel.class); + where("streetId").in(streetIds).and("checkTime").lte(endDate).gte(startDateFirst).and("yn").is(1)),PostReviewModel.class); System.out.println("===12"+new Query(Criteria. - where("streetId").in(streetIds).and("checkTime").lte(endDate).and("yn").is(1)).toString()); + where("streetId").in(streetIds).and("checkTime").lte(endDate).gt(startDateFirst).and("yn").is(1)).toString()); int lastDate19= null==hospitalDate.get("data19")?0:Integer.parseInt(hospitalDate.get("data19").toString()); hospitalDate.put("data19",data19+lastDate19); //产后访视率% @@ -3562,6 +3566,8 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { PatientsQuery patientsQuery1 = new PatientsQuery(); patientsQuery1.setStreetRegisterIds(streetIds); patientsQuery1.setIsComplete(2); + patientsQuery1.setBookbuildingDateStart(startDateFirst); + patientsQuery1.setBookbuildingDateEnd(endDate); System.out.println("===13"+patientsQuery1.convertToQuery().convertToMongoQuery().toString()); int data21 = patientsService.queryPatientCount(patientsQuery1); int lastDate21= null==hospitalDate.get("data21")?0:Integer.parseInt(hospitalDate.get("data21").toString()); @@ -3587,7 +3593,8 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { checkModelQuery1.setBirthStart(end1); checkModelQuery1.setBirthEnd(start1); checkModelQuery1.setArticleTypes(Arrays.asList(1,2,3,4,5)); - checkModelQuery1.setCheckDateStart(DateUtil.addYear(new Date(),-20)); + checkModelQuery1.setCheckDateStart(startDateFirst); + //checkModelQuery1.setCheckDateStart(DateUtil.addYear(new Date(),-20)); checkModelQuery1.setCheckDateEnd(endDate); System.out.println("===14"+checkModelQuery1.convertToQuery().convertToMongoQuery().toString()); int data23 =babyCheckService.queryBabyCheckCount(checkModelQuery1); @@ -3713,7 +3720,10 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { } else { - checkModelQuery1.setCheckDateStart(DateUtil.addYear(new Date(),-20)); + //传入的时间获取年的第一天 + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime)); + checkModelQuery1.setCheckDateStart(startDateFirst); + // checkModelQuery1.setCheckDateStart(DateUtil.addYear(new Date(),-20)); checkModelQuery1.setCheckDateEnd(endDate); } @@ -3830,7 +3840,11 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { babyModelQuery.setBirthEnd(endDate); } else - { //累计活产数 + { + //传入的时间获取年的第一天 + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime)); + babyModelQuery.setBirthStart(startDateFirst); + //累计活产数 babyModelQuery.setBirthEnd(endDate); } List datas = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); @@ -3891,8 +3905,11 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { criteria.and("checkTime").gte(startDate).lte(endDate); } else - { //累计访视人数 - criteria.and("checkTime").lte(endDate); + { + //传入的时间获取年的第一天 + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime)); + //累计访视人数 + criteria.and("checkTime").lte(endDate).gte(startDateFirst); } PageResult pageResult = findMongoPage(NewbornVisit.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit); List visits = (List ) pageResult.getGrid(); @@ -3983,7 +4000,10 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { babyQuery.setBirthEnd(start1); babyQuery.setBuildDateEnd(endDate); - babyQuery.setBuildDateStart(DateUtil.addYear(currentDate1,-20)); + //传入的时间获取年的第一天 + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime)); + babyQuery.setBuildDateStart(startDateFirst); + //babyQuery.setBuildDateStart(DateUtil.addYear(currentDate1,-20)); babyQuery.setPage(page); babyQuery.setLimit(limit); @@ -4070,7 +4090,10 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { patientsQuery.setIsAutoFm(YnEnums.NO.getId()); patientsQuery.setExtEnable(false); patientsQuery.setBuildTypeNot(1); - patientsQuery.setBookbuildingDateStart(DateUtil.addYear(new Date(),-20)); + //patientsQuery.setBookbuildingDateStart(DateUtil.addYear(new Date(),-20)); + //传入的时间获取年的第一天 + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime)); + patientsQuery.setBookbuildingDateStart(startDateFirst); patientsQuery.setBookbuildingDateEnd(endDate); patientsQuery.setType(3); //产妇 patientsQuery.setPage(page); @@ -4111,8 +4134,10 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); if (CollectionUtils.isNotEmpty(streetIds)) { + //传入的时间获取年的第一天 + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime)); Criteria criteria = Criteria. - where("streetId").in(streetIds).and("checkTime").lte(endDate).and("yn").is(1); + where("streetId").in(streetIds).and("checkTime").lte(endDate).gte(startDateFirst).and("yn").is(1); PageResult pageResult = findMongoPage(PostReviewModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "visitDate")), page, limit); List postReviewModels = (List ) pageResult.getGrid(); @@ -4160,14 +4185,17 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { 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); + Date end1 = DateUtil.addDay(DateUtil.addMonth(currentDate1, -72 - 1), 1); checkModelQuery1.setStreetIds(streetIds); checkModelQuery1.setYn(YnEnums.YES.getId()); checkModelQuery1.setBirthStart(end1); checkModelQuery1.setBirthEnd(start1); checkModelQuery1.setLhdsl(true); - checkModelQuery1.setCheckDateStart(DateUtil.addYear(new Date(),-20)); + //传入的时间获取年的第一天 + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime)); + checkModelQuery1.setCheckDateStart(startDateFirst); + //checkModelQuery1.setCheckDateStart(DateUtil.addYear(new Date(),-20)); checkModelQuery1.setCheckDateEnd(endDate); checkModelQuery1.setPage(page); checkModelQuery1.setLimit(limit); @@ -4217,19 +4245,23 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { if (CollectionUtils.isNotEmpty(streetIds)) { - babyQuery.setDataStatus(true);//排除自动建档数据 + babyQuery.setExistSource(false); babyQuery.setYn(YnEnums.YES.getId()); babyQuery.setStreetIds(streetIds); + Date currentDate1 = DateUtil.formatDate(new Date()); Date start1 = DateUtil.addMonth(currentDate1, 0); babyQuery.setBirthEnd(start1); + Date end1 = DateUtil.addDay(DateUtil.addMonth(currentDate1, -72 - 1), 1); + babyQuery.setBirthStart(end1); + + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime)); + babyQuery.setBuildDateStart(startDateFirst); babyQuery.setBuildDateEnd(endDate); babyQuery.setPage(page); babyQuery.setLimit(limit); babyQuery.setNeed("Need"); - babyQuery.setOrder("birth"); - Date end1 = DateUtil.addDay(DateUtil.addMonth(currentDate1, -72 - 1), 1); - babyQuery.setBirthStart(end1); + babyQuery.setOrder("created"); babyQuery.setLastCheckDoctor2(true); List datas = babyBookbuildingService.queryBabyBuildByCond(babyQuery); if (CollectionUtils.isNotEmpty(datas)) @@ -4274,6 +4306,8 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { Date currentDate1 = DateUtil.formatDate(new Date()); Date start1 = DateUtil.addMonth(currentDate1, 0); babyQuery.setBirthEnd(start1); + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime)); + babyQuery.setBuildDateStart(startDateFirst); babyQuery.setBuildDateEnd(endDate); babyQuery.setCompleteCheck(2); babyQuery.setPage(page); @@ -4333,7 +4367,9 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { patientsQuery.setExtEnable(false); patientsQuery.setBuildTypeNot(1); patientsQuery.setIsAutoFm(YnEnums.NO.getId()); - patientsQuery.setBookbuildingDateStart(DateUtil.addYear(new Date(),-20)); + //patientsQuery.setBookbuildingDateStart(DateUtil.addYear(new Date(),-20)); + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime)); + patientsQuery.setBookbuildingDateStart(startDateFirst); patientsQuery.setBookbuildingDateEnd(endDate); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setExistLastCheckEmployeeId(true); @@ -4390,6 +4426,9 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { if (CollectionUtils.isNotEmpty(streetIds)) { patientsQuery.setStreetRegisterIds(streetIds); + Date startDateFirst = DateUtil.getYearFirst(DateUtil.getYear(dateTime)); + patientsQuery.setBookbuildingDateStart(startDateFirst); + patientsQuery.setBookbuildingDateEnd(endDate); patientsQuery.setIsComplete(2); patientsQuery.setPage(page); patientsQuery.setLimit(limit); -- 1.8.3.1