Merge branch 'feature/eta1.9.5_feature_good' into debug

# Conflicts:
#	services/data/future_good/profit_chart_info.go

services/data/future_good/profit_chart_info.go

@@ -330,6 +330,7 @@ func ProfitChartChartData(baseEdbInfo *data_manage.EdbInfo, baseDataListMap map[
 			//tmpN := (currDate.Year()-findDateTime.Year())*12 + int(currDate.Month()-findDateTime.Month())
 			// 用实际日期的月份作为基准，往前推12个月（2024-5-13 16:26:43修改）
 			tmpN := (currDate.Year()-realDateTime.Year())*12 + int(currDate.Month()-realDateTime.Month())
+			fmt.Println(tmpN)
 			if tmpN <= 0 {
 				continue
 			}
@@ -639,7 +640,7 @@ func handleProfitResultData(xDataListInit []data_manage.XData, baseEdbInfo *data
 		}
 	}
 
-	maxI := len(allEdbInfoIds)
+	maxI := 0
 	for _, yData := range newYDataList {
 		lenEdb := len(yData.XEdbInfoIdList)
 		for i := 0; i < lenEdb; i++ {
@@ -652,7 +653,7 @@ func handleProfitResultData(xDataListInit []data_manage.XData, baseEdbInfo *data
 	}
 
 	earliestDateTime = time.Date(earliestDateTime.Year(), earliestDateTime.Month(), 1, 0, 0, 0, 0, time.Local)
-	xDataList = xDataList[0:maxI]
+	xDataList = xDataList[0 : maxI+1]
 	for yIndex, yData := range newYDataList {
 		if len(yData.XEdbInfoIdList) > maxI+1 {
 			newYDataList[yIndex].XEdbInfoIdList = yData.XEdbInfoIdList[0 : maxI+1]