From 2d84b9771e11b64f4224c57ebc36a157fe9a15b4 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 21 十月 2025 14:52:59 +0800
Subject: [PATCH] Merge branch 'master' into 0929-master
---
ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
index ab2ed3a..bb424fa 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
@@ -7,7 +7,7 @@
<resultMap type="com.ruoyi.common.core.domain.entity.SysUserDept" id="SysUserDeptResult">
<result property="id" column="id"/>
<result property="orgid" column="orgid"/>
- <result property="userId" column="user_id"/>
+ <result property="userCode" column="user_code"/>
<result property="deptId" column="dept_id"/>
<result property="delFlag" column="del_flag"/>
<result property="deptCode" column="dept_code"/>
@@ -372,8 +372,7 @@
</select>
<select id="yhyksxx" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserDeptResult">
- select user_id, user_code, dept_type,dept_code as
- dept_id,dept_name,deptparent,del_flag,orgid
+ select user_id , user_code , dept_type ,dept_code,dept_name,deptparent,del_flag,orgid
FROM healthy_user_dept
<where>
user_id != 'admin'
@@ -395,7 +394,7 @@
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
<if test="viptype != null ">and viptype = #{viptype}</if>
<if test="pattype != null ">and pattype = #{pattype}</if>
- <if test="patientno != null ">and patientno = #{patientno}</if>
+ <if test="patientno != null ">and patientno = #{patientno} </if>
<if test="patidHis != null ">and patid_his = #{patidHis}</if>
<if test="sdFlag != null ">and sd_flag = #{sdFlag}</if>
<if test="ageUnit != null ">and age_unit = #{ageUnit}</if>
@@ -414,6 +413,15 @@
<if test="casePersonAge != null ">and case_person_age = #{casePersonAge}</if>
<if test="filterDrname != null ">and filter_drname = #{filterDrname}</if>
<if test="filterDrcode != null ">and filter_drcode = #{filterDrcode}</if>
+ <if test="lastStartTime != null and lastStartTime != ''">
+ and to_char(last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') >= #{lastStartTime}
+ </if>
+ <if test="lastEndTime != null and lastEndTime != ''">
+ and to_char(last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') <= #{lastEndTime}
+ </if>
+ <if test="pageSize != null and pageSize!='' ">and rownum<#{pageSize}</if>
+
+
</where>
</select>
@@ -511,6 +519,12 @@
<if test="outWayId != null ">and b.out_way_id = #{outWayId}</if>
<if test="outWayName != null ">and b.out_way_name = #{outWayName}</if>
<if test="orgid != null ">and b.orgid = #{orgid}</if>
+ <if test="lastStartTime != null and lastStartTime != ''">
+ and to_char(last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') >= #{lastStartTime}
+ </if>
+ <if test="lastEndTime != null and lastEndTime != ''">
+ and to_char(last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') <= #{lastEndTime}
+ </if>
</where>
</select>
@@ -546,7 +560,12 @@
<if test="endTime != null ">
and to_char(admitdate, 'YYYY-MM-DD HH24:MI:SS') <= to_char(#{endTime}, 'YYYY-MM-DD HH24:MI:SS')
</if>
-
+ <if test="lastStartTime != null and lastStartTime != ''">
+ and to_char(last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') >= #{lastStartTime}
+ </if>
+ <if test="lastEndTime != null and lastEndTime != ''">
+ and to_char(last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') <= #{lastEndTime}
+ </if>
</where>
</select>
--
Gitblit v1.9.3