diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/HeadlessQueryEngineImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/HeadlessQueryEngineImpl.java
index 4f14be034..128b2ccfd 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/HeadlessQueryEngineImpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/HeadlessQueryEngineImpl.java
@@ -99,10 +99,11 @@ public class HeadlessQueryEngineImpl implements HeadlessQueryEngine {
     }
 
     private HeadlessModel getHeadLessModel(QueryStatement queryStatement) throws Exception {
-        HeadlessModel headlessModel = headlessSchemaManager.get(queryStatement.getQueryStructReq().getModelIdStr());
-        ItemDateResp itemDateResp = queryStructUtils.getItemDateResp(queryStatement.getQueryStructReq());
+        QueryStructReq queryStructReq = queryStatement.getQueryStructReq();
+        HeadlessModel headlessModel = headlessSchemaManager.get(queryStructReq.getModelIdStr());
+        ItemDateResp itemDateResp = queryStructUtils.getItemDateResp(queryStructReq);
         headlessModel.setDataDate(itemDateResp);
-        List<ModelSchemaResp> modelSchemaResps = catalog.getModelSchema(queryStatement.getModelIds());
+        List<ModelSchemaResp> modelSchemaResps = catalog.getModelSchema(queryStructReq.getModelIds());
         headlessModel.setModelSchemaResps(modelSchemaResps);
         return headlessModel;
     }
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java
index 738c9a14d..47db9df09 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java
@@ -235,10 +235,14 @@ public class MetricServiceImpl implements MetricService {
 
     @Override
     public MetricResp getMetric(Long id, User user) {
-        MetricResp metricResp = getMetric(id);
-        if (metricResp == null) {
+        MetricDO metricDO = metricRepository.getMetricById(id);
+        if (metricDO == null) {
             return null;
         }
+        Map<Long, ModelResp> modelMap = modelService.getModelMap();
+        List<CollectDO> collectList = collectService.getCollectList(user.getName());
+        List<Long> collect = collectList.stream().map(CollectDO::getCollectId).collect(Collectors.toList());
+        MetricResp metricResp = MetricConverter.convert2MetricResp(metricDO, modelMap, collect);
         fillAdminRes(Lists.newArrayList(metricResp), user);
         return metricResp;
     }