代码提交

liusheng

2025-04-16 4613099dca2d4e1c7b46a69a98bb4c210312ac57

代码提交

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

@@ -51,6 +51,8 @@
    @ApiOperation("查询患者门诊记录列表")
    public TableDataInfo selectPatMedOuthosplist(@RequestBody PatMedOuthosp patMedOuthosp) {
        PageUtils.startPageByPost(patMedOuthosp.getPageNum(), patMedOuthosp.getPageSize());
        SysUser user = getLoginUser().getUser();
        patMedOuthosp.setOrgid(user.getOrgid());
        List<PatMedOuthosp> list = patMedOuthospService.selectPatMedOuthospList(patMedOuthosp);
        return getDataTable(list);
    }

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -101,6 +101,7 @@
    //@PreAuthorize("@ss.hasPermi('system:user:query')")
    @GetMapping("/getInfo/{userId}")
    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) {
        log.error("--------userId的值为：{}",userId);
        userService.checkUserDataScope(userId);
        AjaxResult ajax = AjaxResult.success();
        List<SysRole> roles = roleService.selectRoleAll();
@@ -117,6 +118,10 @@
        SysUserDept sysUserDept = new SysUserDept();
        sysUserDept.setUserId(userId);
        sysUserDept.setDeptType("1");
        LoginUser loginUser = getLoginUser();
        SysUser user = loginUser.getUser();
        log.error("--------user的值为：{}",user);
        sysUserDept.setOrgid(user.getOrgid());
        sysUserDeptKSs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
        ajax.put("belongDepts", sysUserDeptKSs);


 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -181,6 +181,7 @@
        SysUserDept sysUserDept = new SysUserDept();
        sysUserDept.setUserId(sysUser.getUserId());
        sysUserDept.setDeptType(sysUser.getSearchscope());
        sysUserDept.setOrgid(split[1]);
        List<SysUserDept> sysUserDeptKSs = null;
        List<SysUserDept> sysUserDeptBQs = null;
        if (StringUtils.isNotEmpty(sysUser.getSearchscope()) && sysUser.getSearchscope().equals("0")) {

 smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java

@@ -73,8 +73,8 @@
    /**
     * 服务类型(1、监测评估；2、出院随访；3、门诊随访；4、宣教关怀；5、复诊通知；6、满意度调查；7、患者报告； 8、其他通知)
     */
    @Excel(name = "服务类型(1、监测评估；2、出院随访；3、门诊随访；4、宣教关怀；5、复诊通知；6、满意度调查；7、患者报告； 8、其他通知)")
    @ApiModelProperty(value = "服务类型(1、监测评估；2、出院随访；3、门诊随访；4、宣教关怀；5、复诊通知；6、满意度调查；7、患者报告； 8、其他通知)")
    @Excel(name = "服务类型(1、监测评估；2、出院随访；3、门诊随访；4、宣教关怀；5、复诊管理；6、满意度调查；7、患者报告； 8、其他通知 9体检随访 10.医技随访  11，影像专科随访  12、心电专科随访， 13专科随访)")
    @ApiModelProperty(value = "服务类型(1、监测评估；2、出院随访；3、门诊随访；4、宣教关怀；5、复诊管理；6、满意度调查；7、患者报告； 8、其他通知 9体检随访 10.医技随访  11，影像专科随访  12、心电专科随访， 13专科随访)")
    private String serviceType;

    /**

 smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java

@@ -256,7 +256,8 @@
                    }

                    writeInSubTask(serviceTaskdepts.get(0).getTaskId(), true, patMedInhosp1, patArchive);
                } else if (serviceChecks != null && serviceChecks.get(0).getCheckVisitFlag() == 2 || serviceChecks != null && serviceChecks.get(0).getCheckVisitFlag() == 3) {
                }
                if (serviceChecks != null && serviceChecks.get(0).getCheckVisitFlag() == 2 || serviceChecks != null && serviceChecks.get(0).getCheckVisitFlag() == 3) {
                    //丽水需要根据离院疾病对该病人生成一次随访
                    String[] split = patMedInhosp1.getIcd10code().split(",");
                    ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
@@ -282,7 +283,6 @@
                    }
                    writeInSubTask(serviceTaskdiags.get(0).getTaskId(), false, patMedInhosp1, patArchive);
                }


            } catch (Exception e) {
                e.printStackTrace();

 smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml

@@ -106,6 +106,7 @@
        from pat_med_outhosp pmo left join pat_archive pa on pmo.patid = pa.id
        <where>
            pmo.del_flag=0
            and pmo.orgid =#{orgid}
            <if test="hospitalname != null  and hospitalname != ''">and pmo.hospitalname like concat('%',
                #{hospitalname},
                '%')

 smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml

@@ -46,6 +46,7 @@
        <include refid="selectSysUserDeptVo"/>
        <where>
            del_flag=0
            and orgid=#{orgid}
            <if test="userId != null ">
                and user_id = #{userId}
            </if>
@@ -101,8 +102,9 @@
            </if>
            <if test="deptName != null ">
                dept_name,
            </if>   <if test="orgid != null ">
            orgid,
            </if>
            <if test="orgid != null ">
                orgid,
            </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -127,7 +129,8 @@
            </if>
            <if test="deptName != null ">
                #{deptName},
            </if><if test="orgid != null ">
            </if>
            <if test="orgid != null ">
                #{orgid},
            </if>
        </trim>
@@ -159,8 +162,9 @@
            </if>
            <if test="deptName != null ">
                dept_name = #{deptName},
            </if> <if test="orgid != null ">
            orgid = #{orgid},
            </if>
            <if test="orgid != null ">
                orgid = #{orgid},
            </if>
        </trim>
        where id = #{id}