qdintc/intc-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修改健康系统查询条件。

Browse Source
This commit is contained in:
tianyongbao
2024-09-26 23:37:00 +08:00
parent 7d0442854f
commit a769ac9f93
10 changed files with 74 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthDoctorRecordDto.java
View File

@@ -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;
}

8
ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMarRecordDto.java
View File

@@ -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;
}

8
ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthRecordDto.java
View File

@@ -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;
}

15
ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthTemperatureRecordDto.java
View File

@@ -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;
}

8
ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthWeightRecordDto.java
View File

@@ -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;
}

6
ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordMapper.xml
View File

@@ -59,6 +59,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="healthRecordId != null and healthRecordId != ''"> and a.health_record_id = #{healthRecordId}</if>
<if test="visitingTime != null "> and a.visiting_time = #{visitingTime}</if>
<if test="personId != null "> and a.person_id = #{personId}</if>
<if test="endTime!=null and endTime !=''">
and #{endTime}>=to_char(a.visiting_time, 'yyyy-MM-dd')
</if>
<if test="startTime!=null and startTime !=''">
and to_char(a.visiting_time, 'yyyy-MM-dd')>=#{startTime}
</if>
</where>
<!-- 数据范围过滤 -->
${params.dataScope}

6
ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMarRecordMapper.xml
View File

@@ -64,6 +64,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="personId != null "> and a.person_id = #{personId}</if>
<if test="resource != null and resource != ''"> and a.resource = #{resource}</if>
<if test="place != null and place != ''"> and a.place = #{place}</if>
<if test="endTime!=null and endTime !=''">
and #{endTime}>=to_char(a.dosing_time, 'yyyy-MM-dd')
</if>
<if test="startTime!=null and startTime !=''">
and to_char(a.dosing_time, 'yyyy-MM-dd')>=#{startTime}
</if>
</where>
<!-- 数据范围过滤 -->
${params.dataScope}

6
ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthRecordMapper.xml
View File

@@ -60,6 +60,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="state != null and state != ''"> and a.state = #{state}</if>
<if test="etiology != null and etiology != ''"> and a.etiology = #{etiology}</if>
<if test="personId != null "> and a.person_id = #{personId}</if>
<if test="endTime!=null and endTime !=''">
and #{endTime}>=to_char(a.occur_time, 'yyyy-MM-dd')
</if>
<if test="startTime!=null and startTime !=''">
and to_char(a.occur_time, 'yyyy-MM-dd')>=#{startTime}
</if>
</where>
<!-- 数据范围过滤 -->
${params.dataScope}

6
ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthTemperatureRecordMapper.xml
View File

@@ -51,6 +51,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="measureTime != null "> and a.measure_time = #{measureTime}</if>
<if test="temperature != null "> and a.temperature = #{temperature}</if>
<if test="personId != null "> and a.person_id = #{personId}</if>
<if test="endTime!=null and endTime !=''">
and #{endTime}>=to_char(a.measure_time, 'yyyy-MM-dd')
</if>
<if test="startTime!=null and startTime !=''">
and to_char(a.measure_time, 'yyyy-MM-dd')>=#{startTime}
</if>
</where>
<!-- 数据范围过滤 -->
${params.dataScope}

6
ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthWeightRecordMapper.xml
View File

@@ -27,6 +27,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
a.del_flag='0'
<if test="personId != null "> and a.person_id = #{personId}</if>
<if test="endTime!=null and endTime !=''">
and #{endTime}>=to_char(a.measure_time, 'yyyy-MM-dd')
</if>
<if test="startTime!=null and startTime !=''">
and to_char(a.measure_time, 'yyyy-MM-dd')>=#{startTime}
</if>
</where>
<!-- 数据范围过滤 -->
${params.dataScope}