From 222df20f3bd705fe84f1b9373cc6c7e9c7dd0763 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期五, 16 十月 2026 14:34:26 +0800
Subject: [PATCH] 医学评估基础信息作废显示异常 患者死亡信息作废显示异常

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

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
index 8bf3afe..a0c945f 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
@@ -95,6 +95,7 @@
         sd.case_no AS caseNo,
         sd.InpatientNo AS inpatientno,
         sd.extracontent AS extracontent,
+        sd.DonationCategory as donationcategory,
         sd.Name AS NAME,
         sd.RecordState AS recordstate,
         sd.Sex AS sex,
@@ -121,15 +122,16 @@
         sdi.heartDeathReason as heartdeathreason,
         sdi.heartDeathJudgeDoctO as heartdeathjudgedocto,
         sdi.heartDeathJudgeDoctT as heartdeathjudgedoctt,
-        sdi.heartDeathJudgeAnnex as heartdeathjudgeannex
+        sdi.heartDeathJudgeAnnex as heartdeathjudgeannex,
+        sdi.ext_Content as extContent
         FROM
         service_donatebaseinfo sd
         LEFT JOIN service_deathinfo sdi ON sd.ID = sdi.InfoID
-        AND sd.del_flag = 0
+
         AND sdi.del_flag = 0
         AND sdi.ID IS NOT NULL
         <where>
-            sd.termination_case = 0
+            sd.termination_case = 0 AND sd.del_flag = 0
             <if test="infoid != null ">and sd.ID = #{infoid}</if>
             <if test="inpatientno != null ">and sd.InpatientNo = #{inpatientno}</if>
             <if test="caseNo != null  and caseNo != ''">and sd.case_no = #{caseNo}</if>

--
Gitblit v1.9.3