From 4a8863f122b1a789a694fb47dede285e3abbcac3 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 19 Aug 2021 16:17:09 +0800 Subject: [PATCH] update --- .../biz/service/AntenatalExaminationService.java | 1 + .../resources/mainOrm/master/MasterMysqlAntexc.xml | 28 ++++++++------ .../operate/web/facade/AreaCountFacade.java | 3 +- .../web/facade/BabyStatisticsManagerFacade.java | 10 +++-- .../operate/web/facade/PatientSyncMysqlFacade.java | 6 ++- .../web/facade/PredictedStatisticsFacade.java | 1 + .../operate/web/worker/CheckPointCountWorker.java | 43 ++++++++++------------ .../operate/web/worker/CheckWeeksNumWorker.java | 1 + 8 files changed, 51 insertions(+), 42 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java index ca966bd..fcbc6b9 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java @@ -152,6 +152,7 @@ public class AntenatalExaminationService { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setPid(pid); + patientsQuery.setType(1); List pats = patientsService.queryPatient1(patientsQuery,"created"); Map> temps = new HashMap>(); diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml index 61c0ddb..2692709 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml @@ -2524,12 +2524,7 @@ SELECT count(f.id) as matdeliverHivktCheckzqCount ,o.id as hospitalId from report_matdeliver f INNER JOIN organization o on f.fmHospital = o.id INNER JOIN (select a.sourceId,a.checkTime from report_antexchu a where a.type =1 and a.hivkt is not null - - and a.checkTime >= #{startDate} - - - and a.checkTime #{endDate} - + ) c on c.sourceId= f.sourceId where DATEDIFF(f.lastMenses,c.checkTime) 83 @@ -2544,6 +2539,14 @@ and o.area_id = #{areaId,jdbcType=VARCHAR} + + + and f.dueDate1 >= #{startDate} + + + and f.dueDate1 #{endDate} + + GROUP BY o.id @@ -2552,12 +2555,7 @@ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java index 4bfd838..e1c188e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java @@ -349,8 +349,7 @@ public class AreaCountFacade { hospitalIds.subList(i, end), startTime, endTime, - checkStartTime, - checkEndTime, + pointType, recordService); listFuture.add(commonThreadPool.submit(checkPointCountWorker)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java index 4f359b4..ecafc82 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java @@ -176,10 +176,12 @@ public class BabyStatisticsManagerFacade { return babyStatisticsManagerBuildDoctorListResult; } babyModelQuery.setHospitalId(hospitalId); - List list = new ArrayList(); - list.add("1"); - list.add("2"); - babyModelQuery.setEnableListNot(list); + List buildType = new ArrayList(); + buildType.add(1);//儿童直接建档 + buildType.add(2);//产妇分娩建档 + babyModelQuery.setBuildTypeList(buildType); + babyModelQuery.setDataStatus(true);//排除自动建档数据 + System.out.println(babyModelQuery.convertToQuery().convertToMongoQuery().toString()); List babyModelList = babyService.queryBabyWithQuery(babyModelQuery); List babyStatisticsManagerBuildDoctorListQueryModelList = new ArrayList<>(); if (CollectionUtils.isNotEmpty(babyModelList)) { 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 bd6a330..fa63b00 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 @@ -1303,6 +1303,7 @@ public class PatientSyncMysqlFacade { { patientsQuery.setPage(page); System.out.println("syncPatientsToMysql" + page); + System.out.println("syncPatientsToMysql query "+patientsQuery.convertToQuery().convertToMongoQuery().toString()); List patientses = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isEmpty(patientses)) { @@ -1347,7 +1348,8 @@ public class PatientSyncMysqlFacade { while (true) { antExChuQuery.setPage(page); - System.out.println("syncAntexchuToMysql"+page); + System.out.println("syncAntexchuToMysql" + page); + System.out.println("syncAntexchuToMysql query "+antExChuQuery.convertToQuery().convertToMongoQuery().toString()); List antExChus = antenatalExaminationService.queryAntExChu(antExChuQuery); if (CollectionUtils.isEmpty(antExChus)) { @@ -1487,6 +1489,7 @@ public class PatientSyncMysqlFacade { { antExQuery.setPage(page); System.out.println("syncAntexToMysql" + page); + System.out.println("syncAntexToMysql query "+antExQuery.convertToQuery().convertToMongoQuery().toString()); List antexs = antenatalExaminationService.queryLastAntenx(antExQuery); if (CollectionUtils.isEmpty(antexs)) { @@ -1576,6 +1579,7 @@ public class PatientSyncMysqlFacade { { matDeliverQuery.setPage(page); System.out.println("syncMatdeliverToMysql" + page); + System.out.println("syncMatdeliverToMysql query "+matDeliverQuery.convertToQuery().convertToMongoQuery().toString()); List maternalDeliverModels = matDeliverService.pageQuery(matDeliverQuery); if (CollectionUtils.isEmpty(maternalDeliverModels)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java index cbe63ae..d43ce5a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java @@ -129,6 +129,7 @@ public class PredictedStatisticsFacade { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); List typeList = new ArrayList<>(); + patientsQuery.setDueStatus(0); typeList.add(1); typeList.add(3); patientsQuery.setTypeList(typeList); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckPointCountWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckPointCountWorker.java index e7d0493..eb7f98a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckPointCountWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckPointCountWorker.java @@ -42,8 +42,7 @@ public class CheckPointCountWorker implements Callable { private List hospitalIds; private Date startTime; private Date endTime; - private Date checkStartTime; - private Date checkEndTime; + private Integer pointType; private AntExRecordService recordService; @@ -55,8 +54,7 @@ public class CheckPointCountWorker implements Callable { List hospitalIds, Date startTime, Date endTime, - Date checkStartTime, - Date checkEndTime, + Integer pointType, AntExRecordService recordService ) { @@ -67,8 +65,7 @@ public class CheckPointCountWorker implements Callable { this.hospitalIds = hospitalIds; this.startTime = startTime; this.endTime = endTime; - this.checkStartTime = checkStartTime; - this.checkEndTime = checkEndTime; + this.pointType = pointType; this.recordService = recordService; } @@ -103,23 +100,23 @@ public class CheckPointCountWorker implements Callable { buildCount = patientsService.queryPatientCount(patientsQuery); } - System.out.println("checkPoint buildCount = "+patientsQuery.convertToQuery().convertToMongoQuery()); - AntExChuQuery antExChuQuery1 = new AntExChuQuery(); - antExChuQuery1.setHospitalId(hId); - antExChuQuery1.setCheckTimeStart(checkStartTime); - antExChuQuery1.setCheckTimeEnd(checkEndTime); - antExChuQuery1.setYn(YnEnums.YES.getId()); - System.out.println("checkPoint chuCount = " + antExChuQuery1.convertToQuery().convertToMongoQuery()); - int chuCount = antenatalExaminationService.queryAntExChuCount(antExChuQuery1.convertToQuery()); - - AntExQuery antExQuery = new AntExQuery(); - antExQuery.setStart(checkStartTime); - antExQuery.setEnd(checkEndTime); - antExQuery.setHospitalId(hId); - antExQuery.setYn(YnEnums.YES.getId()); - int exCount = antenatalExaminationService.queryAntenatalExaminationCount(antExQuery.convertToQuery()); - - if (buildCount == 0 && chuCount == 0 && exCount == 0) { +// System.out.println("checkPoint buildCount = "+patientsQuery.convertToQuery().convertToMongoQuery()); +// AntExChuQuery antExChuQuery1 = new AntExChuQuery(); +// antExChuQuery1.setHospitalId(hId); +// antExChuQuery1.setCheckTimeStart(checkStartTime); +// antExChuQuery1.setCheckTimeEnd(checkEndTime); +// antExChuQuery1.setYn(YnEnums.YES.getId()); +// System.out.println("checkPoint chuCount = " + antExChuQuery1.convertToQuery().convertToMongoQuery()); +// int chuCount = antenatalExaminationService.queryAntExChuCount(antExChuQuery1.convertToQuery()); +// +// AntExQuery antExQuery = new AntExQuery(); +// antExQuery.setStart(checkStartTime); +// antExQuery.setEnd(checkEndTime); +// antExQuery.setHospitalId(hId); +// antExQuery.setYn(YnEnums.YES.getId()); +// int exCount = antenatalExaminationService.queryAntenatalExaminationCount(antExQuery.convertToQuery()); + + if (buildCount == 0 ) { continue; } List futures = new ArrayList<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckWeeksNumWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckWeeksNumWorker.java index 28e8ffd..2ec3be0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckWeeksNumWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckWeeksNumWorker.java @@ -57,6 +57,7 @@ public class CheckWeeksNumWorker implements Callable> { { antExRecordQuery.setcDueWeekStart(0); antExRecordQuery.setcDueWeekEnd((12 + 1) * 7 - 1); + System.out.println(antExRecordQuery.convertToQuery().convertToMongoQuery().toString()); int itemnum12 = recordService.count(antExRecordQuery); map.put("itemnum12",itemnum12); } -- 1.8.3.1