diff --git a/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java b/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java index f56d8c0c..4a515a40 100644 --- a/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java @@ -1218,7 +1218,7 @@ public class PqReportServiceImpl extends ServiceImpl i fillHarm(dataModelMap, adHarmonicResult, index, key, 57.74, 100); } if (DetectionCodeEnum.I2_50.getCode().equals(key) || DetectionCodeEnum.SI_1_49.getCode().equals(key)) { - fillHarm(dataModelMap, adHarmonicResult, index, key, 1, 1); + fillHarm(dataModelMap, adHarmonicResult, index, key, 1, 100); } } } @@ -1249,15 +1249,15 @@ public class PqReportServiceImpl extends ServiceImpl i double bBaseValue = baseValue; double cBaseValue = baseValue; - if (!aBase.equals(StrPool.SLASH)) { - aBaseValue = Double.parseDouble(aBase); - } - if (!bBase.equals(StrPool.SLASH)) { - bBaseValue = Double.parseDouble(bBase); - } - if (!cBase.equals(StrPool.SLASH)) { - cBaseValue = Double.parseDouble(cBase); - } +// if (!aBase.equals(StrPool.SLASH)) { +// aBaseValue = Double.parseDouble(aBase); +// } +// if (!bBase.equals(StrPool.SLASH)) { +// bBaseValue = Double.parseDouble(bBase); +// } +// if (!cBase.equals(StrPool.SLASH)) { +// cBaseValue = Double.parseDouble(cBase); +// } dataModelMap.put("${" + index + "#" + key + "#A#2}", devValue(adHarmonicResult.getAValue2(), aBaseValue, percent)); dataModelMap.put("${" + index + "#" + key + "#B#2}", devValue(adHarmonicResult.getBValue2(), bBaseValue, percent)); diff --git a/entrance/src/main/resources/model/report_table.docx b/entrance/src/main/resources/model/report_table.docx index 3e0f9adc..8a521c0b 100644 Binary files a/entrance/src/main/resources/model/report_table.docx and b/entrance/src/main/resources/model/report_table.docx differ