From 19dde21187ef9edfdb38f60fbe764bddf3d2466d Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期六, 13 九月 2025 14:39:29 +0800
Subject: [PATCH] 登录用户没取科室病区

---
 ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml |   48 ++++++++++++++++++++++++++++++++----------------
 1 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
index 1376bcd..358f030 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
@@ -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 as dept_id,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 = CAST(#{patientno} AS INTEGER)</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,12 @@
             <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') &lt;= #{lastEndTime}
+            </if>
         </where>
     </select>
 
@@ -489,17 +494,17 @@
         healthy_inhosp b
         <where>
 
-            <if test="startOutHospTime != null ">and to_char(b.endtime,'YYMMDD') &gt;=
-                to_char(#{startOutHospTime}::date,'YYMMDD')
+            <if test="startOutHospTime != null ">
+                and to_char(b.endtime, 'YYYY-MM-DD HH24:MI:SS') &gt;=to_char(#{startOutHospTime},'YYYY-MM-DD HH24:MI:SS')
             </if>
-            <if test="endOutHospTime != null ">and to_char(b.endtime,'YYMMDD') &lt;=
-                to_char(#{endOutHospTime}::date,'YYMMDD')
+            <if test="endOutHospTime != null ">
+                and to_char(b.endtime, 'YYYY-MM-DD HH24:MI:SS') &lt;= to_char(#{endOutHospTime},'YYYY-MM-DD HH24:MI:SS')
             </if>
-            <if test="startInHospTime != null ">and to_char(b.starttime,'YYMMDD') &gt;=
-                to_char(#{startInHospTime}::date,'%y%m%d')
+            <if test="startInHospTime != null ">
+                and to_char(starttime, 'YYYY-MM-DD HH24:MI:SS') &gt;= to_char(#{startInHospTime},'YYYY-MM-DD HH24:MI:SS')
             </if>
-            <if test="endInHospTime != null ">and to_char(b.starttime,'YYMMDD') &lt;=
-                to_char(#{endInHospTime}::date,'YYMMDD')
+            <if test="endInHospTime != null ">
+                and to_char(starttime, 'YYYY-MM-DD HH24:MI:SS') &lt;=to_char(#{endInHospTime},'YYYY-MM-DD HH24:MI:SS')
             </if>
             <if test="inhospno != null ">and b.inhospno = #{inhospno}</if>
             <if test="fuflag != null ">and b.fuflag = #{fuflag}</if>
@@ -511,6 +516,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') &lt;= #{lastEndTime}
+            </if>
         </where>
     </select>
 
@@ -540,13 +551,18 @@
         from healthy_outhosp
         <where>
 
-            <if test="beginTime != null ">and to_char( admitdate,'YYMMDD') &gt;=
-                to_char(#{beginTime}::date,'YYMMDD')
+            <if test="beginTime != null ">
+                and to_char(admitdate, 'YYYY-MM-DD HH24:MI:SS') &gt;= to_char(#{beginTime}, 'YYYY-MM-DD HH24:MI:SS')
             </if>
-            <if test="endTime != null ">and to_char( admitdate,'YYMMDD') &lt;=
-                to_char(#{endTime}::date,'YYMMDD')
+            <if test="endTime != null ">
+                and to_char(admitdate, 'YYYY-MM-DD HH24:MI:SS') &lt;= 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') &lt;= #{lastEndTime}
+            </if>
         </where>
     </select>
 

--
Gitblit v1.9.3