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/ServiceRelativesconfirmationMapper.xml | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
index f8620d8..512ed25 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
@@ -52,6 +52,8 @@
<result property="occupation" column="occupation"/>
<result property="assessannex" column="assessannex"/>
<result property="relativeRemark" column="relative_remark"/>
+ <result property="relativeconfirmationsignname" column="relativeconfirmationsignname"/>
+ <result property="relativeidcardno" column="relativeidcardno"/>
</resultMap>
<sql id="selectServiceRelativesconfirmationVo">
@@ -271,33 +273,55 @@
sd.DonorNo as donorno,
sd.case_no as caseNo,
sd.Name as name,
+ sd.InpatientNo as inpatientno,
+ sd.extracontent as extracontent,
sd.RecordState as recordstate,
sd.Sex as sex,
sd.Age as age,
sd.BloodType as bloodtype,
sd.idcardno as idcardno,
sd.diagnosisname as diagnosisname,
- sr.infoID as infoid,
+ sd.ID as infoid,
sr.ID as id,
+ sr.Name as relativesName,
+ sr.FamilyRelations as familyRelations,
+ sr.IDCardType as idCardType,
+ sr.IDCardNo as idCardNo,
+ sr.Phone as phone,
+ sr.Kinship_ChildrenNum as kinshipChildrenNum,
+ sr.KinshipConfirmationSign as kinshipConfirmationSign,
sr.RelativeConfirmationSign as relativeConfirmationSign,
+ sr.OrganDecision as organdecision,
+ sr.OrganDecision_Other as organdecisionOther,
+ sr.SignFamilyRelations as signfamilyrelations,
sr.SignDate as signdate,
sr.ResponsibleUserName as responsibleusername,
sr.ResponsibleUserID as responsibleuserid,
sr.CoordinatedUserIDO as coordinateduserido,
sr.CoordinatedUserNameO as coordinatedusernameo,
- sr.CoordinatedUserNameT as coordinateduseridt,
- sr.ResponsibleUserID as responsibleuserid
+ sr.CoordinatedUserNameT as coordinatedusernamet,
+ sr.ResponsibleUserID as responsibleuserid,
+ sr.nation as nation,
+ sr.occupation as occupation,
+ sr.relative_remark as relativeRemark,
+ sr.assessannex as assessannex,
+ sr.education as education,
+ sr.relativeconfirmationsignname,
+ sr.relativeidcardno,
+ sr.state,
+ sr.other_family_members
FROM service_donatebaseinfo sd
LEFT JOIN service_relativesconfirmation sr ON sd.ID = sr.InfoID and sd.del_flag = 0
AND sr.del_flag = 0
<where>
- <if test="infoid != null and infoid != ''">AND sr.InfoID = #{infoid}</if>
+ <if test="infoid != null">AND sd.ID = #{infoid}</if>
<if test="recordstate != null and recordstate != ''">AND sd.RecordState = #{recordstate}</if>
<if test="caseNo != null and caseNo != ''">AND sd.case_no = #{caseNo}</if>
<if test="treatmenthospitalname != null and treatmenthospitalname != ''">AND sd.TreatmentHospitalName =
#{treatmenthospitalname}
</if>
<if test="name != null and name != ''">AND sd.Name = #{name}</if>
+ <if test="inpatientno != null and inpatientno != ''">AND sd.InpatientNo = #{inpatientno}</if>
<if test="responsibleusername != null and responsibleusername != ''">AND sd.ResponsibleUserName =
#{responsibleusername}
</if>
@@ -315,7 +339,9 @@
and sr.SignDate <= #{endSigndate}
</if>
</where>
+ order by sd.InpatientNo desc
<if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
</select>
+
</mapper>
--
Gitblit v1.9.3