From 9ff5a9b1a3ce92b7bf4fcd3a8fdabbb1739cfe4b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 05 二月 2026 17:39:07 +0800
Subject: [PATCH] 代码提交

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

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml
index f3c072d..d96ae75 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganBaseMapper.xml
@@ -61,7 +61,10 @@
         sd.treatmenthospitalname AS treatmenthospitalname,
         sd.treatmenthospitalno AS treatmenthospitalno,
         sd.DonorNo AS donorno,
+        sd.DonationCategory as donationcategory,
         sd.case_no AS caseNo,
+        sd.extracontent AS extracontent,
+        sd.InpatientNo AS inpatientno,
         sd.Name AS NAME,
         sd.Sex AS sex,
         sd.Age AS age,
@@ -77,9 +80,12 @@
         service_donatebaseinfo sd
         LEFT JOIN service_donateorgan_base sdb ON sd.ID = sdb.InfoID and sd.del_flag = 0
         and sdb.del_flag = 0
+        and sdb.ID is not null
         <where>
-
+            sd.termination_case = 0
             <if test="donorno != null  and donorno != ''">and sd.DonorNo = #{donorno}</if>
+            <if test="infoid != null ">and sd.ID = #{infoid}</if>
+            <if test="inpatientno != null ">and sd.InpatientNo = #{inpatientno}</if>
             <if test="treatmenthospitalname != null  and treatmenthospitalname != ''">and sd.treatmenthospitalname like
                 concat('%', #{treatmenthospitalname}, '%')
             </if>

--
Gitblit v1.9.3