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

---
 ruoyi-project/src/main/resources/mapper/project/ServiceTotalsMapper.xml |   82 +++++++++++++++++++++++++++++++----------
 1 files changed, 62 insertions(+), 20 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceTotalsMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceTotalsMapper.xml
index d7258bb..fee68bf 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceTotalsMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceTotalsMapper.xml
@@ -10,7 +10,7 @@
         LEFT JOIN  service_donatecompletioninfo  b ON b.InfoID=a.id
         <where>
             a.del_flag=0
-            <if test="area != null  and area != ''">and a.RegisterCountyName>=#{area}</if>
+            <if test="area != null  and area != ''">and a.RegisterCountyName=#{area}</if>
             <if test="startTime != null  and startTime != ''">and a.donatetime>=#{startTime}</if>
             <if test="endTime != null  and endTime != ''">and a.donatetime &lt;= #{endTime}</if>
         </where>
@@ -23,7 +23,7 @@
         LEFT JOIN  service_donatecompletioninfo  b ON b.InfoID=a.id
         <where>
             a.del_flag=0
-            <if test="area != null  and area != ''">and a.RegisterCountyName>=#{area}</if>
+            <if test="area != null  and area != ''">and a.RegisterCountyName=#{area}</if>
             <if test="startTime != null  and startTime != ''">and a.donatetime>=#{startTime}</if>
             <if test="endTime != null  and endTime != ''">and a.donatetime &lt;= #{endTime}</if>
         </where>
@@ -36,7 +36,7 @@
         LEFT JOIN  service_donatecompletioninfo  b ON b.InfoID=a.id
         <where>
             a.del_flag=0
-            <if test="area != null  and area != ''">and a.RegisterCountyName>=#{area}</if>
+            <if test="area != null  and area != ''">and a.RegisterCountyName=#{area}</if>
             <if test="startTime != null  and startTime != ''">and a.donatetime>=#{startTime}</if>
             <if test="endTime != null  and endTime != ''">and a.donatetime &lt;= #{endTime}</if>
         </where>
@@ -45,24 +45,27 @@
 
     <select id="organ" parameterType="com.ruoyi.project.domain.ServiceTotals"
             resultType="ServiceTotalsOrgan">
-        SELECT DATE_FORMAT(a.OrganGetTime, '%Y-%m') donateTime,a.OrganName organName, COUNT(*) getCount,
-        COUNT(IF(transplantstate=3, true, NULL)) useCount   FROM  service_donationwitnessorgan a
+        SELECT DATE_FORMAT(a.organ_start_time, '%Y-%m') donateTime,a.OrganName organName, COUNT(*) getCount,c.RegisterCountyName area,
+        COUNT(IF(b.transplantstate=3, true, NULL)) useCount ,COUNT(IF(b.transplantstate=4, true, NULL)) deprecateCount
+        FROM  service_donationwitnessorgan a
         LEFT JOIN  service_donatecomporgan b ON a.InfoID=b.InfoID AND a.OrganName=b.OrganName
+        LEFT JOIN  service_donatebaseinfo c ON a.InfoID=c.ID
         <where>
-            a.del_flag=0
+            a.del_flag=0 and b.del_flag=0 and c.del_flag=0
             <if test="area != null  and area != ''">
                 and a.InfoID in (select id FROM service_donatecompletioninfo where RegisterCountyName>=#{area} )
             </if>
-            <if test="organName != null  and organName != ''">and a.OrganName>=#{organName}</if>
-            <if test="startTime != null  and startTime != ''">and a.OrganGetTime>=#{startTime}</if>
-            <if test="endTime != null  and endTime != ''">and a.OrganGetTime &lt;= #{endTime}</if>
+            <if test="area != null  and area != ''">and c.RegisterCountyName=#{area}</if>
+            <if test="organName != null  and organName != ''">and a.OrganName=#{organName}</if>
+            <if test="startTime != null  and startTime != ''">and a.organ_start_time>=#{startTime}</if>
+            <if test="endTime != null  and endTime != ''">and a.organ_start_time &lt;= #{endTime}</if>
         </where>
-        GROUP BY DATE_FORMAT(a.OrganGetTime, '%Y-%m'),a.OrganName
+        GROUP BY DATE_FORMAT(a.organ_start_time, '%Y-%m'),a.OrganName,c.RegisterCountyName
     </select>
 
     <select id="organMoon" parameterType="com.ruoyi.project.domain.ServiceTotals"
             resultType="ServiceTotalsOrgan">
-        SELECT DATE_FORMAT(a.OrganGetTime, '%Y-%m') donateTime, COUNT(*) getCount,
+        SELECT DATE_FORMAT(a.organ_start_time, '%Y-%m') donateTime, COUNT(*) getCount,
         COUNT(IF(transplantstate=3, true, NULL)) useCount   FROM  service_donationwitnessorgan a
         LEFT JOIN  service_donatecomporgan b ON a.InfoID=b.InfoID AND a.OrganName=b.OrganName
         <where>
@@ -70,11 +73,11 @@
             <if test="area != null  and area != ''">
                 and a.InfoID in (select id FROM service_donatecompletioninfo where RegisterCountyName>=#{area} )
             </if>
-            <if test="organName != null  and organName != ''">and a.OrganName>=#{organName}</if>
-            <if test="startTime != null  and startTime != ''">and a.OrganGetTime>=#{startTime}</if>
-            <if test="endTime != null  and endTime != ''">and a.OrganGetTime &lt;= #{endTime}</if>
+            <if test="organName != null  and organName != ''">and a.OrganName=#{organName}</if>
+            <if test="startTime != null  and startTime != ''">and a.organ_start_time>=#{startTime}</if>
+            <if test="endTime != null  and endTime != ''">and a.organ_start_time &lt;= #{endTime}</if>
         </where>
-        GROUP BY DATE_FORMAT(a.OrganGetTime, '%Y-%m')
+        GROUP BY DATE_FORMAT(a.organ_start_time, '%Y-%m')
     </select>
 
     <select id="organType" parameterType="com.ruoyi.project.domain.ServiceTotals"
@@ -87,9 +90,9 @@
             <if test="area != null  and area != ''">
                 and a.InfoID in (select id FROM service_donatecompletioninfo where RegisterCountyName>=#{area} )
             </if>
-            <if test="organName != null  and organName != ''">and a.OrganName>=#{organName}</if>
-            <if test="startTime != null  and startTime != ''">and a.OrganGetTime>=#{startTime}</if>
-            <if test="endTime != null  and endTime != ''">and a.OrganGetTime &lt;= #{endTime}</if>
+            <if test="organName != null  and organName != ''">and a.OrganName=#{organName}</if>
+            <if test="startTime != null  and startTime != ''">and a.organ_start_time>=#{startTime}</if>
+            <if test="endTime != null  and endTime != ''">and a.organ_start_time &lt;= #{endTime}</if>
         </where>
         GROUP BY a.OrganName
     </select>
@@ -178,7 +181,7 @@
         LEFT JOIN service_deathinfo d ON d.InfoID=a.id
         <where>
             a.del_flag=0
-            <if test="area != null  and area != ''">and a.RegisterCountyName>=#{area}</if>
+            <if test="area != null  and area != ''">and a.RegisterCountyName=#{area}</if>
             <if test="startTime != null  and startTime != ''">and a.donatetime>=#{startTime}</if>
             <if test="endTime != null  and endTime != ''">and a.donatetime &lt;= #{endTime}</if>
         </where>
@@ -192,7 +195,46 @@
         LEFT JOIN service_deathinfo d ON d.InfoID=a.id
         <where>
             a.del_flag=0
-            <if test="area != null  and area != ''">and a.RegisterCountyName>=#{area}</if>
+            <if test="area != null  and area != ''">and a.RegisterCountyName=#{area}</if>
+            <if test="startTime != null  and startTime != ''">and a.donatetime>=#{startTime}</if>
+            <if test="endTime != null  and endTime != ''">and a.donatetime &lt;= #{endTime}</if>
+        </where>
+
+    </select>
+
+    <select id="organTotals" parameterType="com.ruoyi.project.domain.ServiceTotals"
+            resultType="ServiceTotalsOrganTotals">
+        SELECT ( SELECT COUNT(*) FROM service_donatecomporgan WHERE del_flag=0 AND transplantstate=1) totalTransplant,
+               ( SELECT COUNT(*) FROM service_donatecomporgan WHERE del_flag=0 AND transplantstate=4) totalDiscard,
+               (SELECT COUNT(*) FROM service_donationwitnessorgan WHERE del_flag=0 AND OrganState=3) totalGet,
+               (SELECT COUNT(*) FROM service_donationwitnessorgan WHERE del_flag=0 AND OrganState=4) totalRecycle
+    </select>
+
+    <select id="organList" parameterType="com.ruoyi.project.domain.ServiceTotals"
+            resultType="organList">
+        SELECT DISTINCT a.id,a.case_no,a.NAME,a.RegisterCountyName,YEAR(a.donatetime) donateYear,b.OrganName,b.transplantstate,
+        b.TransplantTime,b.Name,b.TransplantDoct,b.HospitalName,c.OrganGetTime,c.notgetreason
+        FROM service_donatebaseinfo a LEFT JOIN service_donatecomporgan b ON a.ID=b.InfoID
+        LEFT JOIN service_donationwitnessorgan c ON a.ID=c.InfoID
+        <where>
+            a.del_flag=0 AND b.del_flag=0 AND c.del_flag=0
+            <if test="organName != null  and organName != ''">and b.OrganName=#{organName}</if>
+            <if test="area != null  and area != ''">and a.RegisterCountyName=#{area}</if>
+            <if test="startTime != null  and startTime != ''">and a.donatetime>=#{startTime}</if>
+            <if test="endTime != null  and endTime != ''">and a.donatetime &lt;= #{endTime}</if>
+        </where>
+
+    </select>
+
+    <select id="organCount" parameterType="com.ruoyi.project.domain.ServiceTotals"
+            resultType="Long">
+        SELECT count(*)
+        FROM service_donatebaseinfo a LEFT JOIN service_donatecomporgan b ON a.ID=b.InfoID
+        LEFT JOIN service_donationwitnessorgan c ON a.ID=c.InfoID
+        <where>
+            a.del_flag=0 AND b.del_flag=0 AND c.del_flag=0
+            <if test="organName != null  and organName != ''">and b.OrganName=#{organName}</if>
+            <if test="area != null  and area != ''">and a.RegisterCountyName=#{area}</if>
             <if test="startTime != null  and startTime != ''">and a.donatetime>=#{startTime}</if>
             <if test="endTime != null  and endTime != ''">and a.donatetime &lt;= #{endTime}</if>
         </where>

--
Gitblit v1.9.3