Merge branch 'bugfix_5669' into custom

services/data/chart_info.go

@@ -4210,7 +4210,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 					newDate := dateTime.AddDate(time.Now().Year()-dateTime.Year(), 0, 0)
 					// 处理均值
 					if value, ok := valueMap[newDate]; ok {
-						valueMap[newDate] = (handleDataMap[date] + value) / 2
+						valueMap[newDate] = handleDataMap[date] + value
 					} else {
 						valueMap[newDate] = handleDataMap[date]
 					}
@@ -4219,10 +4219,11 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 				}
 			}
 
+			year := float64(seasonConfig.SamePeriodAverage.Year)
 			for _, v := range dataTimeMap {
 				averageItem := &data_manage.SamePeriodAverageData{}
 				if value, ok := valueMap[v]; ok {
-					averageItem.Value = value
+					averageItem.Value = value / year
 				}
 				averageItem.DataTime = v.Format(utils.FormatDate)
 				averageItem.DataTimestamp = v.UnixNano() / 1e6