Merge branch 'eta_2.6.1_forecast_year_on_year_diff' into debug

services/data/predict_edb_info_rule.go

@@ -1613,6 +1613,7 @@ func GetChartPredictEdbInfoDataListByRuleDynamicYOYComparisonOrDifference(ruleTy
 			if replaceValue, replaceOk := getReplaceValue(existMap, 35, 1,-1, preDate); !replaceOk {
 				continue
 			} else {
+				fmt.Println(replaceValue)
 				baseDynamicDataList[preDateStr] = replaceValue
 				predictDayList = append(predictDayList, date)
 			}
@@ -1624,9 +1625,13 @@ func GetChartPredictEdbInfoDataListByRuleDynamicYOYComparisonOrDifference(ruleTy
 	for k, currentDate := range predictDayList {
 		var calculateValue decimal.Decimal
 		var dateStr = currentDate.Format(utils.FormatDate)
-		if _, ok := DynamicCalculateDataList[dateStr]; ok {
+		_, dynamicVal := DynamicCalculateDataList[dateStr];
+		_, baseVal := baseDynamicDataList[dateStr];
+		if dynamicVal && baseVal{
 			switch ruleType {
 			case 17:
+				fmt.Println(baseDynamicDataList[dateStr])
+				fmt.Println(DynamicCalculateDataList[dateStr])
 				calculateValue = baseDynamicDataList[dateStr].Mul(DynamicCalculateDataList[dateStr].Add(decimal.NewFromInt(1)))
 			case 18:
 				calculateValue = baseDynamicDataList[dateStr].Add(DynamicCalculateDataList[dateStr])