diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java index 1041b18..8dcc790 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiElectricalHandler.java @@ -321,19 +321,14 @@ map.put("zeroSeq", (titleIndex++) + "."); } //如果是功能校准源,则进行一下删除 - if (measureItemInfo.getItemCategoryName().contains("数字式接地电阻表")) { - Map> measureDataMap = measureItemInfo.getMeasureDataElectricalSafetyList().stream().collect( - Collectors.groupingBy(BizBusinessDeviceMeasureDataElectricalSafety::getDataType) - ); - titleIndex = checkRemoveItem(measureDataMap, "1", map, "firstSeq", titleIndex, dataItems, startIndex + 1, "示值误差"); - checkRemoveItem(measureDataMap, "2", map, "secondSeq", titleIndex, dataItems, startIndex + 2, "辅助接地电阻"); - } else {//其他检查项 - Map> measureDataMap = measureItemInfo.getMeasureDataElectricalSafetyList().stream().collect( - Collectors.groupingBy(BizBusinessDeviceMeasureDataElectricalSafety::getDataType) - ); - titleIndex = checkRemoveItem(measureDataMap, "1", map, "firstSeq", titleIndex, dataItems, startIndex, "开路电压"); - checkRemoveItem(measureDataMap, "2", map, "secondSeq", titleIndex, dataItems, startIndex + 1, "示值误差"); - } + Map> measureDataMap = measureItemInfo.getMeasureDataElectricalSafetyList().stream().collect( + Collectors.groupingBy(BizBusinessDeviceMeasureDataElectricalSafety::getDataType) + ); + titleIndex = checkRemoveItem(measureDataMap, "1", map, "firstSeq", titleIndex, dataItems, startIndex, + measureItemInfo.getItemCategoryName().contains("数字式接地电阻表") ? "示值误差" : "开路电压"); + checkRemoveItem(measureDataMap, "2", map, "secondSeq", titleIndex, dataItems, startIndex + 1, + measureItemInfo.getItemCategoryName().contains("数字式接地电阻表") ? "辅助接地电阻" : + "示值误差"); return dataItems; }