From 0293e06edd011d6921ec2cc08392042f5765dfb8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 18 九月 2025 13:35:54 +0800
Subject: [PATCH] 日志修改

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml |   14 +++++++-------
 1 files changed, 7 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..e7c7910 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
@@ -230,12 +230,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>
@@ -534,16 +534,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 +645,4 @@
         order by create_time desc
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3