04-16改_手术病人分页and患者信息子页面时间查询

zhs

2025-04-16 3c46b264b86bb38984370f685c6866c5f7784808

04-16改_手术病人分页and患者信息子页面时间查询

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

@@ -1,6 +1,8 @@
package com.ruoyi.web.controller.smartor;

import java.util.List;

import com.ruoyi.common.utils.PageUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javax.servlet.http.HttpServletResponse;
@@ -45,7 +47,8 @@
    @PostMapping("/list")
    public TableDataInfo list(@RequestBody PatMedOperation patMedOperation)
    {
        startPage();
        //startPage();
        PageUtils.startPageByPost(patMedOperation.getPageNum(), patMedOperation.getPageSize());
        List<PatMedOperation> list = patMedOperationService.selectPatMedOperationList(patMedOperation);
        return getDataTable(list);
    }

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

@@ -351,24 +351,32 @@
    /**
     * 开始出院日期
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "  ", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "开始出院日期")
    private Date startOutHospTime;

    /**
     * 结束出院日期
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "  ", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "结束出院日期")
    private Date endOutHospTime;

    /**
     * 开始入院日期
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "  ", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "开始入院日期")
    private Date startInHospTime;

    /**
     * 结束入院日期
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "  ", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "结束入院日期")
    private Date endInHospTime;


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

@@ -498,5 +498,18 @@
    @ApiModelProperty(value = "结束手术时间")
    private Date endTime;

    /**
     * pageNum
     */
    @ApiModelProperty("pageNum")
    private Integer pageNum;

    /**
     * pageSize
     */
    @ApiModelProperty("pageSize")
    private Integer pageSize;


}


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

@@ -199,12 +199,12 @@



    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "  ", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "开始就诊时间")
    private Date beginTime;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "  ", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "结束就诊时间")
    private Date endTime;

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

@@ -202,7 +202,7 @@
            a.del_flag = 0
            AND b.del_flag = 0
            AND a.idcardno IS NOT NULL
            <if test="startOutHospTime != null">
            <!--<if test="startOutHospTime != null">
                AND STR_TO_DATE(b.endtime,'%Y-%m-%d') &gt;= STR_TO_DATE(#{startOutHospTime},'%Y-%m-%d')
            </if>
            <if test="endOutHospTime != null">
@@ -215,6 +215,18 @@
            </if>
            <if test="endInHospTime != null">
                AND STR_TO_DATE(b.starttime, '%Y-%m-%d') &lt;= STR_TO_DATE(#{startInHospTime}, '%Y-%m-%d')
            </if>-->
            <if test="startOutHospTime != null ">and date_format(b.endtime,'%y%m%d') &gt;=
                date_format(#{startOutHospTime},'%y%m%d')
            </if>
            <if test="endOutHospTime != null ">and date_format(b.endtime,'%y%m%d') &lt;=
                date_format(#{endOutHospTime},'%y%m%d')
            </if>
            <if test="startInHospTime != null ">and date_format(b.starttime,'%y%m%d') &gt;=
                date_format(#{startInHospTime},'%y%m%d')
            </if>
            <if test="endInHospTime != null ">and date_format(b.starttime,'%y%m%d') &lt;=
                date_format(#{endInHospTime},'%y%m%d')
            </if>
            <if test="hospitalname != null  and hospitalname != ''">and hospitalname like concat('%', #{hospitalname},
                '%')

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

@@ -115,11 +115,17 @@
            <if test="drname != null  and drname != ''">and pmo.drname like concat('%', #{drname}, '%')</if>
            <if test="patname != null  and patname != ''">and pmo.patname like concat('%', #{patname}, '%')</if>

            <if test="beginTime != null ">and date_format(pmo.admitdate,'%Y%m%d%H%i%s') &gt;=
            <!--<if test="beginTime != null ">and date_format(pmo.admitdate,'%Y%m%d%H%i%s') &gt;=
                date_format(#{beginTime},'%Y%m%d%H%i%s')
            </if>
            <if test="endTime != null ">and date_format(pmo.admitdate,'%Y%m%d%H%i%s') &lt;=
                date_format(#{endTime},'%Y%m%d%H%i%s')
            </if>-->
            <if test="beginTime != null ">and date_format(pmo.admitdate,'%y%m%d') &gt;=
                date_format(#{beginTime},'%y%m%d')
            </if>
            <if test="endTime != null ">and date_format(pmo.admitdate,'%y%m%d') &lt;=
                date_format(#{endTime},'%y%m%d')
            </if>
            <if test="patid != null ">and pmo.patid = #{patid}</if>
            <if test="patno != null ">and pmo.patno = #{patno}</if>