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 94aa6e21..3438cef4 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 @@ -681,7 +681,7 @@ public class DetectionServiceImpl { BigDecimal.valueOf(-errSysDtl.getMaxErrorValue()), BigDecimal.valueOf(errSysDtl.getMaxErrorValue()))).collect(Collectors.toList()); if (CollUtil.isNotEmpty(qualifiedList)) { - data.setRadius(-errSysDtl.getMaxErrorValue()+"-"+errSysDtl.getMaxErrorValue()); + data.setRadius(-errSysDtl.getMaxErrorValue()+"~"+errSysDtl.getMaxErrorValue()); data.setData(qualifiedList.get(0)); switch (dataRule) { case AT_WILL_VALUE: @@ -792,7 +792,7 @@ public class DetectionServiceImpl { 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()))); + + "~" + BigDecimal.valueOf(1.0 / data * (channelData + errSysDtl.getMaxErrorValue()))); switch (dataRule) { case AT_WILL_VALUE: case CP95_VALUE: @@ -819,7 +819,7 @@ public class DetectionServiceImpl { if (0 == errSysDtl.getErrorValueType()) { errSysDtl.setMaxErrorValue(multiply(errSysDtl.getMaxErrorValue(), data, 0)); } - detectionData.setResultData(errSysDtl.getMaxErrorValue()); + detectionData.setResultData(channelData); setDetection(dataRule, list, errSysDtl, detectionData, channelData); } }