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/ServiceEthicalreviewinitiateMapper.xml | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
index 5647acb..0d0b795 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceEthicalreviewinitiateMapper.xml
@@ -27,6 +27,7 @@
<result property="expertTime" column="expert_time"/>
<result property="expertType" column="expert_type"/>
<result property="status" column="status"/>
+ <result property="filePatch" column="file_patch"/>
</resultMap>
<sql id="selectServiceEthicalreviewinitiateVo">
@@ -83,7 +84,10 @@
SELECT
sd.treatmenthospitalname as treatmenthospitalname,
sd.treatmenthospitalno as treatmenthospitalno,
+ sd.DonationCategory as donationcategory,
sd.DonorNo as donorno,
+ sd.extracontent as extracontent,
+ sd.InpatientNo as inpatientno,
sd.case_no as caseNo,
sd.Name as name,
sd.RecordState as recordstate,
@@ -98,20 +102,29 @@
se.expert_name as expertName,
se.expert_opinion as expertOpinion,
se.expert_time as expertTime,
- se.status as status
+ ifnull(se.status,0) as status,
+ se.file_patch as filePatch,
+ se.sigin,
+ se.initiate_theme,
+ se.initiate_person
FROM
service_donatebaseinfo sd
LEFT JOIN service_ethicalreviewinitiate se ON sd.ID = se.InfoID and sd.del_flag = 0
- AND se.del_flag = 0
+ AND se.del_flag = 0 and se.ID is not null
<where>
- <if test="infoid != null ">and se.InfoID = #{infoid}</if>
+ sd.termination_case = 0
+ <if test="infoid != null ">and sd.id = #{infoid}</if>
+ <if test="inpatientno != null ">and sd.InpatientNo = #{inpatientno}</if>
+ <if test="name != null and name != ''">and sd.name like concat('%', #{name}, '%')</if>
<if test="caseNo != null and caseNo != ''">and sd.case_no = #{caseNo}</if>
<if test="expertConclusion != null ">and se.expert_conclusion = #{expertConclusion}</if>
<if test="expertName != null ">and se.expert_name = #{expertName}</if>
<if test="expertOpinion != null ">and se.expert_opinion = #{expertOpinion}</if>
<if test="expertTime != null ">and se.expert_time = #{expertTime}</if>
<if test="status != null ">and se.status = #{status}</if>
+ <if test="startTime != null and endTime != null ">and se.start_time BETWEEN #{startTime} and #{endTime}</if>
</where>
+ order by sd.InpatientNo desc
<if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
</select>
--
Gitblit v1.9.3