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

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTotalsController.java |   67 +++++++++++++++++++++++++--------
 1 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTotalsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTotalsController.java
index 23a998e..0570013 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTotalsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTotalsController.java
@@ -4,6 +4,7 @@
 import com.ruoyi.common.core.domain.Result;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.project.domain.ServiceTotals;
+import com.ruoyi.project.domain.vo.*;
 import com.ruoyi.project.service.iServiceTotalsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,57 +26,57 @@
 
         @ApiOperation("妗堜緥瓒嬪娍")
         @PostMapping("/caseTrend")
-        public Result caseTrend(@RequestBody ServiceTotals totals)
+        public Result<List<ServiceTotalsTrend>> caseTrend(@RequestBody ServiceTotals totals)
         {
-            List<ServiceTotals> list = service.caseTrend(totals);
+            List<ServiceTotalsTrend> list = service.caseTrend(totals);
             return Result.success(list);
         }
 
         @ApiOperation("妗堜緥瓒嬪娍鏈堜唤")
         @PostMapping("/caseTrendMoon")
-        public Result caseTrendMoon(@RequestBody ServiceTotals totals)
+        public Result<List<ServiceTotalsTrend>> caseTrendMoon(@RequestBody ServiceTotals totals)
         {
-            List<ServiceTotals> list = service.caseTrendMoon(totals);
+            List<ServiceTotalsTrend> list = service.caseTrendMoon(totals);
             return Result.success(list);
         }
 
         @ApiOperation("妗堜緥瓒嬪娍鍖哄煙")
         @PostMapping("/caseTrendArea")
-        public Result caseTrendArea(@RequestBody ServiceTotals totals)
+        public Result<List<ServiceTotalsTrend>> caseTrendArea(@RequestBody ServiceTotals totals)
         {
-            List<ServiceTotals> list = service.caseTrendArea(totals);
+            List<ServiceTotalsTrend> list = service.caseTrendArea(totals);
             return Result.success(list);
         }
 
         @ApiOperation("鎹愮尞鍣ㄥ畼缁熻鏄庣粏")
         @PostMapping("/organ")
-        public Result organ(@RequestBody ServiceTotals totals)
+        public Result<List<ServiceTotalsOrgan>> organ(@RequestBody ServiceTotals totals)
         {
-            List<ServiceTotals> list = service.organ(totals);
+            List<ServiceTotalsOrgan> list = service.organ(totals);
             return Result.success(list);
         }
 
         @ApiOperation("鍣ㄥ畼鑾峰彇/绉绘瓒嬪娍")
         @PostMapping("/organMoon")
-        public Result organMoon(@RequestBody ServiceTotals totals)
+        public Result<List<ServiceTotalsOrgan>> organMoon(@RequestBody ServiceTotals totals)
         {
-            List<ServiceTotals> list = service.organMoon(totals);
+            List<ServiceTotalsOrgan> list = service.organMoon(totals);
             return Result.success(list);
         }
 
         @ApiOperation("鍣ㄥ畼绫诲瀷鍒嗗竷")
         @PostMapping("/organType")
-        public Result organType(@RequestBody ServiceTotals totals)
+        public Result<List<ServiceTotalsOrgan>> organType(@RequestBody ServiceTotals totals)
         {
-            List<ServiceTotals> list = service.organType(totals);
+            List<ServiceTotalsOrgan> list = service.organType(totals);
             return Result.success(list);
         }
 
         @ApiOperation("鎹愮尞鑰呭勾榫勬�у埆鍒嗗竷")
         @PostMapping("/caseSex")
-        public Result caseSex(@RequestBody ServiceTotals totals)
+        public Result<List<ServiceTotalsSex>> caseSex(@RequestBody ServiceTotals totals)
         {
-            List<ServiceTotals> list = service.caseSex(totals);
+            List<ServiceTotalsSex> list = service.caseSex(totals);
             return Result.success(list);
         }
 
@@ -89,9 +90,43 @@
 
         @ApiOperation("鎬у埆涓庤鍨嬪垎甯�")
         @PostMapping("/caseBloodType")
-        public Result caseBloodType(@RequestBody ServiceTotals totals)
+        public Result<List<ServiceTotalsBood>> caseBloodType(@RequestBody ServiceTotals totals)
         {
-            List<ServiceTotals> list = service.caseBloodType(totals);
+            List<ServiceTotalsBood> list = service.caseBloodType(totals);
             return Result.success(list);
         }
+
+        @ApiOperation("鎬绘綔鍦ㄦ�诲畬鎴愭暟缁熻")
+        @PostMapping("/totals")
+        public Result<List<ServiceTotalsTotal>> totals(@RequestBody ServiceTotals totals)
+        {
+            List<ServiceTotalsTotal> list = service.totals(totals);
+            return Result.success(list);
+        }
+
+        @ApiOperation("妗堜緥鏄庣粏鍒楄〃")
+        @PostMapping("/trendList")
+        public Result<List<trendList>> trendList(@RequestBody ServiceTotals totals)
+        {
+            List<trendList> list = service.trendList(totals);
+            Long count=service.trendCount(totals);
+            return Result.success(count,list);
+        }
+
+        @ApiOperation("鍣ㄧ绉绘鎬荤粺璁�")
+        @PostMapping("/organTotals")
+        public Result<List<ServiceTotalsOrganTotals>> organTotals(@RequestBody ServiceTotals totals)
+        {
+            List<ServiceTotalsOrganTotals> list = service.organTotals(totals);
+            return Result.success(list);
+        }
+
+        @ApiOperation("鎹愮尞鍣ㄥ畼缁熻鏄庣粏鍒楄〃")
+        @PostMapping("/organList")
+        public Result<List<organList>> organList(@RequestBody ServiceTotals totals)
+        {
+            List<organList> list = service.organList(totals);
+            Long count=service.organCount(totals);
+            return Result.success(count,list);
+        }
 }

--
Gitblit v1.9.3