From d5a5416a0e4b1e52c7805e3efc28eec40ab95782 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期一, 21 九月 2026 16:41:50 +0800
Subject: [PATCH] 捐献器官统计明细列表
---
ruoyi-project/src/main/resources/mapper/project/ServiceTotalsMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceTotalsMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceTotalsMapper.xml
index df4a872..da3af29 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceTotalsMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceTotalsMapper.xml
@@ -46,11 +46,13 @@
<select id="organ" parameterType="com.ruoyi.project.domain.ServiceTotals"
resultType="ServiceTotalsOrgan">
SELECT DATE_FORMAT(a.organ_start_time, '%Y-%m') donateTime,a.OrganName organName, COUNT(*) getCount,c.RegisterCountyName area,
- COUNT(IF(transplantstate=3, true, NULL)) useCount FROM service_donationwitnessorgan a
+ COUNT(IF(b.transplantstate=3, true, NULL)) useCount ,COUNT(IF(d.complete_state=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
+ LEFT JOIN service_donatecompletioninfo d ON d.InfoID=a.InfoID
<where>
- a.del_flag=0
+ a.del_flag=0 and b.del_flag=0 and c.del_flag=0 and d.del_flag=0
<if test="area != null and area != ''">
and a.InfoID in (select id FROM service_donatecompletioninfo where RegisterCountyName>=#{area} )
</if>
@@ -211,7 +213,7 @@
<select id="organList" parameterType="com.ruoyi.project.domain.ServiceTotals"
resultType="organList">
- SELECT a.id,a.case_no,a.NAME,a.RegisterCountyName,YEAR(a.donatetime) donateYear,b.OrganName,b.transplantstate,
+ 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
--
Gitblit v1.9.3