From 222df20f3bd705fe84f1b9373cc6c7e9c7dd0763 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期五, 16 十月 2026 14:34:26 +0800
Subject: [PATCH] 医学评估基础信息作废显示异常 患者死亡信息作废显示异常

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
index 5ae8d56..3a9b98f 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
@@ -185,6 +185,7 @@
         sd.treatmenthospitalno AS treatmenthospitalno,
         sd.DonorNo AS donorno,
         sd.case_no AS caseNo,
+        sd.InpatientNo AS inpatientno,
         sd.extracontent AS extracontent,
         sd.DonationCategory as donationcategory,
         sd.NAME AS name,
@@ -208,7 +209,9 @@
         sdc.CoordinatedUserNameT AS coordinatedusernamet,
         sdc.AssessAnnex AS assessannex,
         sdc.DonateOrgan AS donateorgan,
-        sdc.complete_state as completeState
+        sdc.complete_state as completeState,
+        sdc.signfamilyrelations,
+        sdc.relationname
         FROM
         service_donatebaseinfo sd
         LEFT JOIN service_donatecompletioninfo sdc ON sd.ID = sdc.InfoID
@@ -221,7 +224,9 @@
             <if test="inpatientno != null  and inpatientno != ''">and sd.inpatientno = #{inpatientno}</if>
             <if test="donorno != null  and donorno != ''">and sdc.DonorNo = #{donorno}</if>
             <if test="infoid != null">and sd.id = #{infoid}</if>
+            <if test="completeState != null  and completeState != ''">and sdc.complete_state = #{completeState}</if>
         </where>
+        order by sd.InpatientNo desc
         <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
     </select>
 

--
Gitblit v1.9.3