From 6b74e7a581a89d59e3e61e1b57a4570a3d031bc5 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 05 六月 2025 16:25:44 +0800
Subject: [PATCH] 报告数据接口增加返回检查综述和医师建议

---
 ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml |    8 +++++---
 1 files changed, 5 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 cef40c0..22f0fa6 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
@@ -83,11 +83,13 @@
             <if test="name != null  and name != ''">and name =#{name}</if>
             <if test="idCard != null  and idCard != ''">and id_card = #{idCard}</if>
             <if test="phoe != null  and phoe != ''">and phoe = #{phoe}</if>
-            <if test="company != null  and company != ''">and company like "%"#{company}"%"</if>
-            <if test="reservationTime != null ">and reservation_time  BETWEEN #{reservationTime} and now()</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="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'
         </where>
+        ORDER BY create_time desc
     </select>
 
 
@@ -96,7 +98,7 @@
         <where>
             <if test="name != null  and name != ''">and name = #{name}</if>
             <if test="phoe != null  and phoe != ''">and phoe = #{phoe}</if>
-            <if test="company != null  and company != ''">and company like "%"#{company}"%"</if>
+            <if test="company != null  and company != ''">and company like concat('%', #{company}, '%')</if>
             <if test="reservationTime != null ">and reservation_time = #{reservationTime}</if>
             and deleted = '1'
         </where>

--
Gitblit v1.8.0