From e2ecf7bb04f0bdeb622729c26fff32a2c4c66fda Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Mon, 17 Feb 2025 11:25:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=97=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../line/RMpMonitorEvaluateDServiceImpl.java  | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpMonitorEvaluateDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpMonitorEvaluateDServiceImpl.java
index 4cd2ffb46..c5bce4146 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpMonitorEvaluateDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpMonitorEvaluateDServiceImpl.java
@@ -155,15 +155,18 @@ public class RMpMonitorEvaluateDServiceImpl extends MppServiceImpl<RMpMonitorEva
                     freqCount++;
                 }
                 /*，监测点的接线方式，如果是星形接线这个指标要判断，角形界面则不判断，默认它是正常的*/
-                if (Objects.equals("0", data.getPtType())) {
-                    if (rmsLimit.getLowerLimit() * (voltage / 1.732) <= rmsMin && rmsMax <= rmsLimit.getUpperLimit() * (voltage / 1.732)) {
-                        phaseVoltageCount++;
-                        rmsflag = true;
-                    }
-                } else {
-                    rmsflag = true;
-                    phaseVoltageCount++;
-                }
+                //河北没有线电压修改成先改成全部都是有效的线电压
+                phaseVoltageCount++;
+                rmsflag = true;
+//                if (Objects.equals("0", data.getPtType())) {
+//                    if (rmsLimit.getLowerLimit() * (voltage / 1.732) <= rmsMin && rmsMax <= rmsLimit.getUpperLimit() * (voltage / 1.732)) {
+//                        phaseVoltageCount++;
+//                        rmsflag = true;
+//                    }
+//                } else {
+//                    rmsflag = true;
+//                    phaseVoltageCount++;
+//                }
                 if (Objects.equals("1", data.getPtPhaseType())) {
                     if (rms_lvrLimit.getLowerLimit() * voltage <= rmsLvrMin && rmsLvrMax <= rms_lvrLimit.getUpperLimit() * voltage) {
                         lineVoltageCount++;