From b700ed6963d12a004b2d000e2446b4ef31aac0f0 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 24 七月 2024 15:10:55 +0800
Subject: [PATCH] 变更

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

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
index 804552e..56945d9 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
@@ -235,6 +235,7 @@
         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>
@@ -533,8 +534,8 @@
           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,sum(case when transplantstate=3 then 1 else 0 end) 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}
@@ -644,4 +645,4 @@
         order by create_time desc
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3