From 49120f2b9db33455756a911e56cfefd7c3120a14 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 28 十月 2026 17:05:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
index d3ed480..a9cbfc1 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
@@ -70,6 +70,7 @@
         <result property="organchargedesc" column="organchargedesc"/>
         <result property="notgetreason" column="notgetreason"/>
         <result property="transplantstate" column="transplantstate"/>
+        <result property="sort" column="sort"/>
     </resultMap>
 
     <sql id="selectServiceDonateorganVo">
@@ -77,6 +78,7 @@
                InfoID,
                DonorNo,
                OrganNo,
+               sort,
                OrganName,
                OrganState,
                OrganNumber,
@@ -149,6 +151,7 @@
         <include refid="selectServiceDonateorganVo"/>
         <where>
             <if test="infoid != null ">and InfoID = #{infoid}</if>
+            <if test="sort != null ">and sort = #{sort}</if>
             <if test="donorno != null  and donorno != ''">and DonorNo = #{donorno}</if>
             <if test="organno != null  and organno != ''">and OrganNo = #{organno}</if>
             <if test="organname != null  and organname != ''">and OrganName like concat('%', #{organname}, '%')</if>
@@ -179,6 +182,8 @@
             <if test="isdgf != null ">and isDGF = #{isdgf}</if>
 
         </where>
+        <!-- 2026-10-23锛氭寜鍣ㄥ畼鎺掗槦搴忓彿鎺掑簭锛堢┖鐨勬帓鏈�鍚庯紝鍐嶆寜涓婚敭鍏滃簳锛� -->
+        order by (sort is null or sort = 0), sort asc, ID asc
     </select>
     <select id="getAllDonateOrgans" resultType="com.ruoyi.project.domain.ServiceDonateorgan">
         <include refid="selectServiceDonateorganVo"/>
@@ -412,6 +417,7 @@
         `service_donatebaseinfo`.`ReportTime` AS `ReportTime`,
         `service_donatebaseinfo`.`RecordState` AS `RecordState`,
         `service_donateorgan`.`ID` AS `doID`,
+        `service_donateorgan`.`sort` AS `sort`,
         `service_donateorgan`.`InfoID` AS `InfoID`,
         `service_donateorgan`.`DonorNo` AS `doDonorNo`,
         `service_donateorgan`.`OrganNo` AS `OrganNo`,
@@ -535,7 +541,7 @@
           and OrganGetTime &lt;= #{endtime}
     </select>
     <select id="getDistinctOrgansCount" resultType="com.ruoyi.project.domain.vo.DistinctOrgansCount">
-        select count(*) as gainsum,sum(case when transplantstate=3 then 1 else 0 end) as abandonCount from service_donatecomporgan d
+        select count(*) as gainsum,ifnull(sum( CASE WHEN transplantstate = 3 THEN 1 ELSE 0 END ),0) as abandonCount from service_donatecomporgan d
         inner join service_donatebaseinfo b on b.id = d.InfoID
         inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
         where d.OrganNo = #{organno}

--
Gitblit v1.9.3