From 4c141764d64c37c4c27e372cd55d9e861b192c28 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期六, 09 五月 2026 18:06:49 +0800
Subject: [PATCH] 捐献基础增加入院时间,捐献上报基础增加入院时间
---
ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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..4e80a62 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
@@ -47,7 +47,10 @@
create_by,
create_time,
update_by,
- update_time
+ update_time,
+ judgment_description,
+ ext_content,
+ state
from service_deathinfo
</sql>
@@ -85,6 +88,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 +97,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,
@@ -105,14 +110,18 @@
sdi.IsRestoreRemains as isrestoreremains,
sdi.RememberAnnex as rememberannex,
sdi.ResponsibleUserID as responsibleuserid,
- sdi.ResponsibleUserName as responsibleusername
+ sdi.ResponsibleUserName as responsibleusername,
+ sdi.state
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>
- <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