From ccce24eb2f8649be2b6e5eef7f552f582b40f07e Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 8 Feb 2023 10:19:53 +0800
Subject: [PATCH] =?UTF-8?q?=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   | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 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 8d0748e..17cdd5d 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
@@ -3317,10 +3317,22 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl {
                                        String streetId)
     {
         OrganizationQuery organizationQuery = new OrganizationQuery();
-        organizationQuery.setProvinceId(provinceId);
-        organizationQuery.setCityId(cityId);
-        organizationQuery.setAreaId(areaId);
-        organizationQuery.setStreetId(streetId);
+        if (StringUtils.isNotEmpty(provinceId))
+        {
+            organizationQuery.setProvinceId(provinceId);
+        }
+        if (StringUtils.isNotEmpty(cityId))
+        {
+            organizationQuery.setCityId(cityId);
+        }
+        if (StringUtils.isNotEmpty(areaId))
+        {
+            organizationQuery.setAreaId(areaId);
+        }
+        if (StringUtils.isNotEmpty(streetId))
+        {
+            organizationQuery.setStreetId(streetId);
+        }
         List<Organization> organizations = organizationService.queryHospitals(organizationQuery);
         List<Map<String,String>> list = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(organizations))
-- 
1.8.3.1