Merge remote-tracking branch 'remotes/origin/dev_screen_data' into dev_temp

epmet-module/data-statistical/data-statistical-server/src/test/java/com/epmet/stats/test/normalizing/DemoScoreCal.java

@@ -170,7 +170,7 @@ public class DemoScoreCal {
         List<IndexInputVO> indexInputVOS = Arrays.asList(index1VO, index2VO, index3VO, index4VO);
 
         BatchScoreCalculator batchScoreCalculator = new BatchScoreCalculator();
-        HashMap<String, BigDecimal> result = batchScoreCalculator.getScoreCountOfSampleId(indexInputVOS);
+        HashMap<String, CalculateResult> result = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS);
 
         HashMap<String, CalculateResult> result2 = batchScoreCalculator.getScoreTotalOfSampleId(indexInputVOS);