Merge remote-tracking branch 'origin/bugfix_5604' into debug

controllers/data_manage/chart_info.go

@@ -1463,7 +1463,7 @@ func (this *ChartInfoController) PreviewChartInfoDetail() {
 					value, err := data.MarkerLineCalculate(markerLines[i], edbList[0].DataList, chartInfo)
 					if err != nil {
 						br.Msg = "标识线配置异常"
-						br.ErrMsg = "标识线配置异常" + err.Error()
+						br.ErrMsg = "标识线配置异常," + err.Error()
 						return
 					}
 					markerLines[i].Value = value

services/data/chart_info.go

@@ -4386,6 +4386,10 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 
 			for _, v := range dataTimeMap {
 				valueList := dataTimeValueMap[v]
+				if len(valueList) <= 0 {
+					err = errors.New(`数据为空`)
+					return
+				}
 				stdev := utils.CalculateStandardDeviation(valueList)
 				stdev, _ = decimal.NewFromFloat(stdev).Round(4).Float64()
 
@@ -4613,6 +4617,10 @@ func MarkerLineCalculate(markerLine data_manage.MarkersLine, dataList interface{
 					}
 				}
 				averge = averge / float64(length)
+				if len(faloatList) <= 0 {
+					err = errors.New(`数据为空`)
+					return
+				}
 				stdev := utils.CalculateStandardDeviation(faloatList)
 				stdev, _ = decimal.NewFromFloat(stdev).Round(4).Float64()
 
@@ -4664,6 +4672,10 @@ func MarkerLineCalculate(markerLine data_manage.MarkersLine, dataList interface{
 			}
 			averge = averge / float64(length)
 
+			if len(floatList) <= 0 {
+				err = errors.New(`数据为空`)
+				return
+			}
 			stdev := utils.CalculateStandardDeviation(floatList)
 			stdev, _ = decimal.NewFromFloat(stdev).Round(4).Float64()