修改单位评分规则计算平均分逻辑

src/main/java/com/keymobile/indicators/service/hytobacco/ScoreRuleService.java

@@ -156,10 +156,10 @@ public class ScoreRuleService {
 				}
 			}
 			//计算平均值
-			String averageValue = CalculateUtils.averageValue(values,0);
+			String averageValue = CalculateUtils.averageValue(values,1);
 			String averageImproveValue = "0.0";
 			if(!improveValues.isEmpty()) {
-				averageImproveValue = CalculateUtils.averageValue(improveValues,0);
+				averageImproveValue = CalculateUtils.averageValue(improveValues,1);
 			}
 			objResult.setScoreValue(averageValue);
 			objResult.setImproveValue(averageImproveValue);
@@ -317,10 +317,10 @@ public class ScoreRuleService {
 			}
 		}
 		//计算平均值
-		String averageValue = CalculateUtils.averageValue(values,0);
+		String averageValue = CalculateUtils.averageValue(values,1);
 		String averageImproveValue = "0.0";
 		if(!improveValues.isEmpty()) {
-			averageImproveValue = CalculateUtils.averageValue(improveValues,0);
+			averageImproveValue = CalculateUtils.averageValue(improveValues,1);
 		}
 		result.put("score", Double.parseDouble(averageValue));
 		result.put("improve", Double.parseDouble(averageImproveValue));