From 8e3a02c1facca35c5a90ce9b49505f373ae658f5 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 13 三月 2026 10:31:48 +0800
Subject: [PATCH] 代码提交

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

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
index 898ff17..b7325ee 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>
@@ -230,12 +233,12 @@
         inner join service_donatebaseinfo b on b.id = d.InfoID
         inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
         where b.del_flag=0
-        AND d.transplantstate = "1"
         AND d.del_flag=0
         AND d.TransplantTime IS NOT NULL
         AND d.OrganNo != 'C00'
         AND d.OrganNo != 'C69L'
         AND d.OrganNo != 'C69R'
+        <if test="transplantstate != null">and d.transplantstate >= #{transplantstate}</if>
         <if test="starttime != null">and d.TransplantTime >= #{starttime}</if>
         <if test="endtime != null ">and d.TransplantTime &lt;= #{endtime}</if>
         <if test="city != null and city != ''">and o.City = #{city}</if>
@@ -412,6 +415,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`,
@@ -534,16 +538,16 @@
           and OrganGetTime >= #{starttime}
           and OrganGetTime &lt;= #{endtime}
     </select>
-    <select id="getDistinctOrgansCount" resultType="java.lang.Integer">
-        select count(*) from service_donationwitnessorgan d
+    <select id="getDistinctOrgansCount" resultType="com.ruoyi.project.domain.vo.DistinctOrgansCount">
+        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}
         -- and (OrganState = "3" or OrganState = "4" or OrganState = "5" or OrganState = "6")
-        and d.del_flag=0
+        and d.del_flag=0 and b.del_flag = 0 and b.workflow>5
         -- and d.OrganGetTime IS NOT NULL
-        <if test="starttime != null ">and d.OrganGetTime >= #{starttime}</if>
-        <if test="endtime != null ">and d.OrganGetTime &lt;= #{endtime}</if>
+        <if test="starttime != null ">and b.donatetime >= #{starttime}</if>
+        <if test="endtime != null ">and b.donatetime &lt;= #{endtime}</if>
         <if test="city != null and city != ''">and o.City = #{city}</if>
         <if test="reporterno != null and reporterno != ''">and b.ReporterNo = #{reporterno}</if>
     </select>
@@ -645,4 +649,4 @@
         order by create_time desc
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3