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

@@ -71,10 +71,15 @@
     */
    @ApiOperation("导出患者满意度列表")
    //@PreAuthorize("@ss.hasPermi('smartor:satisfaction:export')")
    @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
    @Log(title = "患者满意度", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, PatSatisfaction patSatisfaction) {
        LoginUser loginUser = getLoginUser();
        String orgid = loginUser.getUser().getOrgid();
        String campusid = loginUser.getUser().getCampusid();
        patSatisfaction.setOrgid(orgid);
        patSatisfaction.setCampusid(campusid);

        List<PatSatisfaction> list = patSatisfactionService.selectPatSatisfactionList(patSatisfaction);
        ExcelUtil<PatSatisfaction> util = new ExcelUtil<PatSatisfaction>(PatSatisfaction.class);
        util.exportExcel(response, list, "患者满意度数据");

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

@@ -74,6 +74,8 @@
    @Override
    public List<PatMedOuthosp> selectPatMedOuthospList(PatMedOuthosp patMedOuthosp) {
        PatMedOuthospQueryReq patMedOuthospQueryReq = DtoConversionUtils.sourceToTarget(patMedOuthosp, PatMedOuthospQueryReq.class);
        patMedOuthospQueryReq.setBeginAdmitdate(patMedOuthosp.getBeginTime());
        patMedOuthospQueryReq.setEndAdmitdate(patMedOuthosp.getEndTime());
        List<PatMedOuthosp> patMedOuthospQueryResps = patMedOuthospMapper.callSpQueryOuthosp(patMedOuthospQueryReq);
        if (patMedOuthosp.getPageNum() != null) {
            for (PatMedOuthosp patMedOuthosp1 : patMedOuthospQueryResps) {

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

@@ -154,6 +154,9 @@
        sysUser.setCampusid("1");
        //根据userName判断一下，是不是之前有新增
        SysUser sysUser1 = null;
        if(StringUtils.isEmpty(sysUser.getUserName()) || StringUtils.isEmpty(sysUser.getOrgid())){
            return false;
        }
        List<SysUser> sysUserList = sysUserMapper.selectUserList(sysUser);
        if (CollectionUtils.isNotEmpty(sysUserList)) {
            sysUser1 = sysUserList.get(0);

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

@@ -212,8 +212,6 @@
        pat_med_inhosp b
        JOIN
        pat_archive a ON a.id = b.patid
        LEFT JOIN
        pat_archivetag c ON c.patid = a.id AND (c.del_flag = 0 OR c.del_flag IS NULL)
        where 1=1
        AND a.del_flag = 0
        AND b.del_flag = 0
@@ -871,28 +869,31 @@
        0 AS zbsf
        FROM
        pat_med_inhosp
        JOIN
        pat_archive ON pat_archive.id = pat_med_inhosp.patid
        where 1=1
        and del_flag=0
        and pat_med_inhosp.del_flag=0
        <if test="orgid != null and orgid != ''">
            and orgid = #{orgid}
            and pat_med_inhosp.orgid = #{orgid}
        </if>
        AND pat_archive.idcardno IS NOT NULL
        <if test="zy != null">
            and inhospstate=0
            and date_format(starttime,'%y%m%d') &gt;= date_format(#{startDate},'%y%m%d')
            and date_format(starttime,'%y%m%d') &lt;= date_format(#{endDate},'%y%m%d')
            and pat_med_inhosp.inhospstate=0
            and date_format(pat_med_inhosp.starttime,'%y%m%d') &gt;= date_format(#{startDate},'%y%m%d')
            and date_format(pat_med_inhosp.starttime,'%y%m%d') &lt;= date_format(#{endDate},'%y%m%d')
            <if test="deptcodeList != null   and deptcodeList.size() > 0">
                and deptcode in
                and pat_med_inhosp.deptcode in
                <foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
                    #{deptcode}
                </foreach>
            </if>
        </if>
        <if test="cy != null">
            and inhospstate=1
            and date_format(endtime,'%y%m%d') &gt;= date_format(#{startDate},'%y%m%d')
            and date_format(endtime,'%y%m%d') &lt;= date_format(#{endDate},'%y%m%d')
            and pat_med_inhosp.inhospstate=1
            and date_format(pat_med_inhosp.endtime,'%y%m%d') &gt;= date_format(#{startDate},'%y%m%d')
            and date_format(pat_med_inhosp.endtime,'%y%m%d') &lt;= date_format(#{endDate},'%y%m%d')
            <if test="deptcodeList != null   and deptcodeList.size() > 0">
                and leaveldeptcode in
                and pat_med_inhosp.leaveldeptcode in
                <foreach collection="deptcodeList" item="deptcode" open="(" separator="," close=")">
                    #{deptcode}
                </foreach>