From 2d7a2367a2dad1d9a2a8306a05ca08d7951d20ee Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期六, 10 十月 2026 09:35:43 +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 af68ab4..038c6aa 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,7 +122,8 @@
         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
@@ -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