From d88fffd5d757a23f302011ced88dea92e1ce31e9 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 30 一月 2026 13:48:20 +0800
Subject: [PATCH] 代码提交

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

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
index bac4318..e691054 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
@@ -183,6 +183,7 @@
         sd.treatmenthospitalno AS treatmenthospitalno,
         sd.DonorNo AS donorno,
         sd.case_no AS caseNo,
+        sd.DonationCategory as donationcategory,
         sd.NAME AS name,
         sd.RecordState AS recordstate,
         sd.Sex AS sex,
@@ -209,7 +210,9 @@
         LEFT JOIN service_donatecompletioninfo sdc ON sd.ID = sdc.InfoID
         AND sd.del_flag = 0
         AND sdc.del_flag = 0
+        and sdc.ID is not null
         <where>
+            sd.termination_case = 0
             <if test="name != null  and name != ''">and sd.Name like concat('%', #{name}, '%')</if>
             <if test="inpatientno != null  and inpatientno != ''">and sd.inpatientno = #{inpatientno}</if>
             <if test="donorno != null  and donorno != ''">and sdc.DonorNo = #{donorno}</if>

--
Gitblit v1.9.3