From 739d4c2f64fcfd4ddcce6292978ad6aeb2c7bdc7 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期一, 26 一月 2026 23:00:13 +0800
Subject: [PATCH] feat: 优化医院搜索

---
 ruoyi-system/src/main/resources/mapper/system/ServiceOrderMapper.xml |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/ServiceOrderMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ServiceOrderMapper.xml
index 6e1e108..d536817 100644
--- a/ruoyi-system/src/main/resources/mapper/system/ServiceOrderMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/ServiceOrderMapper.xml
@@ -31,10 +31,15 @@
         <result property="serviceOrdTraPaidPrice"    column="ServiceOrdTraPaidPrice"    />
         <result property="serviceOrdUnitRemarks"    column="ServiceOrdUnitRemarks"    />
         <result property="serviceOrdCCTime"    column="ServiceOrd_CC_Time"    />
+        <result property="serviceOrdVisit"    column="ServiceOrdVisit"    />
     </resultMap>
-
+    <resultMap type="java.util.HashMap" id="ServiceCancelResult">
+        <result property="ServiceOrdState" column="ServiceOrdState" />
+        <result property="ServiceOrdCancelReason" column="ServiceOrdCancelReason" />
+        <result property="ServiceOrdCancelReasonTXT" column="ServiceOrdCancelReasonTXT" />
+    </resultMap>
     <sql id="selectServiceOrderVo">
-        select ServiceOrdID, ServiceOrdUserID, ServiceOrdClass, ServiceOrdType, ServiceOrdState, ServiceOrdStartDate, ServiceOrdApptDate, ServiceOrdCoName, ServiceOrdCoPhone, ServiceOrdPtName, ServiceOrdPtAge, ServiceOrdPtSex, ServiceOrdPtKG, ServiceOrdPtNat, ServiceOrdPtIDCard, ServiceOrdTraProvince, ServiceOrdTraCity, ServiceOrdTraStreet, ServiceOrdTraEnd, ServiceOrdTraDistance, ServiceOrdTraUnitPrice, ServiceOrdTraTxnPrice, ServiceOrdTraPaidType, ServiceOrdTraPaidPrice, ServiceOrdUnitRemarks, ServiceOrd_CC_Time from ServiceOrder
+        select ServiceOrdID, ServiceOrdUserID, ServiceOrdClass, ServiceOrdType, ServiceOrdState, ServiceOrdStartDate, ServiceOrdApptDate, ServiceOrdCoName, ServiceOrdCoPhone, ServiceOrdPtName, ServiceOrdPtAge, ServiceOrdPtSex, ServiceOrdPtKG, ServiceOrdPtNat, ServiceOrdPtIDCard, ServiceOrdTraProvince, ServiceOrdTraCity, ServiceOrdTraStreet, ServiceOrdTraEnd, ServiceOrdTraDistance, ServiceOrdTraUnitPrice, ServiceOrdTraTxnPrice, ServiceOrdTraPaidType, ServiceOrdTraPaidPrice, ServiceOrdUnitRemarks, ServiceOrd_CC_Time, ServiceOrdVisit from ServiceOrder
     </sql>
 
     <sql id="selectServiceOrderWhere">
@@ -173,4 +178,25 @@
             #{serviceOrdId}
         </foreach>
     </delete>
+    
+    <!-- 鏇存柊鏈嶅姟璁㈠崟鍙栨秷淇℃伅 -->
+    <update id="updateServiceOrderCancelInfo">
+        update ServiceOrder 
+        set ServiceOrdState = 4,
+            ServiceOrdCancelReason = #{cancelReason},
+            ServiceOrdCancelReasonTXT = #{cancelReasonText}
+        where ServiceOrdID = #{serviceOrdId}
+    </update>
+    
+    <!-- 鏍规嵁鏈嶅姟璁㈠崟ID鏌ヨ璁㈠崟鐘舵�� -->
+    <select id="selectServiceOrderStateById" parameterType="Long" resultType="Integer">
+        select ServiceOrdState 
+        from ServiceOrder 
+        where ServiceOrdID = #{serviceOrdId}
+    </select>
+    <select id="selectServiceCancelInfoById" parameterType="Long" resultMap="ServiceCancelResult">
+        select ServiceOrdState, ServiceOrdCancelReason, ServiceOrdCancelReasonTXT
+        from ServiceOrder 
+        where ServiceOrdID = #{serviceOrdId}
+    </select>
 </mapper> 
\ No newline at end of file

--
Gitblit v1.9.1