jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a8602b444f034d7ded4d8536053576d1b53d35c4

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

工位统计

Showing 1 changed file with 58 additions and 48 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java View file @ a8602b4
... ... @@ -3754,14 +3754,60 @@
3754 3754  
3755 3755 }
3756 3756  
3757   - public BaseResponse getBabyFmList(Integer page, Integer limit, String areaId, String streetId, Date dateTime, Integer type) {
3758   - List<Map> results = new ArrayList<>();
  3757 + private List<String> getRegionsStreetIds(String areaId,String streetId)
  3758 + {
3759 3759 //获得区县下的街道
3760 3760 List<BasicConfig> regions = getRegions(areaId,streetId);
3761 3761 List<String> streetIds = new ArrayList<>();
3762 3762 for (BasicConfig region : regions) {
3763   - streetIds.add(region.getId());
  3763 + if ("2124".equals(region.getId()))//安州街道
  3764 + {
  3765 + streetIds.add(region.getId());
  3766 + streetIds.add("2099");//隆化镇
  3767 + streetIds.add("624561e66bc1d704182c1599");//苔山镇
  3768 + }
  3769 + else if ("2112".equals(region.getId()))//尹家营满族乡
  3770 + {
  3771 + streetIds.add(region.getId());
  3772 + streetIds.add("5f2a11de9d5c99e71b2724ef");//尹家营乡
  3773 + }
  3774 + else if ("2114".equals(region.getId()))//偏坡营满族乡
  3775 + {
  3776 + streetIds.add(region.getId());
  3777 + streetIds.add("5f1b912c9d5c7e6a533c937d");//偏坡营乡
  3778 + }
  3779 + else if ("2116".equals(region.getId()))//八达营蒙古族乡
  3780 + {
  3781 + streetIds.add(region.getId());
  3782 + streetIds.add("5f18e8ae9d5c7e6a533c6bf4");//八达营乡
  3783 + }
  3784 + else if ("2117".equals(region.getId()))//太平庄满族乡
  3785 + {
  3786 + streetIds.add(region.getId());
  3787 + streetIds.add("5f17ff3a9d5c7e6a533c6286");//太平庄乡
  3788 + }
  3789 + else if ("2119".equals(region.getId()))//西阿超满族蒙古族乡
  3790 + {
  3791 + streetIds.add(region.getId());
  3792 + streetIds.add("5f041f0d25dc36c779f7d52a");//西阿超乡
  3793 + }
  3794 + else if ("2120".equals(region.getId()))//白虎沟满族蒙古族乡
  3795 + {
  3796 + streetIds.add(region.getId());
  3797 + streetIds.add("5f041f3e25dc36c779f7d55c");//白虎沟乡
  3798 + }
  3799 + else
  3800 + {
  3801 + streetIds.add(region.getId());
  3802 + }
3764 3803 }
  3804 + return streetIds;
  3805 + }
  3806 +
  3807 + public BaseResponse getBabyFmList(Integer page, Integer limit, String areaId, String streetId, Date dateTime, Integer type) {
  3808 + List<Map> results = new ArrayList<>();
  3809 + //获得区县下的街道
  3810 + List<String> streetIds = getRegionsStreetIds( areaId, streetId);
3765 3811 Date startDate=DateUtil.getDateMonthFirst(dateTime);
3766 3812 Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime));
3767 3813 BabyModelQuery babyModelQuery = new BabyModelQuery();
... ... @@ -3829,11 +3875,7 @@
3829 3875  
3830 3876 List<Map> results = new ArrayList<>();
3831 3877 //获得区县下的街道
3832   - List<BasicConfig> regions = getRegions(areaId,streetId);
3833   - List<String> streetIds = new ArrayList<>();
3834   - for (BasicConfig region : regions) {
3835   - streetIds.add(region.getId());
3836   - }
  3878 + List<String> streetIds = getRegionsStreetIds( areaId, streetId);
3837 3879 Date startDate=DateUtil.getDateMonthFirst(dateTime);
3838 3880 Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime));
3839 3881  
... ... @@ -3889,11 +3931,7 @@
3889 3931  
3890 3932 List<Map> results = new ArrayList<>();
3891 3933 //获得区县下的街道
3892   - List<BasicConfig> regions = getRegions(areaId,streetId);
3893   - List<String> streetIds = new ArrayList<>();
3894   - for (BasicConfig region : regions) {
3895   - streetIds.add(region.getId());
3896   - }
  3934 + List<String> streetIds = getRegionsStreetIds( areaId, streetId);
3897 3935  
3898 3936 Integer startMonth = null;
3899 3937 Integer endMonth = null;
... ... @@ -4016,11 +4054,7 @@
4016 4054 public BaseResponse getPregnantBuildCountList(Integer page, Integer limit, String areaId, String streetId, Date dateTime, Integer type) {
4017 4055 List<Map> results = new ArrayList<>();
4018 4056 //获得区县下的街道
4019   - List<BasicConfig> regions = getRegions(areaId,streetId);
4020   - List<String> streetIds = new ArrayList<>();
4021   - for (BasicConfig region : regions) {
4022   - streetIds.add(region.getId());
4023   - }
  4057 + List<String> streetIds = getRegionsStreetIds( areaId, streetId);
4024 4058  
4025 4059 Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime));
4026 4060 PatientsQuery patientsQuery=new PatientsQuery();
... ... @@ -4071,11 +4105,7 @@
4071 4105 public BaseResponse getChFsCountList(Integer page, Integer limit, String areaId, String streetId, Date dateTime) {
4072 4106 List<Map> results = new ArrayList<>();
4073 4107 //获得区县下的街道
4074   - List<BasicConfig> regions = getRegions(areaId,streetId);
4075   - List<String> streetIds = new ArrayList<>();
4076   - for (BasicConfig region : regions) {
4077   - streetIds.add(region.getId());
4078   - }
  4108 + List<String> streetIds = getRegionsStreetIds( areaId, streetId);
4079 4109 Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime));
4080 4110 if (CollectionUtils.isNotEmpty(streetIds))
4081 4111 {
... ... @@ -4119,11 +4149,7 @@
4119 4149  
4120 4150 public BaseResponse getBabyEyeCheckItems(Integer page, Integer limit, String areaId, String streetId, Date dateTime) {
4121 4151 //获得区县下的街道
4122   - List<BasicConfig> regions = getRegions(areaId,streetId);
4123   - List<String> streetIds = new ArrayList<>();
4124   - for (BasicConfig region : regions) {
4125   - streetIds.add(region.getId());
4126   - }
  4152 + List<String> streetIds = getRegionsStreetIds( areaId, streetId);
4127 4153 BabyCheckModelQuery checkModelQuery1 = new BabyCheckModelQuery();
4128 4154 if (CollectionUtils.isNotEmpty(streetIds))
4129 4155 {
... ... @@ -4182,11 +4208,7 @@
4182 4208  
4183 4209 List<Map> results = new ArrayList<>();
4184 4210 //获得区县下的街道
4185   - List<BasicConfig> regions = getRegions(areaId,streetId);
4186   - List<String> streetIds = new ArrayList<>();
4187   - for (BasicConfig region : regions) {
4188   - streetIds.add(region.getId());
4189   - }
  4211 + List<String> streetIds = getRegionsStreetIds( areaId, streetId);
4190 4212  
4191 4213 Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime));
4192 4214 BabyModelQuery babyQuery = new BabyModelQuery();
... ... @@ -4237,11 +4259,7 @@
4237 4259  
4238 4260 List<Map> results = new ArrayList<>();
4239 4261 //获得区县下的街道
4240   - List<BasicConfig> regions = getRegions(areaId,streetId);
4241   - List<String> streetIds = new ArrayList<>();
4242   - for (BasicConfig region : regions) {
4243   - streetIds.add(region.getId());
4244   - }
  4262 + List<String> streetIds = getRegionsStreetIds( areaId, streetId);
4245 4263  
4246 4264 Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime));
4247 4265 BabyModelQuery babyQuery = new BabyModelQuery();
... ... @@ -4300,11 +4318,7 @@
4300 4318  
4301 4319 List<Map> results = new ArrayList<>();
4302 4320 //获得区县下的街道
4303   - List<BasicConfig> regions = getRegions(areaId,streetId);
4304   - List<String> streetIds = new ArrayList<>();
4305   - for (BasicConfig region : regions) {
4306   - streetIds.add(region.getId());
4307   - }
  4321 + List<String> streetIds = getRegionsStreetIds( areaId, streetId);
4308 4322  
4309 4323 Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime));
4310 4324 PatientsQuery patientsQuery=new PatientsQuery();
... ... @@ -4365,11 +4379,7 @@
4365 4379 Date dateTime) {
4366 4380 List<Map> results = new ArrayList<>();
4367 4381 //获得区县下的街道
4368   - List<BasicConfig> regions = getRegions(areaId,streetId);
4369   - List<String> streetIds = new ArrayList<>();
4370   - for (BasicConfig region : regions) {
4371   - streetIds.add(region.getId());
4372   - }
  4382 + List<String> streetIds = getRegionsStreetIds( areaId, streetId);
4373 4383  
4374 4384 Date endDate=DateUtil.getDayLastSecond(DateUtil.getDateMonthLast(dateTime));
4375 4385 PatientsQuery patientsQuery=new PatientsQuery();