diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java
index d0ead32f10..e189b67497 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java
@@ -213,12 +213,12 @@ public class ChartDataManage {
                     || ("antv".equalsIgnoreCase(view.getRender()) && "line".equalsIgnoreCase(view.getType()))
                     || StringUtils.equalsIgnoreCase(view.getType(), "flow-map")
                     || StringUtils.equalsIgnoreCase(view.getType(), "sankey")
-                    || StringUtils.equalsIgnoreCase(view.getType(), "chart-mix")
+                    || StringUtils.containsIgnoreCase(view.getType(), "chart-mix")
             ) {
                 xAxis.addAll(xAxisExt);
             }
             yAxis = new ArrayList<>(view.getYAxis());
-            if (StringUtils.equalsIgnoreCase(view.getType(), "chart-mix")
+            if (StringUtils.containsIgnoreCase(view.getType(), "chart-mix")
                     || StringUtils.equalsIgnoreCase(view.getType(), "bidirectional-bar")
                     || StringUtils.equalsIgnoreCase(view.getType(), "quadrant")
                     || StringUtils.containsIgnoreCase(view.getType(), "progress-bar")) {
diff --git a/core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java b/core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java
index bebc020abe..73ee299154 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java
@@ -596,7 +596,9 @@ public class ChartDataBuild {
                 series.get(j).getData().add(axisChartDataDTO);
             }
         }
-        series.get(0).setCategories(categories);
+        if (CollectionUtils.isNotEmpty(series)) {
+            series.get(0).setCategories(categories);
+        }
 
         map.put("data", series);
         return map;
@@ -685,9 +687,9 @@ public class ChartDataBuild {
 
             series.get(j).getData().add(axisChartDataDTO);
         }
-
-        series.get(0).setCategories(categories);
-
+        if (CollectionUtils.isNotEmpty(series)) {
+            series.get(0).setCategories(categories);
+        }
 
         map.put("data", series);
         return map;