From 24a2f363743d8a2e4aa038635ef1d8b60a8e7131 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期四, 07 五月 2026 14:45:59 +0800
Subject: [PATCH] 查询捐献完成列表基本信息数据出错

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml |    6 +++++-
 1 files changed, 5 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 bac4318..8b758d0 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
@@ -183,6 +183,8 @@
         sd.treatmenthospitalno AS treatmenthospitalno,
         sd.DonorNo AS donorno,
         sd.case_no AS caseNo,
+        sd.extracontent AS extracontent,
+        sd.DonationCategory as donationcategory,
         sd.NAME AS name,
         sd.RecordState AS recordstate,
         sd.Sex AS sex,
@@ -209,11 +211,13 @@
         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>
-            <if test="infoid != null">and sdc.InfoID = #{infoid}</if>
+            <if test="infoid != null">and sd.id = #{infoid}</if>
         </where>
         <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
     </select>

--
Gitblit v1.9.3