提交代码

controllers/statistics_api_controller.go

@@ -327,25 +327,30 @@ func (c *StatisticsApiController) GetDialysisTotalDetail() {
 			weeks := groupByWeek(dates)
 			//var uniqueFields []map[string]interface{}
 			var uniqueFields []map[string]interface{}
-
+			// 加载中国标准时间（UTC+8）
+			chinaLoc, err := time.LoadLocation("Asia/Shanghai")
+			if err != nil {
+				fmt.Println("加载中国时区出错:", err)
+				return
+			}
 			for _, week := range weeks {
-				// 解析字符串时显式指定时区为 UTC
-				t, err := time.Parse("2006-01-02 15:04:05 -0700 MST", week[0].String())
+				// 解析时间字符串并转换为中国标准时间
+				t, err := time.ParseInLocation("2006-01-02 15:04:05 -0700 MST", week[0].String(), chinaLoc)
 				if err != nil {
 					fmt.Println("解析时间出错:", err)
 					return
 				}
-				// 解析字符串时显式指定时区为 UTC
-				t2, err := time.Parse("2006-01-02 15:04:05 -0700 MST", week[len(week)-1].String())
+
+				t2, err := time.ParseInLocation("2006-01-02 15:04:05 -0700 MST", week[len(week)-1].String(), chinaLoc)
 				if err != nil {
 					fmt.Println("解析时间出错:", err)
 					return
 				}
-				//dynamicFields := make([]map[string]interface{}, 0)
+
+				// 获取数据
 				list, _ := service.GetDialysisStats(t.Unix(), t2.Unix(), mode, c.GetAdminUserInfo().CurrentOrgId, time_way)
-				//fmt.Println(aa)
+
 				var dynamicFields []map[string]interface{}
-				//var uniqueFields []map[string]interface{}
 				for _, result := range list {
 					nb := result["日期"].([]byte)
 					name := string(nb)
@@ -408,10 +413,6 @@ func (c *StatisticsApiController) GetDialysisTotalDetail() {
 					if _, ok := seen[value]; !ok {
 						seen[value] = struct{}{}
 						uniqueFields = append(uniqueFields, field)
-
-						//// 对字段进行排序，有值的排在前面
-						//sortedField := sortFieldsByValue(field)
-						//uniqueFields = append(uniqueFields, sortedField)
 					}
 				}
 			}