From bda1ce873514c0848c4ad76bdd2274f01ab5dcc1 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 11 八月 2025 08:48:08 +0800
Subject: [PATCH] zjh202500811

---
 ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
index 62d6251..72b984e 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
@@ -57,6 +57,7 @@
                pro_ids,
                pac_id,
                company,
+               company_id,
                job_no,
                department,
                department_id,
@@ -73,7 +74,8 @@
                time_region,
                id_type,
                age_unit,
-               career
+               career,
+               szd
         from tj_reservation
     </sql>
 
@@ -85,9 +87,10 @@
             <if test="phoe != null  and phoe != ''">and phoe = #{phoe}</if>
             <if test="company != null  and company != ''">and company like concat('%', #{company}, '%')</if>
             <if test="companyId != null  and companyId != ''">and company_id = #{companyId} </if>
-            <if test="reservationTime != null ">and reservation_time  BETWEEN #{reservationTime} and now()</if>
+            <if test="yykssj != null and yyjssj != null ">and reservation_time  BETWEEN #{yykssj} and #{yyjssj} </if>
             <if test="isExpire != null ">and is_expire = #{isExpire}</if>
-            and deleted = '0'
+            <if test="szd != null ">and szd = #{szd}</if>
+            and deleted = 0
         </where>
         ORDER BY create_time desc
     </select>

--
Gitblit v1.8.0