fix

services/data/chart_info.go

@@ -544,6 +544,23 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
 			return
 		}
 
+		if v.IsConvert == 1 {
+			switch v.ConvertType {
+			case 1:
+				for i, data := range dataList {
+					dataList[i].Value = data.Value * v.ConvertValue
+				}
+			case 2:
+				for i, data := range dataList {
+					dataList[i].Value = data.Value / v.ConvertValue
+				}
+			case 3:
+				for i, data := range dataList {
+					dataList[i].Value =  math.Log(data.Value) / math.Log(v.ConvertValue)
+				}
+			}
+		}
+		
 		if diffSeconds != 0 && v.EdbInfoType == 0 {
 			dataListLen := len(dataList)
 			for i := 0; i < dataListLen; i++ {
@@ -589,23 +606,6 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
 				item.DataList = quarterDataList
 			}
 
-			if v.IsConvert == 1 {
-				switch v.ConvertType {
-				case 1:
-					for i, data := range dataList {
-						dataList[i].Value = data.Value * v.ConvertValue
-					}
-				case 2:
-					for i, data := range dataList {
-						dataList[i].Value = data.Value / v.ConvertValue
-					}
-				case 3:
-					for i, data := range dataList {
-						dataList[i].Value =  math.Log(data.Value) / math.Log(v.ConvertValue)
-					}
-				}
-
-			}
 
 			edbDataListMap[v.EdbInfoId] = dataList