From 2a3af1e765722cae585967c0010d90acef077aee Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期一, 25 五月 2026 17:41:54 +0800
Subject: [PATCH] 捐献基础表新增归档时间 捐献亲属确认表新增其他亲属 供体维护记录新增住院号排序,新增年龄区间、入院区间,协调员查询 捐献亲属确认修改住院号排序 医学评估表新增住院号排序,新增评估时间区间查询 患者死亡信息增住院号排序,新增死亡时间区间查询 伦理审查发起表增住院号排序,新增发起时间区间查询 捐献器官分配基础表表增住院号排序,新增分配状态,分配时间区间查询 捐献完成表增住院号排序,新增分配状态查询

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml |   23 ++++++++++++++++++++---
 1 files changed, 20 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 8141e05..8bf3afe 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
@@ -47,7 +47,15 @@
                create_by,
                create_time,
                update_by,
-               update_time
+               update_time,
+               judgment_description,
+               ext_content,
+               state,
+               heartDeathTime
+               heartDeathReason
+               heartDeathJudgeDoctO
+               heartDeathJudgeDoctT
+               heartDeathJudgeAnnex
         from service_deathinfo
     </sql>
 
@@ -107,7 +115,13 @@
         sdi.IsRestoreRemains as isrestoreremains,
         sdi.RememberAnnex as rememberannex,
         sdi.ResponsibleUserID as responsibleuserid,
-        sdi.ResponsibleUserName as responsibleusername
+        sdi.ResponsibleUserName as responsibleusername,
+        sdi.state,
+        sdi.heartDeathTime as heartdeathtime,
+        sdi.heartDeathReason as heartdeathreason,
+        sdi.heartDeathJudgeDoctO as heartdeathjudgedocto,
+        sdi.heartDeathJudgeDoctT as heartdeathjudgedoctt,
+        sdi.heartDeathJudgeAnnex as heartdeathjudgeannex
         FROM
         service_donatebaseinfo sd
         LEFT JOIN service_deathinfo sdi ON sd.ID = sdi.InfoID
@@ -135,8 +149,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