From 3720316038d2d2e283d9ef3c4385b76c2b4ada34 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 17 二月 2025 15:29:45 +0800
Subject: [PATCH] 冲突

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/13-print/loss-statistics/input/SimulationPrintLossStatisticsInputViewModel.cs |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/13-print/loss-statistics/input/SimulationPrintLossStatisticsInputViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/13-print/loss-statistics/input/SimulationPrintLossStatisticsInputViewModel.cs
index 67d3483..2b345bd 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/13-print/loss-statistics/input/SimulationPrintLossStatisticsInputViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/13-print/loss-statistics/input/SimulationPrintLossStatisticsInputViewModel.cs
@@ -56,7 +56,10 @@
                     var calcuPumpResult = allCalcuVisualDict.GetValue(pump.Code) as HydroCalcuPumpResult;
                     if (calcuPumpResult != null)
                     {
-                        itemForPump.Value += calcuPumpResult.CalcuP.Value * 1000;
+                        if (calcuPumpResult.CalcuP.HasValue)
+                        {
+                            itemForPump.Value += calcuPumpResult.CalcuP.Value * 1000;
+                        }
                     }
                 }
             }

--
Gitblit v1.9.3