Merge remote-tracking branch 'origin/master'

陈昶聿

2026-01-29 34f23b9bc07281df4bd454cbfcd3c12a98230afb

Merge remote-tracking branch 'origin/master'

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

@@ -19,6 +19,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -59,12 +60,17 @@
    @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
    @PostMapping("/selectPatMedOuthospList")
    @ApiOperation("查询患者门诊记录列表")
    public TableDataInfo selectPatMedOuthosplist(@RequestBody PatMedOuthosp patMedOuthosp) {
        PageUtils.startPageByPost(patMedOuthosp.getPageNum(), patMedOuthosp.getPageSize());
    public Map<String, Object> selectPatMedOuthosplist(@RequestBody PatMedOuthosp patMedOuthosp) {
        patMedOuthosp.setPageNum(PageUtils.getOffset(patMedOuthosp.getPageNum(), patMedOuthosp.getPageSize()));
        SysUser user = getLoginUser().getUser();
        patMedOuthosp.setOrgid(user.getOrgid());
        List<PatMedOuthosp> list = patMedOuthospService.selectPatMedOuthospList(patMedOuthosp);
        return getDataTable(list);
        patMedOuthosp.setPageNum(null);
        patMedOuthosp.setPageSize(null);
        List<PatMedOuthosp> patMedOuthosps = patMedOuthospService.selectPatMedOuthospList(patMedOuthosp);
        Integer count = 0;
        if (CollectionUtils.isNotEmpty(patMedOuthosps)) count = patMedOuthosps.size();
        return getDataTable3(count, list);
    }

    /**

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

@@ -71,9 +71,9 @@
     * @return 患者门诊记录
     */
    @Override
    @Cacheable(value = "selectPatMedOuthospList", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#patMedOuthosp.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
    public List<PatMedOuthosp> selectPatMedOuthospList(PatMedOuthosp patMedOuthosp) {
        List<PatMedOuthosp> patMedOuthosps = patMedOuthospMapper.selectPatMedOuthospList(patMedOuthosp);
        if (patMedOuthosp.getPageNum() != null) {
        for (PatMedOuthosp patMedOuthosp1 : patMedOuthosps) {
            PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedOuthosp1.getPatid());
            if (patArchive.getBirthdate() != null) {
@@ -97,6 +97,7 @@
            List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskBySendstate(serviceSubtaskVO);
            if (!CollectionUtils.isEmpty(serviceSubtaskList)) patMedOuthosp1.setServerState("1");
        }
        }
        return patMedOuthosps;
    }


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

@@ -86,17 +86,10 @@
            resultMap="PatMedOuthospResult">
        select
        pmo.id,
        pmo.campusid,
        pmo.remark,
        pmo.fudate,
        pmo.server_state,
        pmo.outhospno,
        pmo.diagcheck_flag,
        pmo.patno,
        pmo.serialnum,
        pmo.patid,
        pmo.hospitalname,
        pmo.hospitalcode,
        pmo.icd10code,
        pmo.diagname,
        pmo.deptcode,
@@ -104,25 +97,15 @@
        pmo.drcode,
        pmo.drname,
        pmo.admitdate,
        pmo.orgid,
        pmo.del_flag,
        pmo.guid,
        pmo.update_by,
        pmo.update_time,
        pmo.create_by,
        pmo.create_time,
        pmo.isupload,
        pmo.upload_time,
        pmo.schemestatus,
        pmo.deptid,
        pmo.schemetime,
        pmo.hpi,
        pmo.fuflag,
        pmo.patname,
        pmo.update_time,
        pmo.mainsuit
        from pat_med_outhosp pmo
        where 1=1
            and pmo.del_flag=0
        <where>pmo.del_flag='0'
            <if test="orgid != null ">and pmo.orgid = #{orgid}</if>
            <if test="serialnum != null ">and pmo.serialnum = #{serialnum}</if>
            <if test="serverState != null ">and pmo.server_state = #{serverState}</if>
@@ -153,7 +136,9 @@
            <if test="outhospno != null  and outhospno != ''">and pmo.outhospno = #{outhospno}</if>
            <if test="diagcheckFlag != null  and diagcheckFlag != ''">and pmo.diagcheck_flag = #{diagcheckFlag}</if>
            <if test="diagname != null  and diagname != ''">and pmo.diagname like concat('%',#{diagname}, '%')</if>
        </where>
        order by pmo.update_time desc
        <if test="pageSize != null  and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
    </select>

    <select id="selectPatMedOuthospById" parameterType="Long" resultMap="PatMedOuthospResult">