diff --git a/detection/src/main/java/com/njcn/gather/device/pojo/enums/DevResponseEnum.java b/detection/src/main/java/com/njcn/gather/device/pojo/enums/DevResponseEnum.java
index 3a2a8d5a..c9657f4e 100644
--- a/detection/src/main/java/com/njcn/gather/device/pojo/enums/DevResponseEnum.java
+++ b/detection/src/main/java/com/njcn/gather/device/pojo/enums/DevResponseEnum.java
@@ -22,7 +22,7 @@ public enum DevResponseEnum {
     DEV_UN_CHECKED("A001013","装置还未检测完成！" ),
     DEV_UN_REPORT("A001013","装置报告未生成！" ),
     DEVICE_DIS_ERROR("A001014","装置配置异常" ),
-    DEVICE_DELETE("A001015","设备无法删除，已绑定计划！  " )
+    DEVICE_DELETE("A001015","设备无法删除，已绑定计划！" )
 
     ;
 
diff --git a/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java b/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java
index 11273823..7ff740d4 100644
--- a/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java
@@ -161,6 +161,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
             StringBuffer str;
             if (CollUtil.isNotEmpty(collect)) {
                 str = new StringBuffer();
+                str.append("&&");
                 collect.forEach((k, v) -> {
                     str.append(k + ": ");
                     for (int i = 0; i < v.size(); i++) {
@@ -326,16 +327,20 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
             List<Integer> notUnchecked = list.stream().map(PqDev::getCheckState).filter(x -> !x.equals(CheckStateEnum.UNCHECKED.getValue())).distinct().collect(Collectors.toList());
             if (CollUtil.isNotEmpty(notUnchecked)) {
                 List<Integer> unchecked = list.stream().map(PqDev::getCheckState).filter(x -> x.equals(CheckStateEnum.UNCHECKED.getValue())).distinct().collect(Collectors.toList());
+                //计划未检测
                 if (CollUtil.isNotEmpty(unchecked)) {
                     return CheckStateEnum.CHECKING.getValue();
                 }
-                List<Integer> checking = list.stream().map(PqDev::getCheckState).filter(x -> x.equals(CheckStateEnum.CHECKING.getValue())).distinct().collect(Collectors.toList());
+                //计划检测中
+                List<String> checking = list.stream().filter(x -> CheckStateEnum.CHECKING.getValue().equals(x.getCheckState()) ||
+                        CheckStateEnum.CHECKED.getValue().equals(x.getCheckState()) ||
+                        !DevDocumentStateEnum.DOCUMENTED.getValue().equals(x.getReportState())
+                ).map(PqDev::getId).distinct().collect(Collectors.toList());
                 if (checking.size() == notUnchecked.size()) {
                     return CheckStateEnum.CHECKING.getValue();
                 }
-                List<Integer> checked = list.stream().map(PqDev::getCheckState).filter(x -> x.equals(CheckStateEnum.CHECKED.getValue()) ||
-                        x.equals(CheckStateEnum.DOCUMENTED.getValue())
-                ).distinct().collect(Collectors.toList());
+                //检测完成
+                List<Integer> checked = list.stream().map(PqDev::getCheckState).filter(x -> x.equals(CheckStateEnum.DOCUMENTED.getValue())).distinct().collect(Collectors.toList());
                 if (checked.size() == notUnchecked.size()) {
                     return CheckStateEnum.CHECKED.getValue();
                 }