From beacd8de4633943f6e44069185a8f1adb53e5c2f Mon Sep 17 00:00:00 2001
From: chen <2710907404@qq.com>
Date: Thu, 14 Nov 2024 16:28:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=201.=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E6=8A=98=E7=BA=BF=E5=92=8C?=
 =?UTF-8?q?=E6=9F=B1=E7=8A=B6=E5=9B=BE=E7=9A=84=E6=80=BB=E5=92=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DrugHandingOverStatisticServiceImpl.java  | 23 +++++++++++++------
 .../platform/imr/vo/DrugStatisticVO.java      | 10 ++++++++
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/main/java/digital/laboratory/platform/imr/service/impl/DrugHandingOverStatisticServiceImpl.java b/src/main/java/digital/laboratory/platform/imr/service/impl/DrugHandingOverStatisticServiceImpl.java
index 86f5bd3..d9bddff 100644
--- a/src/main/java/digital/laboratory/platform/imr/service/impl/DrugHandingOverStatisticServiceImpl.java
+++ b/src/main/java/digital/laboratory/platform/imr/service/impl/DrugHandingOverStatisticServiceImpl.java
@@ -25,6 +25,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -50,9 +51,9 @@ public class DrugHandingOverStatisticServiceImpl implements DrugHandingOverStati
      */
     @Override
     public DrugStatisticVO statistic(DrugStatisticQuery query) {
-        List<List<Object>> lineChartData = buildLineChartData(query);
-        List<List<Object>> barChartData = buildBarChartData(query);
         DrugStatisticVO drugStatisticVO = new DrugStatisticVO();
+        List<List<Object>> lineChartData = buildLineChartData(query, drugStatisticVO);
+        List<List<Object>> barChartData = buildBarChartData(query, drugStatisticVO);
         drugStatisticVO.setBarChartDataList(barChartData);
         drugStatisticVO.setLineChartDataList(lineChartData);
         return drugStatisticVO;
@@ -60,10 +61,12 @@ public class DrugHandingOverStatisticServiceImpl implements DrugHandingOverStati
 
     /**
      * 构建柱状图的数据
+     *
      * @param query
+     * @param drugStatisticVO
      * @return
      */
-    private List<List<Object>> buildBarChartData(DrugStatisticQuery query) {
+    private void buildBarChartData(DrugStatisticQuery query, DrugStatisticVO drugStatisticVO) {
         List<List<Object>> barChartData = new ArrayList<>();
         List<Object> orgNameList = new ArrayList<>();
         List<Object> dataList = new ArrayList<>();
@@ -95,21 +98,26 @@ public class DrugHandingOverStatisticServiceImpl implements DrugHandingOverStati
             List<DrugMaterialInfoVO> voList = groupByHandingOverOrgMap.get(orgId);
             if (CollUtil.isNotEmpty(voList)) {
                 orgNameList.add(sysOrg.getAlias());
-                dataList.add(voList.size());
+                int size = voList.size();
+                dataList.add(size);
             }
         });
 
         barChartData.add(orgNameList);
         barChartData.add(dataList);
-        return barChartData;
+        drugStatisticVO.setBarChartDataSum(dataList.stream().mapToInt(obj -> (Integer) obj).sum());
+        drugStatisticVO.setBarChartDataList(barChartData);
+//        return barChartData;
     }
 
     /**
      * 构建折线图的数据
+     *
      * @param query
+     * @param drugStatisticVO
      * @return
      */
-    private List<List<Object>> buildLineChartData(DrugStatisticQuery query) {
+    private void buildLineChartData(DrugStatisticQuery query, DrugStatisticVO drugStatisticVO) {
         List<List<Object>> lineChartData = new ArrayList<>(); // 存储结果值
         List<Object> monthsList = new ArrayList<>(); // 存储月份
         List<Object> dataList = new ArrayList<>(); // 对应月份送缴的数量
@@ -143,7 +151,8 @@ public class DrugHandingOverStatisticServiceImpl implements DrugHandingOverStati
         }
         lineChartData.add(monthsList);
         lineChartData.add(dataList);
-        return lineChartData;
+        drugStatisticVO.setLineChartDataSum(dataList.stream().mapToInt(obj -> (Integer) obj).sum());
+        drugStatisticVO.setLineChartDataList(lineChartData);
     }
 
     /**
diff --git a/src/main/java/digital/laboratory/platform/imr/vo/DrugStatisticVO.java b/src/main/java/digital/laboratory/platform/imr/vo/DrugStatisticVO.java
index f200f40..32a23ce 100644
--- a/src/main/java/digital/laboratory/platform/imr/vo/DrugStatisticVO.java
+++ b/src/main/java/digital/laboratory/platform/imr/vo/DrugStatisticVO.java
@@ -13,12 +13,22 @@ public class DrugStatisticVO {
     @ApiModelProperty(value = "折线图数据")
     private List<List<Object>> lineChartDataList;
 
+    @ApiModelProperty(value = "折线图数据的总和")
+    private Integer lineChartDataSum;
+
+
     @ApiModelProperty(value = "柱状图数据")
     private List<List<Object>> barChartDataList;
 
+    @ApiModelProperty(value = "柱状图数据的总和")
+    private Integer barChartDataSum;
+
     @ApiModelProperty(value = "饼图数据")
     private List<List<Object>> pieChartDataList;
 
+    @ApiModelProperty(value = "饼图数据的总和")
+    private Integer pieChartDataSum;
+
     @ApiModelProperty(value = "树状图数据")
     private String treeChartDateList;
 }