From 282c7d0de97243458309735fef6dd61a2b606844 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 02 二月 2026 11:39:04 +0800
Subject: [PATCH] 【市一】hospinfo和deptinfo记录 调整
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 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..3901ff4 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
@@ -463,14 +463,38 @@
List<SysUser> usersTemp = sysUser2Mapper.selectUserList(suTemp);
//鏂板鐢ㄦ埛涓庣瀹�
- List<SysUserDept> sysUserDept = sysUserDeptAll.stream().filter((SysUserDept b) -> b.getUserCode().equals(sysUser1.getHisUserId())).collect(Collectors.toList());
+ List<SysUserDept> sysUserDept = sysUserDeptAll.stream().filter((SysUserDept b) ->
+ b.getUserCode().equals(sysUser1.getHisUserId())).collect(Collectors.toList());
//鏂板鐢ㄦ埛涓庣梾鍖�
- List<SysUserDept> sysUserDeptBf = sysUserDeptBfAll.stream().filter((SysUserDept b) -> b.getUserCode().equals(sysUser1.getHisUserId())).collect(Collectors.toList());
+ List<SysUserDept> sysUserDeptBf = sysUserDeptBfAll.stream().filter((SysUserDept b) ->
+ b.getUserCode().equals(sysUser1.getHisUserId())).collect(Collectors.toList());
//鏂板鐢ㄦ埛涓庨櫌鍖�
- List<SysUserOrg> sysUserOrg = sysUserOrgAll.stream().filter((SysUserOrg o) -> o.getUserId().equals(sysUser1.getHisUserId())).collect(Collectors.toList());
+ List<SysUserOrg> sysUserOrg = sysUserOrgAll.stream().filter((SysUserOrg o) ->
+ o.getUserId().equals(sysUser1.getHisUserId())).collect(Collectors.toList());
- List<String> userDepts = sysUserDept.stream().map(SysUserDept::getDeptCode).distinct().collect(Collectors.toList());
- List<String> userDeptBfs = sysUserDeptBf.stream().map(SysUserDept::getDeptCode).distinct().collect(Collectors.toList());
+ 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()){
+ for(String userDept: userDepts){
+ List<String> uDept = new ArrayList<>();
+ uDept.add(userDept);
+ userDeptsList.add(uDept);
+ }
+ }
+ List<List<String>> userDeptBfsList = new ArrayList<>();
+ if(!userDeptBfs.isEmpty()){
+ for(String userBfDept: userDeptBfs){
+ List<String> uBfDept = new ArrayList<>();
+ uBfDept.add(userBfDept);
+ userDeptBfsList.add(uBfDept);
+ }
+ }
if (usersTemp.size() > 0) {
sysUser1.setUserId(usersTemp.get(0).getUserId());
@@ -482,23 +506,17 @@
}
//灏嗛儴闂ㄦ垜鐥呭尯鏀惧埌鎸囧畾瀛楁涓�
Gson gson = new Gson();
- if(!userDepts.isEmpty()){
- sysUser1.setDeptInfo(gson.toJson(userDepts));
- }
- if(!userDeptBfs.isEmpty()){
- sysUser1.setHospInfo(gson.toJson(userDeptBfs));
- }
+ sysUser1.setHospInfo(gson.toJson(userDeptsList));
+ sysUser1.setDeptInfo(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.setHospInfo(gson.toJson(userDeptsList));
+ sysUser1.setDeptInfo(gson.toJson(userDeptBfsList));
+
sysUser2Mapper.insertUser(sysUser1);
//瀵瑰簲 SysUserServiceImpl selectUserByUserName2 191琛�
if (!org.springframework.util.CollectionUtils.isEmpty(sysUserOrg)) {
--
Gitblit v1.9.3