From f2749b6b0d666df847ced13e7be15dfff8dd8e76 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 31 May 2021 10:49:57 +0800 Subject: [PATCH] .. --- .../indexcal/impl/IndexCalculateDistrictServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java index 14f443ec4e..dcec17a0c8 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java @@ -238,7 +238,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict List index1SampleValues = new ArrayList<>(); party.forEach(c -> { pid.put(c.getAgencyId(), c.getParentId()); - SampleValue s = new SampleValue(c.getParentId(), c.getScore()); + SampleValue s = new SampleValue(c.getAgencyId(), c.getScore()); index1SampleValues.add(s); }); BigDecimalScoreCalculator sc = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation())); @@ -321,7 +321,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict List index1SampleValues = new ArrayList<>(); avg.forEach(c -> { pid.put(c.getAgencyId(), c.getParentId()); - SampleValue s = new SampleValue(c.getParentId(), c.getScore()); + SampleValue s = new SampleValue(c.getAgencyId(), c.getScore()); index1SampleValues.add(s); }); BigDecimalScoreCalculator sc = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation())); @@ -404,7 +404,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict List index1SampleValues = new ArrayList<>(); serviceAvg.forEach(c -> { pid.put(c.getAgencyId(), c.getParentId()); - SampleValue s = new SampleValue(c.getParentId(), c.getScore()); + SampleValue s = new SampleValue(c.getAgencyId(), c.getScore()); index1SampleValues.add(s); }); IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc1);