From a8602b444f034d7ded4d8536053576d1b53d35c4 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 30 Nov 2022 17:33:11 +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 | 106 +++++++++++---------- 1 file changed, 58 insertions(+), 48 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 391a78c..3f0ded7 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 @@ -3754,14 +3754,60 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { } - public BaseResponse getBabyFmList(Integer page, Integer limit, String areaId, String streetId, Date dateTime, Integer type) { - List results = new ArrayList<>(); + private List getRegionsStreetIds(String areaId,String streetId) + { //获得区县下的街道 List regions = getRegions(areaId,streetId); List streetIds = new ArrayList<>(); for (BasicConfig region : regions) { - streetIds.add(region.getId()); + if ("2124".equals(region.getId()))//安州街道 + { + streetIds.add(region.getId()); + streetIds.add("2099");//隆化镇 + streetIds.add("624561e66bc1d704182c1599");//苔山镇 + } + else if ("2112".equals(region.getId()))//尹家营满族乡 + { + streetIds.add(region.getId()); + streetIds.add("5f2a11de9d5c99e71b2724ef");//尹家营乡 + } + else if ("2114".equals(region.getId()))//偏坡营满族乡 + { + streetIds.add(region.getId()); + streetIds.add("5f1b912c9d5c7e6a533c937d");//偏坡营乡 + } + else if ("2116".equals(region.getId()))//八达营蒙古族乡 + { + streetIds.add(region.getId()); + streetIds.add("5f18e8ae9d5c7e6a533c6bf4");//八达营乡 + } + else if ("2117".equals(region.getId()))//太平庄满族乡 + { + streetIds.add(region.getId()); + streetIds.add("5f17ff3a9d5c7e6a533c6286");//太平庄乡 + } + else if ("2119".equals(region.getId()))//西阿超满族蒙古族乡 + { + streetIds.add(region.getId()); + streetIds.add("5f041f0d25dc36c779f7d52a");//西阿超乡 + } + else if ("2120".equals(region.getId()))//白虎沟满族蒙古族乡 + { + streetIds.add(region.getId()); + streetIds.add("5f041f3e25dc36c779f7d55c");//白虎沟乡 + } + else + { + streetIds.add(region.getId()); + } } + return streetIds; + } + + public BaseResponse getBabyFmList(Integer page, Integer limit, String areaId, String streetId, Date dateTime, Integer type) { + List results = new ArrayList<>(); + //获得区县下的街道 + List streetIds = getRegionsStreetIds( areaId, streetId); Date startDate=DateUtil.getDateMonthFirst(dateTime); Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); BabyModelQuery babyModelQuery = new BabyModelQuery(); @@ -3829,11 +3875,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { List results = new ArrayList<>(); //获得区县下的街道 - List regions = getRegions(areaId,streetId); - List streetIds = new ArrayList<>(); - for (BasicConfig region : regions) { - streetIds.add(region.getId()); - } + List streetIds = getRegionsStreetIds( areaId, streetId); Date startDate=DateUtil.getDateMonthFirst(dateTime); Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); @@ -3889,11 +3931,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { List results = new ArrayList<>(); //获得区县下的街道 - List regions = getRegions(areaId,streetId); - List streetIds = new ArrayList<>(); - for (BasicConfig region : regions) { - streetIds.add(region.getId()); - } + List streetIds = getRegionsStreetIds( areaId, streetId); Integer startMonth = null; Integer endMonth = null; @@ -4016,11 +4054,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { public BaseResponse getPregnantBuildCountList(Integer page, Integer limit, String areaId, String streetId, Date dateTime, Integer type) { List results = new ArrayList<>(); //获得区县下的街道 - List regions = getRegions(areaId,streetId); - List streetIds = new ArrayList<>(); - for (BasicConfig region : regions) { - streetIds.add(region.getId()); - } + List streetIds = getRegionsStreetIds( areaId, streetId); Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); PatientsQuery patientsQuery=new PatientsQuery(); @@ -4071,11 +4105,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { public BaseResponse getChFsCountList(Integer page, Integer limit, String areaId, String streetId, Date dateTime) { List results = new ArrayList<>(); //获得区县下的街道 - List regions = getRegions(areaId,streetId); - List streetIds = new ArrayList<>(); - for (BasicConfig region : regions) { - streetIds.add(region.getId()); - } + List streetIds = getRegionsStreetIds( areaId, streetId); Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); if (CollectionUtils.isNotEmpty(streetIds)) { @@ -4119,11 +4149,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { public BaseResponse getBabyEyeCheckItems(Integer page, Integer limit, String areaId, String streetId, Date dateTime) { //获得区县下的街道 - List regions = getRegions(areaId,streetId); - List streetIds = new ArrayList<>(); - for (BasicConfig region : regions) { - streetIds.add(region.getId()); - } + List streetIds = getRegionsStreetIds( areaId, streetId); BabyCheckModelQuery checkModelQuery1 = new BabyCheckModelQuery(); if (CollectionUtils.isNotEmpty(streetIds)) { @@ -4182,11 +4208,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { List results = new ArrayList<>(); //获得区县下的街道 - List regions = getRegions(areaId,streetId); - List streetIds = new ArrayList<>(); - for (BasicConfig region : regions) { - streetIds.add(region.getId()); - } + List streetIds = getRegionsStreetIds( areaId, streetId); Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); BabyModelQuery babyQuery = new BabyModelQuery(); @@ -4237,11 +4259,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { List results = new ArrayList<>(); //获得区县下的街道 - List regions = getRegions(areaId,streetId); - List streetIds = new ArrayList<>(); - for (BasicConfig region : regions) { - streetIds.add(region.getId()); - } + List streetIds = getRegionsStreetIds( areaId, streetId); Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); BabyModelQuery babyQuery = new BabyModelQuery(); @@ -4300,11 +4318,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { List results = new ArrayList<>(); //获得区县下的街道 - List regions = getRegions(areaId,streetId); - List streetIds = new ArrayList<>(); - for (BasicConfig region : regions) { - streetIds.add(region.getId()); - } + List streetIds = getRegionsStreetIds( areaId, streetId); Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); PatientsQuery patientsQuery=new PatientsQuery(); @@ -4365,11 +4379,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { Date dateTime) { List results = new ArrayList<>(); //获得区县下的街道 - List regions = getRegions(areaId,streetId); - List streetIds = new ArrayList<>(); - for (BasicConfig region : regions) { - streetIds.add(region.getId()); - } + List streetIds = getRegionsStreetIds( areaId, streetId); Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime)); PatientsQuery patientsQuery=new PatientsQuery(); -- 1.8.3.1