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/ServiceDonatecompletioninfoMapper.xml | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
index 8b758d0..d32059a 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatecompletioninfoMapper.xml
@@ -8,7 +8,7 @@
<result property="id" column="ID"/>
<result property="infoid" column="InfoID"/>
<result property="donorno" column="DonorNo"/>
- <result property="del_flag" column="del_flag"/>
+ <result property="delFlag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
@@ -25,6 +25,7 @@
<result property="coordinatedusernamet" column="CoordinatedUserNameT"/>
<result property="assessannex" column="AssessAnnex"/>
<result property="donateorgan" column="DonateOrgan"/>
+ <result property="completeState" column="complete_state"/>
</resultMap>
<sql id="selectServiceDonatecompletioninfoVo">
@@ -47,7 +48,8 @@
CoordinatedUserIDT,
CoordinatedUserNameT,
AssessAnnex,
- DonateOrgan
+ DonateOrgan,
+ complete_state
from service_donatecompletioninfo
</sql>
@@ -205,7 +207,10 @@
sdc.CoordinatedUserIDT AS coordinateduseridt,
sdc.CoordinatedUserNameT AS coordinatedusernamet,
sdc.AssessAnnex AS assessannex,
- sdc.DonateOrgan AS donateorgan
+ sdc.DonateOrgan AS donateorgan,
+ sdc.complete_state as completeState,
+ sdc.signfamilyrelations,
+ sdc.relationname
FROM
service_donatebaseinfo sd
LEFT JOIN service_donatecompletioninfo sdc ON sd.ID = sdc.InfoID
@@ -218,7 +223,9 @@
<if test="inpatientno != null and inpatientno != ''">and sd.inpatientno = #{inpatientno}</if>
<if test="donorno != null and donorno != ''">and sdc.DonorNo = #{donorno}</if>
<if test="infoid != null">and sd.id = #{infoid}</if>
+ <if test="completeState != null and completeState != ''">and sdc.complete_state = #{completeState}</if>
</where>
+ order by sd.InpatientNo desc
<if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
</select>
--
Gitblit v1.9.3