残差分析bug修改

services/residual_analysis_service/residual_analysis_service.go

@@ -21,6 +21,9 @@ func ResidualAnalysisPreview(req residual_analysis_model.ResidualAnalysisReq) (r
 
 	var edbInfoMappingA, edbInfoMappingB *data_manage.ChartEdbInfoMapping
 	for _, v := range mappingList {
+		if v.Unit == "无" {
+			v.Unit = ""
+		}
 		if v.EdbInfoId == req.EdbInfoIdA {
 			edbInfoMappingA = v
 		}
@@ -283,6 +286,9 @@ func fillMappingChartInfo(req residual_analysis_model.ResidualAnalysisReq, edbIn
 	}
 
 	// 指标B数据补充
+	// 新建一个切片来保存补充的数据
+	var replenishDataList []*data_manage.EdbDataList
+
 	for index := 0; index < len(dataList)-1; index++ {
 		// 获取当前数据和下一个数据
 		beforeIndexData := dataList[index]
@@ -297,11 +303,16 @@ func fillMappingChartInfo(req residual_analysis_model.ResidualAnalysisReq, edbIn
 				Value:         beforeIndexData.Value,
 			}
 
-			// 将补充数据插入到数据列表
-			dataList = append(dataList, &replenishIndexData)
+			// 将补充数据加入补充数据列表
+			replenishDataList = append(replenishDataList, &replenishIndexData)
 		}
 	}
 
+	// 将补充数据插入原始数据列表
+	dataList = append(dataList, replenishDataList...)
+
+	// 排序
+
 	// 拟合残差 计算a,b
 	var coordinateList []utils.Coordinate
 	if req.ResidualType == 2 {