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  |    3 ++-
 ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml |    1 +
 2 files changed, 3 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 3a9b98f..da5f094 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
@@ -195,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,
@@ -226,7 +227,7 @@
             <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
+        order by sd.ReportTime desc
         <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
     </select>
 
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
index f4efa1b..17c0e5f 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
@@ -315,6 +315,7 @@
         LEFT JOIN service_relativesconfirmation sr ON sd.ID = sr.InfoID and sd.del_flag = 0
         AND sr.del_flag = 0
         <where>
+            sd.termination_case = 0
             <if test="infoid != null">AND sd.ID = #{infoid}</if>
             <if test="recordstate != null and recordstate != ''">AND sd.RecordState = #{recordstate}</if>
             <if test="caseNo != null and caseNo != ''">AND sd.case_no = #{caseNo}</if>

--
Gitblit v1.9.3