From 7fd1563f3a7d5cb78bc9c63549b39d034f51ebec Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Thu, 25 Jun 2026 09:35:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gather/result/service/impl/ResultServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java index dc5d943e..38dbfe10 100644 --- a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java @@ -462,13 +462,13 @@ public class ResultServiceImpl implements IResultService { dtlType.setScriptType(scriptDtlIndexList.get(0).getScriptType()); dtlType.setScriptTypeCode(subKey); if ("Many-Vol-Harm-InHarm".equals(subKey)) { - volAndharmAndInHarmScriptTypeName(scriptDtlIndexList, dictTree, isValueType, dtlType); + volAndHarmAndInHarmScriptTypeName(scriptDtlIndexList, dictTree, isValueType, dtlType); } if ("Many-IMBV-Harm-InHarm".equals(subKey)) { imbvAndHarmAndInHarmScriptTypeName(scriptDtlIndexList, dictTree, isValueType, dtlType); } - if ("Many-Vol-Harm-InHarm".equals(subKey)) { - volAndHarmAndInHarmScriptTypeName(scriptDtlIndexList, dictTree, isValueType, dtlType); + if ("Many-Freq-Harm-InHarm".equals(subKey)) { + freqAndHarmAndInHarmScriptTypeName(scriptDtlIndexList, dictTree, isValueType, dtlType); } dtlType.setSourceDesc(ScriptDtlsDesc.getStringBuffer(scriptDtlIndexList, false, isValueType).toString()); if (finalResultMap.containsKey(index)) { @@ -1024,7 +1024,7 @@ public class ResultServiceImpl implements IResultService { } } - private void volAndharmAndInHarmScriptTypeName(List dtls, DictTree dictTree, Boolean isValueType, TreeDataVO dtlType) { + private void volAndHarmAndInHarmScriptTypeName(List dtls, DictTree dictTree, Boolean isValueType, TreeDataVO dtlType) { ResultUnitEnum resultUnitEnumByCode = ResultUnitEnum.getResultUnitEnumByCode(dictTree.getCode()); List f = dtls.stream().filter(x -> "Freq".equals(x.getValueType())).collect(Collectors.toList()); String unit; @@ -1185,7 +1185,7 @@ public class ResultServiceImpl implements IResultService { } } - private void volAndHarmAndInHarmScriptTypeName(List dtls, DictTree dictTree, Boolean isValueType, TreeDataVO dtlType) { + private void freqAndHarmAndInHarmScriptTypeName(List dtls, DictTree dictTree, Boolean isValueType, TreeDataVO dtlType) { ResultUnitEnum resultUnitEnumByCode = ResultUnitEnum.getResultUnitEnumByCode(dictTree.getCode()); switch (resultUnitEnumByCode) { /**