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/ServiceDeathinfoMapper.xml |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
index f4658cf..8141e05 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
@@ -85,6 +85,8 @@
         sd.treatmenthospitalno AS treatmenthospitalno,
         sd.DonorNo AS donorno,
         sd.case_no AS caseNo,
+        sd.InpatientNo AS inpatientno,
+        sd.extracontent AS extracontent,
         sd.Name AS NAME,
         sd.RecordState AS recordstate,
         sd.Sex AS sex,
@@ -92,7 +94,7 @@
         sd.BloodType AS bloodtype,
         sd.idcardno AS idcardno,
         sd.diagnosisname AS diagnosisname,
-        sdi.infoID AS infoid,
+        sd.ID AS infoid,
         sdi.ID AS id,
         sdi.GainHospitalNo as gainhospitalno,
         sdi.GainHospitalName as gainhospitalname,
@@ -111,8 +113,11 @@
         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>
-            <if test="infoid != null ">and se.InfoID = #{infoid}</if>
+            sd.termination_case = 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>
             <if test="name != null  and name != ''">and sd.Name = #{name}</if>
             <if test="donorno != null  and donorno != ''">and sd.DonorNo = #{donorno}</if>

--
Gitblit v1.9.3