From bb113720bca7e93f8c9ebd75e2f6b1dc27dd0ffe Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Mon, 6 Jan 2025 10:43:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E6=A3=80=E6=B5=8B=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detection/service/impl/DetectionServiceImpl.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java b/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java
index aa38294c..b1c38fe3 100644
--- a/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java
@@ -580,7 +580,7 @@ public class DetectionServiceImpl {
                 if (ObjectUtil.isNull(value.getIsData())) {
                     idField.set(harmonicResult, value.getData());
                 } else {
-                    idField.set(harmonicResult,JSON.toJSONString(value));
+                    idField.set(harmonicResult, JSON.toJSONString(value));
                 }
             } catch (IllegalAccessException e) {
                 throw new RuntimeException(e);
@@ -682,8 +682,8 @@ public class DetectionServiceImpl {
                 .filter(x -> NumberUtil.isIn(devSubtractChannelData(x, v, errSysDtl.getErrorValueType()),
                         BigDecimal.valueOf(-errSysDtl.getMaxErrorValue()),
                         BigDecimal.valueOf(errSysDtl.getMaxErrorValue()))).collect(Collectors.toList());
+        data.setRadius(-errSysDtl.getMaxErrorValue() + "~" + errSysDtl.getMaxErrorValue());
         if (CollUtil.isNotEmpty(qualifiedList)) {
-            data.setRadius(-errSysDtl.getMaxErrorValue()+"~"+errSysDtl.getMaxErrorValue());
             data.setData(qualifiedList.get(0));
             switch (dataRule) {
                 case AT_WILL_VALUE:
@@ -791,10 +791,10 @@ public class DetectionServiceImpl {
                                 BigDecimal.valueOf(1.0 / data * (channelData + errSysDtl.getMaxErrorValue())))
                         ).collect(Collectors.toList());
                 detectionData.setResultData(BigDecimal.valueOf(1.0 / data).doubleValue() * channelData);
+                detectionData.setRadius(BigDecimal.valueOf(1.0 / data * (channelData - errSysDtl.getMaxErrorValue()))
+                        + "~" + BigDecimal.valueOf(1.0 / data * (channelData + errSysDtl.getMaxErrorValue())));
                 if (CollUtil.isNotEmpty(qualifiedList)) {
                     detectionData.setData(qualifiedList.get(0));
-                    detectionData.setRadius(BigDecimal.valueOf(1.0 / data * (channelData - errSysDtl.getMaxErrorValue()))
-                            + "~" + BigDecimal.valueOf(1.0 / data * (channelData + errSysDtl.getMaxErrorValue())));
                     switch (dataRule) {
                         case AT_WILL_VALUE:
                         case CP95_VALUE: