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/ServiceDonationwitnessMapper.xml | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
index 4b86477..a930bb3 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
@@ -47,6 +47,8 @@
<result property="coordinatorOutOperating" column="coordinator_out_operating"/>
<result property="coordinatorSign" column="coordinator_sign"/>
<result property="coordinatorSignTime" column="coordinator_sign_time"/>
+ <result property="witnessState" column="witness_state"/>
+
</resultMap>
<sql id="selectServiceDonationwitnessVo">
@@ -91,7 +93,8 @@
update_time,
OrganDonation,
OrganDonation_Other,
- donationcategory
+ donationcategory,
+ witness_state
from service_donationwitness
</sql>
@@ -153,7 +156,11 @@
st.AortaPerfusionTime as aortaperfusiontime,
st.OrganDonation as organdonation,
st.OrganDonation_Other as organdonationOther,
- st.DonationCategory as donationcategory
+ st.DonationCategory as donationcategory,
+ st.DeathJudgeAnnex as deathjudgeannex,
+ st.witness_state as witnessState,
+ st.IsSpendRemember as isspendremember,
+ st.IsRestoreRemains as isrestoreremains
FROM
service_donatebaseinfo sd
LEFT JOIN service_donationwitness st ON sd.ID = st.InfoID
@@ -172,7 +179,9 @@
<if test="operationdoctor != null and operationdoctor != ''">and st.OperationDoctor = #{operationdoctor}
</if>
<if test="infoid != null">and sd.ID = #{infoid}</if>
+ <if test="witnessState != null">and st.witness_state = #{witnessState}</if>
</where>
+ order by sd.InpatientNo desc
<if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
</select>
--
Gitblit v1.9.3