From 2d7a2367a2dad1d9a2a8306a05ca08d7951d20ee Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期六, 10 十月 2026 09:35:43 +0800
Subject: [PATCH] 查询增加捐献类别字段,住院号
---
ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
index ece63f0..8c48d78 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">
@@ -274,6 +276,7 @@
sd.InpatientNo as inpatientno,
sd.extracontent as extracontent,
sd.RecordState as recordstate,
+ sd.DonationCategory as donationcategory,
sd.Sex as sex,
sd.Age as age,
sd.BloodType as bloodtype,
@@ -297,13 +300,17 @@
sr.ResponsibleUserID as responsibleuserid,
sr.CoordinatedUserIDO as coordinateduserido,
sr.CoordinatedUserNameO as coordinatedusernameo,
- sr.CoordinatedUserNameT as coordinateduseridt,
+ 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.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
@@ -315,7 +322,7 @@
#{treatmenthospitalname}
</if>
<if test="name != null and name != ''">AND sd.Name = #{name}</if>
- <if test="inpatientno != null ">AND sd.InpatientNo = #{inpatientno}</if>
+ <if test="inpatientno != null and inpatientno != ''">AND sd.InpatientNo = #{inpatientno}</if>
<if test="responsibleusername != null and responsibleusername != ''">AND sd.ResponsibleUserName =
#{responsibleusername}
</if>
@@ -333,7 +340,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