From fd6ec7bdf2eae963bf4c4cd4f79ac4a8406f0a0b Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Mon, 19 Jan 2026 13:36:36 +0800
Subject: [PATCH] =?UTF-8?q?word=E6=8A=A5=E8=A1=A8bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MonitorHarmonicReportServiceImpl.java     | 56 ++++++++++++++-----
 1 file changed, 41 insertions(+), 15 deletions(-)

diff --git a/pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/service/impl/MonitorHarmonicReportServiceImpl.java b/pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/service/impl/MonitorHarmonicReportServiceImpl.java
index 63952d924..74d99249a 100644
--- a/pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/service/impl/MonitorHarmonicReportServiceImpl.java
+++ b/pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/service/impl/MonitorHarmonicReportServiceImpl.java
@@ -582,7 +582,33 @@ public class MonitorHarmonicReportServiceImpl implements MonitorHarmonicReportSe
 
         // 获取电压偏差
         // 值错误判断
-        try {
+        for (int i = 0; i < 3; i++) {
+            switch (i) {
+                case 0:
+                    tmpstrMap = "A";
+                    break;
+                case 1:
+                    tmpstrMap = "B";
+                    break;
+                default:
+                    tmpstrMap = "C";
+                    break;
+            }
+            ReportValue vdeviation = this.listVdeviation.get(0).getList().get(i);
+            if (Objects.equals("C", tmpstrMap) && pttype == 2) {
+                reportmap.put("$VDTX_C$", "-");
+                reportmap.put("$VDTN_C$", "-");
+                reportmap.put("$VDTE_C$", "-");
+                reportmap.put("$VDT%_C$", "-");
+                continue;
+            } else {
+                reportmap.put("$VDTX_" + tmpstrMap + "$", judgeNull(vdeviation.getFmaxValue()));
+                reportmap.put("$VDTN_" + tmpstrMap + "$", judgeNull(vdeviation.getMinValue()));
+                reportmap.put("$VDTE_" + tmpstrMap + "$", judgeNull(vdeviation.getMeanValue()));
+                reportmap.put("$VDT%_" + tmpstrMap + "$", judgeNull(vdeviation.getCp95Value()));
+            }
+        }
+            try {
             for (int i = 0; i < 3; i++) {
                 switch (i) {
                     case 0:
@@ -595,19 +621,19 @@ public class MonitorHarmonicReportServiceImpl implements MonitorHarmonicReportSe
                         tmpstrMap = "C";
                         break;
                 }
-                ReportValue vdeviation = this.listVdeviation.get(0).getList().get(i);
-                if(Objects.equals("C",tmpstrMap)&&pttype == 2){
-                    reportmap.put("$VDTX_C$", "-");
-                    reportmap.put("$VDTN_C$", "-");
-                    reportmap.put("$VDTE_C$", "-");
-                    reportmap.put("$VDT%_C$", "-");
-                    continue;
-                }else {
-                    reportmap.put("$VDTX_" + tmpstrMap + "$", judgeNull(vdeviation.getFmaxValue()));
-                    reportmap.put("$VDTN_" + tmpstrMap + "$", judgeNull(vdeviation.getMinValue()));
-                    reportmap.put("$VDTE_" + tmpstrMap + "$", judgeNull(vdeviation.getMeanValue()));
-                    reportmap.put("$VDT%_" + tmpstrMap + "$", judgeNull(vdeviation.getCp95Value()));
-                }
+//                ReportValue vdeviation = this.listVdeviation.get(0).getList().get(i);
+//                if(Objects.equals("C",tmpstrMap)&&pttype == 2){
+//                    reportmap.put("$VDTX_C$", "-");
+//                    reportmap.put("$VDTN_C$", "-");
+//                    reportmap.put("$VDTE_C$", "-");
+//                    reportmap.put("$VDT%_C$", "-");
+//                    continue;
+//                }else {
+//                    reportmap.put("$VDTX_" + tmpstrMap + "$", judgeNull(vdeviation.getFmaxValue()));
+//                    reportmap.put("$VDTN_" + tmpstrMap + "$", judgeNull(vdeviation.getMinValue()));
+//                    reportmap.put("$VDTE_" + tmpstrMap + "$", judgeNull(vdeviation.getMeanValue()));
+//                    reportmap.put("$VDT%_" + tmpstrMap + "$", judgeNull(vdeviation.getCp95Value()));
+//                }
 
 
                 // 电压偏差
@@ -684,7 +710,7 @@ public class MonitorHarmonicReportServiceImpl implements MonitorHarmonicReportSe
 //        }
 
         // 假如为空则所有的都满足
-        if ("".equals(tmpstrResultVdeviationdata)) {
+        if ("".equals(tmpstrResultVdeviationdata)&&"".equals(strResultVdeviationdataValue)) {
             strResultVdeviationdata += "从上表中可以看出" + strLineBaseName + "A、B、C三相电压偏差满足国标限值（"+ldeviationLimit+"%至"+vdeviationLimit+"%）的要求。";
         } else {
             strAnalysis += tmpstrResultVdeviationdata + "电压偏差不满足国标限值（"+vdeviationLimit+"）的要求。";