From ca29e025563fb430861d191d11dcd226b4e8e4d7 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期一, 21 九月 2026 16:30:02 +0800
Subject: [PATCH] 捐献器官统计明细列表

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

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
index c5bf61e..b010d21 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
@@ -232,7 +232,7 @@
         <!--        <if test="reporterno != null and reporterno != ''">and b.ReporterNo = #{reporterno}</if>-->
         select count(*) from service_donatecomporgan d
         inner join service_donatebaseinfo b on b.id = d.InfoID
-        inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
+        left join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
         where b.del_flag=0
         AND d.del_flag=0
         AND d.TransplantTime IS NOT NULL
@@ -262,7 +262,7 @@
 
         select count(*) from service_donationwitnessorgan d
         inner join service_donatebaseinfo b on b.id = d.InfoID
-        inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
+        left join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
         where b.del_flag=0
         AND d.OrganGetTime IS NOT NULL
         AND d.OrganState=1
@@ -279,7 +279,7 @@
         select count(*) from service_donateorgan d
 
         inner join service_donatebaseinfo b on b.id = d.InfoID
-        inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
+        left join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
         where IsBiopsyBefore = "1"
         AND
         d.OrganGetTime IS NOT NULL AND d.OrganNo != 'C00'
@@ -295,7 +295,7 @@
         select count(*) from service_donateorgan d
 
         inner join service_donatebaseinfo b on b.id = d.InfoID
-        inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
+        left join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
         where IsBiopsyAfter = "1"
         AND
         d.OrganGetTime IS NOT NULL AND d.OrganNo != 'C00'
@@ -311,7 +311,7 @@
         select count(*) from service_donateorgan d
 
         inner join service_donatebaseinfo b on b.id = d.InfoID
-        inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
+        left join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
         where IsMarginalOrgan = "1" AND
         d.OrganGetTime IS NOT NULL AND d.OrganNo != 'C00'
         AND d.OrganNo != 'C69L'
@@ -326,7 +326,7 @@
         select count(*) from service_donateorgan d
 
         inner join service_donatebaseinfo b on b.id = d.InfoID
-        inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
+        left join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
         where IsPathogenPositive = "1"
         AND
         d.OrganGetTime IS NOT NULL AND d.OrganNo != 'C00'
@@ -342,7 +342,7 @@
         select count(*) from service_donateorgan d
 
         inner join service_donatebaseinfo b on b.id = d.InfoID
-        inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
+        left join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
         where IsPNF = "1"
         <if test="starttime != null ">and d.OrganGetTime >= #{starttime}</if>
         <if test="endtime != null">and d.OrganGetTime &lt;= #{endtime}</if>
@@ -352,7 +352,7 @@
     <select id="getDGFNumberThisYear" resultType="java.lang.Integer">
         select count(*) from service_donateorgan d
         inner join service_donatebaseinfo b on b.id = d.InfoID
-        inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
+        left join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
         where IsDGF = "1"
         <if test="starttime != null ">and d.OrganGetTime >= #{starttime}</if>
         <if test="endtime != null ">and d.OrganGetTime &lt;= #{endtime}</if>
@@ -362,7 +362,7 @@
     <select id="selectPNFOrganThisYear" resultType="com.ruoyi.project.domain.ServiceDonateorgan">
         select * from service_donateorgan d
         inner join service_donatebaseinfo b on b.id = d.InfoID
-        inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
+        left join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
         where IsPNF = "1"
         AND
         d.OrganGetTime IS NOT NULL AND d.OrganNo != 'C00'
@@ -378,7 +378,7 @@
     <select id="selectDGFOrganThisYear" resultType="com.ruoyi.project.domain.ServiceDonateorgan">
         select * from service_donateorgan d
         inner join service_donatebaseinfo b on b.id = d.InfoID
-        inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
+        left join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
         where IsDGF = "1"
         AND
         d.OrganGetTime IS NOT NULL AND d.OrganNo != 'C00'
@@ -542,7 +542,7 @@
         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
+        left 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 b.del_flag = 0 and b.workflow>5

--
Gitblit v1.9.3