From af9eeec3590806f1e699511be33c892721defc49 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期五, 24 四月 2026 09:26:28 +0800
Subject: [PATCH] 捐献确认基本信息集合协调员2字段错

---
 ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml |   17 +++++++++++------
 1 files changed, 11 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..7d47e14 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">
@@ -289,21 +291,23 @@
         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
         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 +319,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,6 +337,7 @@
                 and sr.SignDate &lt;= #{endSigndate}
             </if>
         </where>
+        order by sr.id desc,sd.id desc
         <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
     </select>
 

--
Gitblit v1.9.3