..

services/data/chart_info.go

@@ -1122,19 +1122,17 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
 	startTmpT, _ := time.Parse(utils.FormatDate, startTmp)*/
 
 	fmt.Println("横轴截取日" + startTmpT.Format(utils.FormatDate) + " " + endTmpT.Format(utils.FormatDate))
+	fmt.Printf("lastDateT.Year() 为%d \n", lastDateT.Year())
+	fmt.Printf("maxY 为%d \n", maxY)
 	for name, dateItem := range dataMap {
 		tY := dateItem.EndDate.Year()
 		if lastDateT.Month() >= 11 {
-			if tY < maxY {
+			if maxY > endTmpT.Year() {
 				tY = tY + 1
 			}
 		}
 		lv, ok1 := yearDataListMap[tY]
 		fmt.Printf("name %s yearDataListMap[%d]\n", name, tY)
-		/*if changeFlag {
-			lv, ok1 = yearDataListMap[dateItem.StartDate.Year()]
-			fmt.Printf("name change %s yearDataListMap[%d]\n", name, dateItem.StartDate.Year())
-		}*/
 		if !ok1 {
 			continue
 		}