From 25559996ab51a5a95ffef5a05641b6f46f16934c Mon Sep 17 00:00:00 2001
From: keke <oogff07@gmail.com>
Date: Thu, 7 Sep 2023 14:18:39 +0800
Subject: [PATCH] =?UTF-8?q?[FE=20API]=20=E4=BF=AE=E6=94=B9=E5=90=84?=
 =?UTF-8?q?=E7=9B=A4=E7=B8=BD=E7=9B=A4=E5=A0=B1=E8=A1=A8=20=E5=8C=AF?=
 =?UTF-8?q?=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FrontendWebApi/ApiControllers/HydroMeterController.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/FrontendWebApi/ApiControllers/HydroMeterController.cs b/FrontendWebApi/ApiControllers/HydroMeterController.cs
index 6904700..50f94f5 100644
--- a/FrontendWebApi/ApiControllers/HydroMeterController.cs
+++ b/FrontendWebApi/ApiControllers/HydroMeterController.cs
@@ -841,6 +841,7 @@ namespace FrontendWebApi.ApiControllers
             bool total_flag = false;
             if (input.Mode == HydroMeterInputSearchMode.Custom)
             {
+                input.Mode = HydroMeterInputSearchMode.All;
                 result_for_sum = ElectricListEachTotal(input).Result.Value.Data.ToList();
                 flag = false;
                 total_flag = true;
@@ -1038,11 +1039,16 @@ namespace FrontendWebApi.ApiControllers
                     {
                         flag = false;
                     }
+                    if (r.device_full_name == "綜合大樓總盤")
+                    {
+                        continue;
+                    }
                     string buildingName = r.building_name;
                     string floorTag = r.floor_tag;
                     string deviceFullName = r.device_full_name;
                     columnIndex = 0;
                     
+                    // 這兩個盤不納入該棟總計
                     if (last_device == "電機館分盤" || last_device == "薄膜分盤")
                     {
                         flag = false;