ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java

@@ -82,7 +82,7 @@
                .selectServiceSubtaskList(serviceSubtaskVO)
                .stream()
                .filter(subtask -> subtask.getTaskid() != null)  // 添加过滤
                .collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeavehospitaldistrictcode()).orElse("Unknown")));
                .collect(Collectors.groupingBy(subtask -> Optional.of(subtask.getTaskid().toString()).orElse("Unknown")));


        if (CollectionUtils.isNotEmpty(serviceTaskVOS)) {

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -179,14 +179,14 @@
    private Date loginDate;

    /**
     * 院区信息
     */
    @ApiModelProperty(value = "院区信息")
    private String hospInfo;
    /**
     * 科室信息
     */
    @ApiModelProperty(value = "科室信息")
    private String hospInfo;
    /**
     * 病区信息
     */
    @ApiModelProperty(value = "病区信息")
    private String deptInfo;

    /**

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

@@ -463,23 +463,37 @@
            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());

            //和queryHospUserInfoList采集的数据格式保持一致
            List<List<String>> userDeptsList = new ArrayList<>();
            if(!userDepts.isEmpty()){
                userDeptsList.add(userDepts);
                for(String userDept: userDepts){
                    List<String> uDept = new ArrayList<>();
                    uDept.add(userDept);
                    userDeptsList.add(uDept);
                }
            }
            List<List<String>> userDeptBfsList = new ArrayList<>();
            if(!userDeptBfs.isEmpty()){
                userDeptBfsList.add(userDeptBfs);
                for(String userBfDept: userDeptBfs){
                    List<String> uBfDept = new ArrayList<>();
                    uBfDept.add(userBfDept);
                    userDeptBfsList.add(uBfDept);
                }
            }

            if (usersTemp.size() > 0) {
@@ -492,16 +506,16 @@
                }
                //将部门我病区放到指定字段中
                Gson gson = new Gson();
                sysUser1.setDeptInfo(gson.toJson(userDeptsList));
                sysUser1.setHospInfo(gson.toJson(userDeptBfsList));
                sysUser1.setHospInfo(gson.toJson(userDeptsList));
                sysUser1.setDeptInfo(gson.toJson(userDeptBfsList));

                sysUser2Mapper.updateUser(sysUser1);
            } else {
                sysUser1.setUserName(sysUser1.getHisUserId());
                //将部门我病区放到指定字段中
                Gson gson = new Gson();
                sysUser1.setDeptInfo(gson.toJson(userDeptsList));
                sysUser1.setHospInfo(gson.toJson(userDeptBfsList));
                sysUser1.setHospInfo(gson.toJson(userDeptsList));
                sysUser1.setDeptInfo(gson.toJson(userDeptBfsList));

                sysUser2Mapper.insertUser(sysUser1);
                //对应 SysUserServiceImpl selectUserByUserName2 191行