diff --git a/detection/src/main/java/com/njcn/gather/device/service/impl/PqStandardDevServiceImpl.java b/detection/src/main/java/com/njcn/gather/device/service/impl/PqStandardDevServiceImpl.java
index 66dba605..908243ef 100644
--- a/detection/src/main/java/com/njcn/gather/device/service/impl/PqStandardDevServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/device/service/impl/PqStandardDevServiceImpl.java
@@ -67,7 +67,8 @@ public class PqStandardDevServiceImpl extends ServiceImpl<PqStandardDevMapper, P
         wrapper.like(StrUtil.isNotBlank(queryParam.getName()), "name", queryParam.getName())
                 .eq(StrUtil.isNotBlank(queryParam.getManufacturer()), "manufacturer", queryParam.getManufacturer())
                 .eq(StrUtil.isNotBlank(queryParam.getDevType()), "dev_type", queryParam.getDevType())
-                .eq("state", DataStateEnum.ENABLE.getCode());
+                .eq("state", DataStateEnum.ENABLE.getCode())
+                .orderByDesc("create_time");
         return this.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), wrapper);
     }
 
diff --git a/detection/src/main/java/com/njcn/gather/result/controller/ResultController.java b/detection/src/main/java/com/njcn/gather/result/controller/ResultController.java
index f9c624fe..5b39b77f 100644
--- a/detection/src/main/java/com/njcn/gather/result/controller/ResultController.java
+++ b/detection/src/main/java/com/njcn/gather/result/controller/ResultController.java
@@ -198,7 +198,7 @@ public class ResultController extends BaseController {
         String methodDescribe = getMethodDescribe("getCheckItem");
 
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, monitorQueryParam);
-        List<ContrastTestItemVO> result = resultService.getCheckItem(monitorQueryParam.getDevId(),monitorQueryParam.getChnNum(), monitorQueryParam.getNum());
+        List<ContrastTestItemVO> result = resultService.getCheckItem(monitorQueryParam.getPlanId(), monitorQueryParam.getDevId(), monitorQueryParam.getChnNum(), monitorQueryParam.getNum());
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 }
diff --git a/detection/src/main/java/com/njcn/gather/result/pojo/param/MonitorQueryParam.java b/detection/src/main/java/com/njcn/gather/result/pojo/param/MonitorQueryParam.java
index be813533..cfa65cd3 100644
--- a/detection/src/main/java/com/njcn/gather/result/pojo/param/MonitorQueryParam.java
+++ b/detection/src/main/java/com/njcn/gather/result/pojo/param/MonitorQueryParam.java
@@ -15,4 +15,6 @@ public class MonitorQueryParam {
     private Integer num;
 
     private Integer waveNum;
+
+    private String planId;
 }
diff --git a/detection/src/main/java/com/njcn/gather/result/service/IResultService.java b/detection/src/main/java/com/njcn/gather/result/service/IResultService.java
index a34beae0..be21552b 100644
--- a/detection/src/main/java/com/njcn/gather/result/service/IResultService.java
+++ b/detection/src/main/java/com/njcn/gather/result/service/IResultService.java
@@ -119,17 +119,19 @@ public interface IResultService {
     /**
      * 获取检测项
      *
+     * @param planId
      * @param devId
      * @param chnNum
      * @param num
      * @return
      */
-    List<ContrastTestItemVO> getCheckItem(String devId, String chnNum, Integer num);
+    List<ContrastTestItemVO> getCheckItem(String planId, String devId, String chnNum, Integer num);
 
     /**
      * 获取设备比对式结果，用于出比对检测的报告
+     *
      * @param devReportParam 设备报告参数
-     * @param pqDevVO 设备信息 省去一次sql查询
+     * @param pqDevVO        设备信息 省去一次sql查询
      * @return 该设备的比对式结果
      */
     Map<Integer, List<ContrastTestResult>> getContrastResultForReport(DevReportParam devReportParam, PqDevVO pqDevVO);
diff --git a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java
index bb87960b..0e4614f0 100644
--- a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java
@@ -1807,9 +1807,9 @@ public class ResultServiceImpl implements IResultService {
     }
 
     @Override
-    public List<ContrastTestItemVO> getCheckItem(String devId, String chnNum, Integer num) {
-        PqDev dev = pqDevService.getById(devId);
-        AdPlan plan = adPlanService.getById(dev.getPlanId());
+    public List<ContrastTestItemVO> getCheckItem(String planId, String devId, String chnNum, Integer num) {
+//        PqDev dev = pqDevService.getById(devId);
+        AdPlan plan = adPlanService.getById(planId);
         String code = String.valueOf(plan.getCode());
 
         String monitorId = devId + CnSocketUtil.SPLIT_TAG + chnNum;
diff --git a/detection/src/main/java/com/njcn/gather/type/service/impl/DevTypeServiceImpl.java b/detection/src/main/java/com/njcn/gather/type/service/impl/DevTypeServiceImpl.java
index b5370121..f1973f7f 100644
--- a/detection/src/main/java/com/njcn/gather/type/service/impl/DevTypeServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/type/service/impl/DevTypeServiceImpl.java
@@ -40,7 +40,8 @@ public class DevTypeServiceImpl extends ServiceImpl<DevTypeMapper, DevType> impl
     @Override
     public List<DevType> listAll() {
         LambdaQueryWrapper<DevType> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(DevType::getState, DataStateEnum.ENABLE.getCode());
+        queryWrapper.eq(DevType::getState, DataStateEnum.ENABLE.getCode())
+                .orderByAsc(DevType::getName);
         List<DevType> devTypes = this.baseMapper.selectList(queryWrapper);
         return devTypes;
     }