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/ServiceDonationwitnessMapper.xml |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
index ff6a3a0..c69d04c 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
@@ -112,6 +112,7 @@
         select
         sd.treatmenthospitalname AS treatmenthospitalname,
         sd.treatmenthospitalno AS treatmenthospitalno,
+        sd.DonationCategory as donationcategory,
         sd.DonorNo AS donorno,
         sd.case_no AS caseNo,
         sd.NAME AS name,
@@ -152,9 +153,12 @@
         FROM
         service_donatebaseinfo sd
         LEFT JOIN service_donationwitness st ON sd.ID = st.InfoID
+        and st.ID is not null
         AND sd.del_flag = 0
         AND st.del_flag = 0
         <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 st.DonorNo = #{donorno}</if>

--
Gitblit v1.9.3