hsun 1 rok pred
rodič
commit
283ba790c4

+ 5 - 5
services/data/cross_variety/chart.go

@@ -343,10 +343,10 @@ func GetChartData(chartInfoId int, config request.ChartConfigReq) (edbList []*da
 					}
 					if !date.Before(earliestDate) && !date.After(endDate) {
 						bigN += 1
-					}
-					dateVal := decimal.NewFromFloat(dataList[i].Value)
-					if dateVal.LessThanOrEqual(lastVal) {
-						tinyN += 1
+						dateVal := decimal.NewFromFloat(dataList[i].Value)
+						if dateVal.LessThanOrEqual(lastVal) {
+							tinyN += 1
+						}
 					}
 				}
 				// N=1时说明计算无效
@@ -355,7 +355,7 @@ func GetChartData(chartInfoId int, config request.ChartConfigReq) (edbList []*da
 				}
 				numerator := decimal.NewFromInt(int64(tinyN - 1))
 				denominator := decimal.NewFromInt(int64(bigN - 1))
-				percentVal, _ = numerator.Div(denominator).Round(4).Float64()
+				percentVal, _ = numerator.Div(denominator).Mul(decimal.NewFromFloat(100)).Round(4).Float64()
 			}
 
 			// key的生成(日期配置下标+指标id)

+ 1 - 1
services/data/line_feature/chart_info.go

@@ -183,7 +183,7 @@ func GetPercentileData(chartInfoId int, startDate, endDate string, mappingInfo *
 			}
 			numerator := decimal.NewFromInt(int64(tinyN - 1))
 			denominator := decimal.NewFromInt(int64(bigN - 1))
-			percentVal, _ := numerator.Div(denominator).Round(4).Float64()
+			percentVal, _ := numerator.Div(denominator).Mul(decimal.NewFromFloat(100)).Round(4).Float64()
 
 			// 写进数组并判断指标最大最小值
 			newDataList = append(newDataList, data_manage.EdbDataList{