【市一】用户、院区同步逻辑修改

陈昶聿

2026-01-29 ac2e836f65cf291bb3c94746df7467d99d546791

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java

@@ -445,44 +445,63 @@
    public Integer selectUserList(SysUser sysUser) {
        List<SysUser> sysUserList = chMapper.selectUserList(sysUser);
        SysUser suerTemp = new SysUser();
        //用户-机构关系-科室
        List<SysUserDept> sysUserDeptAll = chMapper.yhyksxx(suerTemp);
        //用户-机构关系-病房
        List<SysUserDept> sysUserDeptBfAll = chMapper.yhybfxx(suerTemp);
        //用户-院区关系
        List<SysUserOrg> sysUserOrgAll = chMapper.yhyyqxx(suerTemp);

        log.info("sysUserList的采集到的数量为：{}", sysUserList.size());
        int i = 0;// sysUser2Mapper.batchUser(sysUserList);
        for (SysUser sysUser1 : sysUserList) {
//            log.info("sysUser1的ID为：{}", sysUser1.getUserId());
//            log.info("sysUser1的HISUSERID为：{}", sysUser1.getHisUserId());
            if (StringUtils.isEmpty(sysUser1.getHisUserId())) continue;
            SysUser suTemp = new SysUser();
            suTemp.setHisUserId(sysUser1.getHisUserId());
            List<SysUser> usersTemp = sysUser2Mapper.selectUserList(suTemp);

            //新增用户与科室
            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<SysUserOrg> sysUserOrg = sysUserOrgAll.stream().filter((SysUserOrg o) -> o.getUserId().equals(sysUser1.getHisUserId())).collect(Collectors.toList());
            if (usersTemp.size() > 0) {
                sysUser1.setUserId(usersTemp.get(0).getUserId());
                sysUser1.setUserName(sysUser1.getHisUserId());
                //对应 SysUserServiceImpl selectUserByUserName2 191行
                if (!org.springframework.util.CollectionUtils.isEmpty(sysUserOrg)) {
                    sysUser1.setOrgid(sysUserOrg.get(0).getOrgid());
                    sysUser1.setCampusid(sysUserOrg.get(0).getCampusid());
                }
                sysUser2Mapper.updateUser(sysUser1);
            } else {
                sysUser1.setUserName(sysUser1.getHisUserId());
                sysUser2Mapper.insertUser(sysUser1);
                //对应 SysUserServiceImpl selectUserByUserName2 191行
                if (!org.springframework.util.CollectionUtils.isEmpty(sysUserOrg)) {
                    sysUser1.setOrgid(sysUserOrg.get(0).getOrgid());
                    sysUser1.setCampusid(sysUserOrg.get(0).getCampusid());
                }
                usersTemp = sysUser2Mapper.selectUserList(suTemp);
            }

            //新增用户与部门
            //List<SysUserDept> sysUserDept = chMapper.yhyksxx(sysUser1);
            List<SysUserDept> sysUserDept = sysUserDeptAll.stream().filter((SysUserDept b) -> b.getUserCode().equals(sysUser1.getHisUserId())).collect(Collectors.toList());

            for (SysUserDept sud : sysUserDept) {
                if (usersTemp.size() > 0) {
                if (!usersTemp.isEmpty()) {
                    sud.setDeptType("1");
                    sud.setUserId(usersTemp.get(0).getUserId());
                    sysUserDeptMapper.insertSysUserDept(sud);
                }
            }
            //新增用户与院区
            List<SysUserOrg> sysUserOrg = sysUserOrgAll.stream().filter((SysUserOrg o) -> o.getUserId().equals(sysUser1.getHisUserId())).collect(Collectors.toList());
            for (SysUserDept sudb : sysUserDeptBf) {
                if (!usersTemp.isEmpty()) {
                    sudb.setDeptType("2");
                    sudb.setUserId(usersTemp.get(0).getUserId());
                    sysUserDeptMapper.insertSysUserDept(sudb);
                }
            }
            for (SysUserOrg suo : sysUserOrg) {
                if (usersTemp.size() > 0) {
                    suo.setUserId(usersTemp.get(0).getUserId());
                if (!usersTemp.isEmpty()) {
                    suo.setUserId(usersTemp.get(0).getUserId().toString());
                    sysUserOrgMapper.insertSysUserOrg(suo);
                }
            }