From edf376435116bd210c03e350ef9c2f7b65eb1cc9 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 15 Apr 2020 11:07:09 +0800 Subject: [PATCH] update --- .../platform/biz/service/BasicConfigService.java | 22 +++++++++++++++++++++- .../lyms/platform/common/utils/AddressUtil.java | 2 +- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java index 14ea746..d9c8e5f 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java @@ -185,8 +185,28 @@ public class BasicConfigService implements InitializingBean { } } + else + { + regionsQuery = new BasicConfigQuery(); + regionsQuery.setTypeId(SystemConfig.CHINA_TYPE_ID); + regionsQuery.setParentId(provinceList.get(0).getId()); + regionsQuery.setOrName(items.get(1)); + List cityList1 = queryBasicConfig(regionsQuery); + if (CollectionUtils.isNotEmpty(cityList1)) + { + map.put("cityId", cityList1.get(0).getId()); + regionsQuery = new BasicConfigQuery(); + regionsQuery.setOrName(items.get(2)); + regionsQuery.setTypeId(SystemConfig.CHINA_TYPE_ID); + regionsQuery.setParentId(cityList1.get(0).getId()); + + List areas = queryBasicConfig(regionsQuery); + if (CollectionUtils.isNotEmpty(areas)) { + map.put("areaId", areas.get(0).getId()); + } + } + } } - } map.put("address", items.get(items.size() - 1)); } else if (items != null && items.size() == 5) { diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/AddressUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/AddressUtil.java index 21b1cd2..5e3923e 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/AddressUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/AddressUtil.java @@ -47,7 +47,7 @@ public class AddressUtil { } public static void main(String[] ages) { - List addrs = AddressUtil.getAddress("山东省荣成市曙光东区26号207"); + List addrs = AddressUtil.getAddress("山东省威海市荣成市曙光东区26号207"); for (String ad : addrs) { System.out.println(ad); } -- 1.8.3.1