From fa5ea853099e88be253fca4fb2b0c2b7af5f396e Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 09 十一月 2025 15:57:04 +0800
Subject: [PATCH] feat:微信登录

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/HospDataController.java |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/HospDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/HospDataController.java
index cf35021..a83ee32 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/HospDataController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/HospDataController.java
@@ -36,6 +36,11 @@
             @RequestParam(value = "keyword", required = false) String keyword,
             @RequestParam(value = "region", required = false) String region) {
         List<HospData> list = hospDataMapper.searchHospitals(keyword, region);
+        Integer homeHospId=hospDataMapper.getHomeHospId();
+        if(homeHospId>0 && list.stream().count()>0 && list.stream().filter(hospData -> hospData.getHospId().equals(homeHospId)).count()<=0) {
+            HospData hospData=   hospDataMapper.selectHospDataById(homeHospId);
+            list.add(0,hospData);
+        }
         return success(list);
     }
     
@@ -62,12 +67,10 @@
         if (hospIds == null || hospIds.isEmpty()) {
             return success();
         }
-        Integer homeHospId=hospDataMapper.getHomeHospId();
-        if (!hospIds.contains(homeHospId)) {
-            hospIds.add(0,homeHospId);
-        }
+
         // 鏍规嵁ID鍒楄〃鏌ヨ鍖婚櫌璇︽儏
         List<HospData> hospitals = hospDataMapper.selectHospDataByIds(hospIds, region);
+
         return success(hospitals);
     }
     
@@ -86,11 +89,14 @@
             return success();
         }
         Integer homeHospId=hospDataMapper.getHomeHospId();
-        if (!hospIds.contains(homeHospId)) {
-            hospIds.add(0,homeHospId);
-        }
+
         // 鏍规嵁ID鍒楄〃鏌ヨ鍖婚櫌璇︽儏
         List<HospData> hospitals = hospDataMapper.selectHospDataByIds(hospIds, region);
+        if(homeHospId>0) {
+
+         HospData hospData=   hospDataMapper.selectHospDataById(homeHospId);
+         hospitals.add(0,hospData);
+        }
         return success(hospitals);
     }
 }

--
Gitblit v1.9.1