From 0ab2ae12ce7a40b3436374cf8071055bd0aa0aff Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 26 五月 2026 11:12:52 +0800
Subject: [PATCH] 新增七大步骤所有附件列表接口

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
index a27acad..a930bb3 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
@@ -47,6 +47,8 @@
         <result property="coordinatorOutOperating" column="coordinator_out_operating"/>
         <result property="coordinatorSign" column="coordinator_sign"/>
         <result property="coordinatorSignTime" column="coordinator_sign_time"/>
+        <result property="witnessState" column="witness_state"/>
+
     </resultMap>
 
     <sql id="selectServiceDonationwitnessVo">
@@ -91,7 +93,8 @@
                update_time,
                OrganDonation,
                OrganDonation_Other,
-               DonationCategory
+               donationcategory,
+               witness_state
         from service_donationwitness
     </sql>
 
@@ -153,7 +156,11 @@
         st.AortaPerfusionTime as aortaperfusiontime,
         st.OrganDonation as organdonation,
         st.OrganDonation_Other as organdonationOther,
-        st.DonationCategory as donationcategory
+        st.DonationCategory as donationcategory,
+        st.DeathJudgeAnnex as deathjudgeannex,
+        st.witness_state as witnessState,
+        st.IsSpendRemember as isspendremember,
+        st.IsRestoreRemains as isrestoreremains
         FROM
         service_donatebaseinfo sd
         LEFT JOIN service_donationwitness st ON sd.ID = st.InfoID
@@ -172,7 +179,9 @@
             <if test="operationdoctor != null  and operationdoctor != ''">and st.OperationDoctor = #{operationdoctor}
             </if>
             <if test="infoid != null">and sd.ID = #{infoid}</if>
+            <if test="witnessState != null">and st.witness_state = #{witnessState}</if>
         </where>
+        order by sd.InpatientNo desc
         <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
     </select>
 

--
Gitblit v1.9.3