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

陈昶聿

9 天以前 9d26379470b304ca084c877c114c051d57b495d6

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

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

@@ -1,5 +1,6 @@
package com.ruoyi.quartz.service.impl;

import com.google.gson.Gson;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.entity.SysUserDept;
@@ -10,6 +11,7 @@
import com.smartor.mapper.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -447,7 +449,7 @@
        SysUser suerTemp = new SysUser();
        //用户-机构关系-科室
        List<SysUserDept> sysUserDeptAll = chMapper.yhyksxx(suerTemp);
        //用户-机构关系-病房
        //用户-机构关系-病区
        List<SysUserDept> sysUserDeptBfAll = chMapper.yhybfxx(suerTemp);
        //用户-院区关系
        List<SysUserOrg> sysUserOrgAll = chMapper.yhyyqxx(suerTemp);
@@ -466,6 +468,10 @@
            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<String> userDepts = sysUserDept.stream().map(SysUserDept::getDeptCode).distinct().collect(Collectors.toList());
            List<String> userDeptBfs = sysUserDeptBf.stream().map(SysUserDept::getDeptCode).distinct().collect(Collectors.toList());

            if (usersTemp.size() > 0) {
                sysUser1.setUserId(usersTemp.get(0).getUserId());
                sysUser1.setUserName(sysUser1.getHisUserId());
@@ -474,9 +480,25 @@
                    sysUser1.setOrgid(sysUserOrg.get(0).getOrgid());
                    sysUser1.setCampusid(sysUserOrg.get(0).getCampusid());
                }
                //将部门我病区放到指定字段中
                Gson gson = new Gson();
                if(!userDepts.isEmpty()){
                    sysUser1.setDeptInfo(gson.toJson(userDepts));
                }
                if(!userDeptBfs.isEmpty()){
                    sysUser1.setHospInfo(gson.toJson(userDeptBfs));
                }
                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));
                }
                sysUser2Mapper.insertUser(sysUser1);
                //对应 SysUserServiceImpl selectUserByUserName2 191行
                if (!org.springframework.util.CollectionUtils.isEmpty(sysUserOrg)) {

 ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml

@@ -385,6 +385,7 @@
        FROM healthy_user_dept
        where 1=1
        and user_id != 'admin'
        and dept_type = '1'
        <if test="orgid != null and orgid != ''">
            AND orgid = #{orgid}
        </if>
@@ -393,9 +394,10 @@

    <select id="yhybfxx" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserDeptResult">
        select user_id , user_code , dept_type ,dept_code,dept_name,deptparent,del_flag,orgid
        FROM healthy_user_dept_bf
        FROM healthy_user_dept
        where 1=1
        and user_id != 'admin'
        and dept_type = '2'
        <if test="orgid != null and orgid != ''">
            AND orgid = #{orgid}
        </if>