From 34599c2b887dd98d822cb993125920817505cd6d Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 28 十月 2026 15:47:41 +0800
Subject: [PATCH] 捐献完成列表返回增加疾病诊断名称,捐献确认列表添加终止案例过滤

---
 ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
index 99b0ec9..17c0e5f 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,
@@ -289,25 +292,30 @@
         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.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.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
         <where>
+            sd.termination_case = 0
             <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>
@@ -315,7 +323,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 +341,9 @@
                 and sr.SignDate &lt;= #{endSigndate}
             </if>
         </where>
+        order by sd.ReportTime desc
         <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
     </select>
 
+
 </mapper>

--
Gitblit v1.9.3