From df9a47128a707b37483f282083e317d1d0119156 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期四, 16 四月 2026 17:31:28 +0800
Subject: [PATCH] 捐献确认基本信息集合新增排序

---
 ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml |    9 +++++----
 1 files changed, 5 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 99b0ec9..d78ec28 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
@@ -289,9 +289,9 @@
         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,
@@ -315,7 +315,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 +333,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