From af162ff06af6001ebde7fa97acc6f993592565c5 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期六, 31 一月 2026 11:15:15 +0800
Subject: [PATCH] 【市一】市一同步逻辑调整,增加hospinfo和deptinfo记录

---
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
index 98d6bbe..65d4434 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
@@ -472,6 +472,16 @@
             List<String> userDepts = sysUserDept.stream().map(SysUserDept::getDeptCode).distinct().collect(Collectors.toList());
             List<String> userDeptBfs = sysUserDeptBf.stream().map(SysUserDept::getDeptCode).distinct().collect(Collectors.toList());
 
+            //鍜宷ueryHospUserInfoList閲囬泦鐨勬暟鎹牸寮忎繚鎸佷竴鑷�
+            List<List<String>> userDeptsList = new ArrayList<>();
+            if(!userDepts.isEmpty()){
+                userDeptsList.add(userDepts);
+            }
+            List<List<String>> userDeptBfsList = new ArrayList<>();
+            if(!userDeptBfs.isEmpty()){
+                userDeptBfsList.add(userDeptBfs);
+            }
+
             if (usersTemp.size() > 0) {
                 sysUser1.setUserId(usersTemp.get(0).getUserId());
                 sysUser1.setUserName(sysUser1.getHisUserId());
@@ -482,23 +492,17 @@
                 }
                 //灏嗛儴闂ㄦ垜鐥呭尯鏀惧埌鎸囧畾瀛楁涓�
                 Gson gson = new Gson();
-                if(!userDepts.isEmpty()){
-                    sysUser1.setDeptInfo(gson.toJson(userDepts));
-                }
-                if(!userDeptBfs.isEmpty()){
-                    sysUser1.setHospInfo(gson.toJson(userDeptBfs));
-                }
+                sysUser1.setDeptInfo(gson.toJson(userDeptsList));
+                sysUser1.setHospInfo(gson.toJson(userDeptBfsList));
+
                 sysUser2Mapper.updateUser(sysUser1);
             } else {
                 sysUser1.setUserName(sysUser1.getHisUserId());
                 //灏嗛儴闂ㄦ垜鐥呭尯鏀惧埌鎸囧畾瀛楁涓�
                 Gson gson = new Gson();
-                if(!userDepts.isEmpty()){
-                    sysUser1.setDeptInfo(gson.toJson(userDepts));
-                }
-                if(!userDeptBfs.isEmpty()){
-                    sysUser1.setHospInfo(gson.toJson(userDeptBfs));
-                }
+                sysUser1.setDeptInfo(gson.toJson(userDeptsList));
+                sysUser1.setHospInfo(gson.toJson(userDeptBfsList));
+
                 sysUser2Mapper.insertUser(sysUser1);
                 //瀵瑰簲 SysUserServiceImpl selectUserByUserName2 191琛�
                 if (!org.springframework.util.CollectionUtils.isEmpty(sysUserOrg)) {

--
Gitblit v1.9.3