微调
This commit is contained in:
@@ -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<PqScriptDtls> dtls, DictTree dictTree, Boolean isValueType, TreeDataVO dtlType) {
|
||||
private void volAndHarmAndInHarmScriptTypeName(List<PqScriptDtls> dtls, DictTree dictTree, Boolean isValueType, TreeDataVO dtlType) {
|
||||
ResultUnitEnum resultUnitEnumByCode = ResultUnitEnum.getResultUnitEnumByCode(dictTree.getCode());
|
||||
List<PqScriptDtls> 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<PqScriptDtls> dtls, DictTree dictTree, Boolean isValueType, TreeDataVO dtlType) {
|
||||
private void freqAndHarmAndInHarmScriptTypeName(List<PqScriptDtls> dtls, DictTree dictTree, Boolean isValueType, TreeDataVO dtlType) {
|
||||
ResultUnitEnum resultUnitEnumByCode = ResultUnitEnum.getResultUnitEnumByCode(dictTree.getCode());
|
||||
switch (resultUnitEnumByCode) {
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user