From a769ac9f9300e33b74a14c4c2c8327fcbb3cbd50 Mon Sep 17 00:00:00 2001 From: tianyongbao Date: Thu, 26 Sep 2024 23:37:00 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=81=A5=E5=BA=B7?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../health/domain/dto/HealthDoctorRecordDto.java | 8 ++++++++ .../health/domain/dto/HealthMarRecordDto.java | 8 ++++++++ .../ruoyi/health/domain/dto/HealthRecordDto.java | 8 ++++++++ .../domain/dto/HealthTemperatureRecordDto.java | 15 ++++++++++++--- .../health/domain/dto/HealthWeightRecordDto.java | 8 ++++++++ .../mapper/health/HealthDoctorRecordMapper.xml | 6 ++++++ .../mapper/health/HealthMarRecordMapper.xml | 6 ++++++ .../mapper/health/HealthRecordMapper.xml | 6 ++++++ .../health/HealthTemperatureRecordMapper.xml | 6 ++++++ .../mapper/health/HealthWeightRecordMapper.xml | 6 ++++++ 10 files changed, 74 insertions(+), 3 deletions(-) diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthDoctorRecordDto.java b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthDoctorRecordDto.java index abc8ce3..3fbc638 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthDoctorRecordDto.java +++ b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthDoctorRecordDto.java @@ -45,4 +45,12 @@ public class HealthDoctorRecordDto extends BaseEntity implements Serializable @ApiModelProperty(value="人员id") private Long personId; + /** 开始日期 */ + @ApiModelProperty(value="开始日期") + private String startTime; + + /** 结束日期 */ + @ApiModelProperty(value="结束日期") + private String endTime; + } diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMarRecordDto.java b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMarRecordDto.java index 69b1571..540cace 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMarRecordDto.java +++ b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMarRecordDto.java @@ -53,4 +53,12 @@ public class HealthMarRecordDto extends BaseEntity implements Serializable @ApiModelProperty(value="用药地点") private String place; + /** 开始日期 */ + @ApiModelProperty(value="开始日期") + private String startTime; + + /** 结束日期 */ + @ApiModelProperty(value="结束日期") + private String endTime; + } diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthRecordDto.java b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthRecordDto.java index e469f6d..398e7b3 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthRecordDto.java +++ b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthRecordDto.java @@ -38,4 +38,12 @@ public class HealthRecordDto extends BaseEntity implements Serializable @ApiModelProperty(value="状态") private String state; + /** 开始日期 */ + @ApiModelProperty(value="开始日期") + private String startTime; + + /** 结束日期 */ + @ApiModelProperty(value="结束日期") + private String endTime; + } diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthTemperatureRecordDto.java b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthTemperatureRecordDto.java index 4ae8c4f..7ea7325 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthTemperatureRecordDto.java +++ b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthTemperatureRecordDto.java @@ -1,12 +1,13 @@ package com.ruoyi.health.domain.dto; -import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.web.domain.BaseEntity; -import lombok.Data; -import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; /** * 体温记录Dto对象 health_temperature_record * @@ -36,4 +37,12 @@ public class HealthTemperatureRecordDto extends BaseEntity implements Serializa @ApiModelProperty(value="人员id") private Long personId; + /** 开始日期 */ + @ApiModelProperty(value="开始日期") + private String startTime; + + /** 结束日期 */ + @ApiModelProperty(value="结束日期") + private String endTime; + } diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthWeightRecordDto.java b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthWeightRecordDto.java index 53d999d..99ac4db 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthWeightRecordDto.java +++ b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthWeightRecordDto.java @@ -30,4 +30,12 @@ public class HealthWeightRecordDto extends BaseEntity implements Serializable @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date measureTime; + /** 开始日期 */ + @ApiModelProperty(value="开始日期") + private String startTime; + + /** 结束日期 */ + @ApiModelProperty(value="结束日期") + private String endTime; + } diff --git a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordMapper.xml b/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordMapper.xml index fd1fa01..dd8e4df 100644 --- a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordMapper.xml +++ b/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordMapper.xml @@ -59,6 +59,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.health_record_id = #{healthRecordId} and a.visiting_time = #{visitingTime} and a.person_id = #{personId} + + and #{endTime}>=to_char(a.visiting_time, 'yyyy-MM-dd') + + + and to_char(a.visiting_time, 'yyyy-MM-dd')>=#{startTime} + ${params.dataScope} diff --git a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMarRecordMapper.xml b/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMarRecordMapper.xml index 2f1dfdb..c6196a8 100644 --- a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMarRecordMapper.xml +++ b/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMarRecordMapper.xml @@ -64,6 +64,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.person_id = #{personId} and a.resource = #{resource} and a.place = #{place} + + and #{endTime}>=to_char(a.dosing_time, 'yyyy-MM-dd') + + + and to_char(a.dosing_time, 'yyyy-MM-dd')>=#{startTime} + ${params.dataScope} diff --git a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthRecordMapper.xml b/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthRecordMapper.xml index ffa004a..83eff3c 100644 --- a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthRecordMapper.xml +++ b/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthRecordMapper.xml @@ -60,6 +60,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.state = #{state} and a.etiology = #{etiology} and a.person_id = #{personId} + + and #{endTime}>=to_char(a.occur_time, 'yyyy-MM-dd') + + + and to_char(a.occur_time, 'yyyy-MM-dd')>=#{startTime} + ${params.dataScope} diff --git a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthTemperatureRecordMapper.xml b/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthTemperatureRecordMapper.xml index 3d3bc66..0109b54 100644 --- a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthTemperatureRecordMapper.xml +++ b/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthTemperatureRecordMapper.xml @@ -51,6 +51,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.measure_time = #{measureTime} and a.temperature = #{temperature} and a.person_id = #{personId} + + and #{endTime}>=to_char(a.measure_time, 'yyyy-MM-dd') + + + and to_char(a.measure_time, 'yyyy-MM-dd')>=#{startTime} + ${params.dataScope} diff --git a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthWeightRecordMapper.xml b/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthWeightRecordMapper.xml index 6b9c311..2b1a513 100644 --- a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthWeightRecordMapper.xml +++ b/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthWeightRecordMapper.xml @@ -27,6 +27,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.del_flag='0' and a.person_id = #{personId} + + and #{endTime}>=to_char(a.measure_time, 'yyyy-MM-dd') + + + and to_char(a.measure_time, 'yyyy-MM-dd')>=#{startTime} + ${params.dataScope}