This commit is contained in:
caozehui
2025-11-14 10:16:08 +08:00
parent 1df9c8d703
commit 5539cb2887

View File

@@ -1752,8 +1752,8 @@ public class DetectionServiceImpl {
Map<String, List<Double>> validData = this.getValidData(standardDevDataList, desc); Map<String, List<Double>> validData = this.getValidData(standardDevDataList, desc);
if (map.containsKey(TYPE_T)) {
Integer validGroupNum = 0; Integer validGroupNum = 0;
if (map.containsKey(TYPE_T)) {
if (ObjectUtil.isNotNull(validData)) { if (ObjectUtil.isNotNull(validData)) {
List<Double> tValidDataList = validData.get(TYPE_T); List<Double> tValidDataList = validData.get(TYPE_T);
validGroupNum = this.getValidGroupNum(tValidDataList, null, errSysDtls, fData, scale, dataRule); validGroupNum = this.getValidGroupNum(tValidDataList, null, errSysDtls, fData, scale, dataRule);
@@ -1776,7 +1776,13 @@ public class DetectionServiceImpl {
phases.add(TYPE_B); phases.add(TYPE_B);
for (String phase : phases) { for (String phase : phases) {
if (ObjectUtil.isNotNull(validData)) {
List<Double> validDataList = validData.get(phase);
validGroupNum = this.getValidGroupNum(validDataList, null, errSysDtls, fData, scale, dataRule);
}
List<DetectionData> phaseList = rangeComparisonList(map.get(phase).get(0), map.get(phase).get(1), errSysDtls, fData, scale, dataRule); List<DetectionData> phaseList = rangeComparisonList(map.get(phase).get(0), map.get(phase).get(1), errSysDtls, fData, scale, dataRule);
this.setValidGroupNum(phaseList, validGroupNum);
resultFlag.addAll(phaseList); resultFlag.addAll(phaseList);
BiConsumer<ContrastNonHarmonicResult, List<DetectionData>> setter = setters.get(phase); BiConsumer<ContrastNonHarmonicResult, List<DetectionData>> setter = setters.get(phase);
setter.accept(result, phaseList); setter.accept(result, phaseList);