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 a10e9d41..79b98963 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 @@ -2400,7 +2400,7 @@ public class DetectionServiceImpl { } } } - devMap.forEach((typeKey, typeValue) -> { + standardDevMap.forEach((typeKey, typeValue) -> { typeValue.forEach((key, value) -> { if (CollUtil.isNotEmpty(value)) { List idx = DetectionUtil.sort(value, false); @@ -2409,9 +2409,9 @@ public class DetectionServiceImpl { if (value.size() > 2) { value.remove(idx.get(0)); value.remove(idx.get(idx.size() - 1)); - List newArray = DetectionUtil.getNewArray(standardDevMap.get(typeKey).get(key), idx.subList(1, idx.size() - 1)); - standardDevMap.get(typeKey).get(key).clear(); - standardDevMap.get(typeKey).get(key).addAll(newArray); + List newArray = DetectionUtil.getNewArray(devMap.get(typeKey).get(key), idx.subList(1, idx.size() - 1)); + devMap.get(typeKey).get(key).clear(); + devMap.get(typeKey).get(key).addAll(newArray); } break; case CP95_VALUE: @@ -2420,18 +2420,18 @@ public class DetectionServiceImpl { List newValue = Collections.singletonList(value.get(cp95Idx)); value.clear(); value.addAll(newValue); - Double standardCP95Data = standardDevMap.get(typeKey).get(key).get(cp95Idx); - standardDevMap.get(typeKey).get(key).clear(); - standardDevMap.get(typeKey).get(key).add(standardCP95Data); + Double devCP95Data = devMap.get(typeKey).get(key).get(idx.get(cp95Idx)); + devMap.get(typeKey).get(key).clear(); + devMap.get(typeKey).get(key).add(devCP95Data); } break; case AVG_VALUE: List avgDoubles = DetectionUtil.getAvgDoubles(value); value.clear(); value.addAll(avgDoubles); - List standardAvgData = DetectionUtil.getAvgDoubles(standardDevMap.get(typeKey).get(key)); - standardDevMap.get(typeKey).get(key).clear(); - standardDevMap.get(typeKey).get(key).addAll(standardAvgData); + List devAvgData = DetectionUtil.getAvgDoubles(devMap.get(typeKey).get(key)); + devMap.get(typeKey).get(key).clear(); + devMap.get(typeKey).get(key).addAll(devAvgData); break; } }