【市一】市一同步逻辑调整，增加hospinfo和deptinfo记录

陈昶聿

8 天以前 af162ff06af6001ebde7fa97acc6f993592565c5

【市一】市一同步逻辑调整，增加hospinfo和deptinfo记录

 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());

            //和queryHospUserInfoList采集的数据格式保持一致
            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)) {