From 34599c2b887dd98d822cb993125920817505cd6d Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 28 十月 2026 15:47:41 +0800
Subject: [PATCH] 捐献完成列表返回增加疾病诊断名称,捐献确认列表添加终止案例过滤

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml |    8 +++++++-
 1 files changed, 7 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..da5f094 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,
@@ -194,6 +195,7 @@
         sd.BloodType AS bloodtype,
         sd.idcardno AS idcardno,
         sd.id AS infoid,
+        sd.diagnosisname,
         sdc.ID AS id,
         sdc.DonorNo AS donorno,
         sdc.IsBodyDonation AS isbodydonation,
@@ -208,7 +210,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 +225,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.ReportTime desc
         <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
     </select>
 

--
Gitblit v1.9.3