From b44e27d3cca665d55e86c1a46d03aa560bcf0774 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期四, 15 十月 2026 16:59:51 +0800
Subject: [PATCH] 捐献基础修改保存判断
---
ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml | 13 +++++++++----
1 files changed, 9 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 af68ab4..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>
@@ -149,8 +151,11 @@
<if test="responsibleusername != null and responsibleusername != ''">and sd.ResponsibleUserName like
concat('%',#{responsibleusername}, '%')
</if>
-
+ <if test="state != null and state != ''">and sdi.state = #{state}</if>
+ <if test="startDeathtime != null and endDeathtime != null ">and sdi.DeathTime BETWEEN #{startDeathtime} and #{endDeathtime}</if>
</where>
+
+ order by sd.InpatientNo desc
<if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
</select>
--
Gitblit v1.9.3