diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlGenerateUtils.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlGenerateUtils.java
index eb734f1c4..3bf97a5c3 100644
--- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlGenerateUtils.java
+++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlGenerateUtils.java
@@ -274,11 +274,17 @@ public class SqlGenerateUtils {
         return modelBizName + UNDERLINE + executorConfig.getInternalMetricNameSuffix();
     }
 
-    public String generateDerivedMetric(final List<MetricSchemaResp> metricResps,
-            final Set<String> allFields, final Map<String, Measure> allMeasures,
-            final List<DimSchemaResp> dimensionResps, final String expression,
-            final MetricDefineType metricDefineType, AggOption aggOption, Set<String> visitedMetric,
-            Set<String> measures, Set<String> dimensions) {
+    public String generateDerivedMetric(
+            final List<MetricSchemaResp> metricResps,
+            final Set<String> allFields,
+            final Map<String, Measure> allMeasures,
+            final List<DimSchemaResp> dimensionResps,
+            final String expression,
+            final MetricDefineType metricDefineType,
+            AggOption aggOption,
+            Map<String, String> visitedMetric,
+            Set<String> measures,
+            Set<String> dimensions) {
         Set<String> fields = SqlSelectHelper.getColumnFromExpr(expression);
         if (!CollectionUtils.isEmpty(fields)) {
             Map<String, String> replace = new HashMap<>();
@@ -288,15 +294,24 @@ public class SqlGenerateUtils {
                         Optional<MetricSchemaResp> metricItem = metricResps.stream()
                                 .filter(m -> m.getBizName().equalsIgnoreCase(field)).findFirst();
                         if (metricItem.isPresent()) {
-                            if (visitedMetric.contains(field)) {
+                            if (visitedMetric.keySet().contains(field)) {
+                                replace.put(field, visitedMetric.get(field));
                                 break;
                             }
-                            replace.put(field,
-                                    generateDerivedMetric(metricResps, allFields, allMeasures,
-                                            dimensionResps, getExpr(metricItem.get()),
-                                            metricItem.get().getMetricDefineType(), aggOption,
-                                            visitedMetric, measures, dimensions));
-                            visitedMetric.add(field);
+                            replace.put(
+                                    field,
+                                    generateDerivedMetric(
+                                            metricResps,
+                                            allFields,
+                                            allMeasures,
+                                            dimensionResps,
+                                            getExpr(metricItem.get()),
+                                            metricItem.get().getMetricDefineType(),
+                                            aggOption,
+                                            visitedMetric,
+                                            measures,
+                                            dimensions));
+                            visitedMetric.put(field, replace.get(field));
                         }
                         break;
                     case MEASURE:
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryReqConverter.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryReqConverter.java
index 7bdbc1fb2..faea0945a 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryReqConverter.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryReqConverter.java
@@ -317,7 +317,7 @@ public class QueryReqConverter {
         });
         Set<String> deriveDimension = new HashSet<>();
         Set<String> deriveMetric = new HashSet<>();
-        Set<String> visitedMetric = new HashSet<>();
+        Map<String, String> visitedMetric = new HashMap<>();
         if (!CollectionUtils.isEmpty(metricResps)) {
             for (MetricResp metricResp : metricResps) {
                 if (metrics.contains(metricResp.getBizName())) {