diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index cac583c..fc742ef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -58,7 +58,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "wp";
+            username = "dtt";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index cac583c..fc742ef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -58,7 +58,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "wp";
+            username = "dtt";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
index 9e7b379..d529eb7 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
@@ -125,6 +125,21 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
+
+    /**
+     * 实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）
+     */
+    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）不分页列表")
+    @PostMapping("/deptExecutive/list")
+    @ResponseBody
+    public ReturnDTO<List<SampleLabExecutiveListResponse>> deptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        DictCodeUtils.validDictCode(labExecutiveListRequest);
+        return ReturnUtil.success(labExecutiveInfoService.deptExecutiveList(labExecutiveListRequest));
+    }
+
     /**
      * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
      * 新增在检测中的原始记录和证书打印的集成状态

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index cac583c..fc742ef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -58,7 +58,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "wp";
+            username = "dtt";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
index 9e7b379..d529eb7 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
@@ -125,6 +125,21 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
+
+    /**
+     * 实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）
+     */
+    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）不分页列表")
+    @PostMapping("/deptExecutive/list")
+    @ResponseBody
+    public ReturnDTO<List<SampleLabExecutiveListResponse>> deptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        DictCodeUtils.validDictCode(labExecutiveListRequest);
+        return ReturnUtil.success(labExecutiveInfoService.deptExecutiveList(labExecutiveListRequest));
+    }
+
     /**
      * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
      * 新增在检测中的原始记录和证书打印的集成状态
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java
index cd934f9..eaffa47 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java
@@ -27,6 +27,8 @@
     List<MeasureProcessDTO> selectExecutiveList(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId);
 
     Page<SampleLabExecutiveListResponse> selectListByDeptIdAndStatus(Page<SampleLabExecutiveListResponse> page, @Param("request") SampleLabExecutiveListRequest request, @Param("deptId") Long deptId, @Param("status") String status, @Param("statusList") List<String> statusList);
+    //新增bug
+    List<SampleLabExecutiveListResponse> selectListByDeptStatus( @Param("request") SampleLabExecutiveListRequest request, @Param("deptId") Long deptId, @Param("status") String status, @Param("statusList") List<String> statusList);
 
     Page<SampleLabExecutiveListResponse> selectListByUserIdAndStatus(Page<SampleLabExecutiveListResponse> page, @Param("request") SampleLabExecutiveListRequest request, @Param("userId") Long userId, @Param("status") String status);
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index cac583c..fc742ef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -58,7 +58,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "wp";
+            username = "dtt";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
index 9e7b379..d529eb7 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
@@ -125,6 +125,21 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
+
+    /**
+     * 实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）
+     */
+    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）不分页列表")
+    @PostMapping("/deptExecutive/list")
+    @ResponseBody
+    public ReturnDTO<List<SampleLabExecutiveListResponse>> deptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        DictCodeUtils.validDictCode(labExecutiveListRequest);
+        return ReturnUtil.success(labExecutiveInfoService.deptExecutiveList(labExecutiveListRequest));
+    }
+
     /**
      * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
      * 新增在检测中的原始记录和证书打印的集成状态
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java
index cd934f9..eaffa47 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java
@@ -27,6 +27,8 @@
     List<MeasureProcessDTO> selectExecutiveList(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId);
 
     Page<SampleLabExecutiveListResponse> selectListByDeptIdAndStatus(Page<SampleLabExecutiveListResponse> page, @Param("request") SampleLabExecutiveListRequest request, @Param("deptId") Long deptId, @Param("status") String status, @Param("statusList") List<String> statusList);
+    //新增bug
+    List<SampleLabExecutiveListResponse> selectListByDeptStatus( @Param("request") SampleLabExecutiveListRequest request, @Param("deptId") Long deptId, @Param("status") String status, @Param("statusList") List<String> statusList);
 
     Page<SampleLabExecutiveListResponse> selectListByUserIdAndStatus(Page<SampleLabExecutiveListResponse> page, @Param("request") SampleLabExecutiveListRequest request, @Param("userId") Long userId, @Param("status") String status);
 
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index c821cf3..e884b36 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -113,6 +113,51 @@
         ORDER BY blei.update_time DESC
     </select>
 
+    <select id="selectListByDeptStatus" resultType="com.casic.missiles.dto.business.labExecutive.SampleLabExecutiveListResponse">
+        SELECT <include refid="Status_Column_List"/>
+        FROM business_lab_executive_info blei
+        JOIN customer_sample_info csi ON csi.id = blei.sample_id
+        JOIN business_order bo ON bo.id = blei.order_id
+        WHERE blei.measure_dept_id = #{deptId}
+        <if test="status != null and status != ''">
+            AND blei.measure_status = #{status}
+        </if>
+        <if test="statusList != null">
+            AND blei.measure_status IN
+            <foreach collection="statusList" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="request.sampleNo != null and request.sampleNo !=''">
+            AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+        </if>
+        <if test="request.sampleName != null and request.sampleName !=''">
+            AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+        </if>
+        <if test="request.orderNo != null and request.orderNo !=''">
+            AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+        </if>
+        <if test="request.customerNo != null and request.customerNo !=''">
+            AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+        </if>
+        <if test="request.customerName != null and request.customerName !=''">
+            AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+        </if>
+        <if test="request.startTime != null and request.startTime !=''">
+            AND bo.require_over_time &gt;= #{request.startTime}
+        </if>
+        <if test="request.endTime != null and request.endTime !=''">
+            AND bo.require_over_time &lt;= #{request.endTime}
+        </if>
+        <if test="request.isUrgent != null and request.isUrgent !=''">
+            AND bo.is_urgent = #{request.isUrgent}
+        </if>
+        <if test="request.sampleBelong != null and request.sampleBelong !=''">
+            AND csi.sample_belong = #{request.sampleBelong}
+        </if>
+        ORDER BY blei.update_time DESC
+    </select>
+
     <select id="selectListByUserIdAndStatus" resultType="com.casic.missiles.dto.business.labExecutive.SampleLabExecutiveListResponse">
         SELECT <include refid="Status_Column_List"/>, sd.ID AS measureDeptId, sd.SIMPLE_NAME AS measureDeptName
         FROM business_lab_executive_info blei

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index cac583c..fc742ef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -58,7 +58,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "wp";
+            username = "dtt";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
index 9e7b379..d529eb7 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
@@ -125,6 +125,21 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
+
+    /**
+     * 实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）
+     */
+    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）不分页列表")
+    @PostMapping("/deptExecutive/list")
+    @ResponseBody
+    public ReturnDTO<List<SampleLabExecutiveListResponse>> deptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        DictCodeUtils.validDictCode(labExecutiveListRequest);
+        return ReturnUtil.success(labExecutiveInfoService.deptExecutiveList(labExecutiveListRequest));
+    }
+
     /**
      * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
      * 新增在检测中的原始记录和证书打印的集成状态
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java
index cd934f9..eaffa47 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java
@@ -27,6 +27,8 @@
     List<MeasureProcessDTO> selectExecutiveList(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId);
 
     Page<SampleLabExecutiveListResponse> selectListByDeptIdAndStatus(Page<SampleLabExecutiveListResponse> page, @Param("request") SampleLabExecutiveListRequest request, @Param("deptId") Long deptId, @Param("status") String status, @Param("statusList") List<String> statusList);
+    //新增bug
+    List<SampleLabExecutiveListResponse> selectListByDeptStatus( @Param("request") SampleLabExecutiveListRequest request, @Param("deptId") Long deptId, @Param("status") String status, @Param("statusList") List<String> statusList);
 
     Page<SampleLabExecutiveListResponse> selectListByUserIdAndStatus(Page<SampleLabExecutiveListResponse> page, @Param("request") SampleLabExecutiveListRequest request, @Param("userId") Long userId, @Param("status") String status);
 
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index c821cf3..e884b36 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -113,6 +113,51 @@
         ORDER BY blei.update_time DESC
     </select>
 
+    <select id="selectListByDeptStatus" resultType="com.casic.missiles.dto.business.labExecutive.SampleLabExecutiveListResponse">
+        SELECT <include refid="Status_Column_List"/>
+        FROM business_lab_executive_info blei
+        JOIN customer_sample_info csi ON csi.id = blei.sample_id
+        JOIN business_order bo ON bo.id = blei.order_id
+        WHERE blei.measure_dept_id = #{deptId}
+        <if test="status != null and status != ''">
+            AND blei.measure_status = #{status}
+        </if>
+        <if test="statusList != null">
+            AND blei.measure_status IN
+            <foreach collection="statusList" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="request.sampleNo != null and request.sampleNo !=''">
+            AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+        </if>
+        <if test="request.sampleName != null and request.sampleName !=''">
+            AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+        </if>
+        <if test="request.orderNo != null and request.orderNo !=''">
+            AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+        </if>
+        <if test="request.customerNo != null and request.customerNo !=''">
+            AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+        </if>
+        <if test="request.customerName != null and request.customerName !=''">
+            AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+        </if>
+        <if test="request.startTime != null and request.startTime !=''">
+            AND bo.require_over_time &gt;= #{request.startTime}
+        </if>
+        <if test="request.endTime != null and request.endTime !=''">
+            AND bo.require_over_time &lt;= #{request.endTime}
+        </if>
+        <if test="request.isUrgent != null and request.isUrgent !=''">
+            AND bo.is_urgent = #{request.isUrgent}
+        </if>
+        <if test="request.sampleBelong != null and request.sampleBelong !=''">
+            AND csi.sample_belong = #{request.sampleBelong}
+        </if>
+        ORDER BY blei.update_time DESC
+    </select>
+
     <select id="selectListByUserIdAndStatus" resultType="com.casic.missiles.dto.business.labExecutive.SampleLabExecutiveListResponse">
         SELECT <include refid="Status_Column_List"/>, sd.ID AS measureDeptId, sd.SIMPLE_NAME AS measureDeptName
         FROM business_lab_executive_info blei
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index b4eb651..468fcb9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -303,7 +303,7 @@
             case MeasureStatusEnum.MEASURE_COMPLETE:
                 resultPage = labExecutiveInfoMapper.selectListByDeptIdAndStatus(page, labExecutiveListRequest, deptId, MeasureStatusEnum.MEASURE_COMPLETE, null);
                 //查询样品检定到的其他实验室或样品检测完成
-                enrichLabExecutiveRecords(resultPage);
+                enrichLabExecutiveRecords(resultPage.getRecords());
                 break;
         }
         if (!CollectionUtils.isEmpty(resultPage.getRecords())) {
@@ -314,6 +314,69 @@
         return resultPage;
     }
 
+    //selectListByDeptStatus
+    @Override
+    public List<SampleLabExecutiveListResponse> deptExecutiveList(SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception {
+        //本级部门主管可见本部门的检测
+        //根据用户id查询，用户角色中TIPS为director即为主管，取用户的部门id
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+
+        Map<String, Object> resultMap = selectDirectDept(user);
+        if (CollectionUtils.isEmpty(resultMap) || Objects.isNull(resultMap.get("deptId"))) {
+            return new ArrayList<>();
+        }
+        Long deptId = (Long) resultMap.get("deptId");
+        String deptName = (String) resultMap.get("deptName");
+        //获取部门下的各检测状态列表
+        String measureStatus = labExecutiveListRequest.getMeasureStatus();
+        List<SampleLabExecutiveListResponse>  resultList=new ArrayList<>();
+        switch (measureStatus) {
+            //待检测，查询待分配状态
+            //当前检定环节:具体实验室，已出具证书：无，出具证书总数:无
+            case MeasureStatusEnum.TO_MEASURE:
+                resultList = labExecutiveInfoMapper.selectListByDeptStatus(labExecutiveListRequest, deptId, MeasureStatusEnum.TO_ALLOCATE, null);
+                resultList.forEach(lab -> {
+                    lab.setCurrentSegmentId(deptId);
+                    lab.setCurrentSegment(deptName);
+                });
+                break;
+
+            //检测中，查询待检测和检测中
+            //当前检定环节:具体实验室，已出具证书：查询证书报告表(检测中，待检测无)，证书总数：具体实验室
+            case MeasureStatusEnum.IN_MEASURE:
+                List<String> statusList = new ArrayList<>();
+                statusList.add(MeasureStatusEnum.TO_MEASURE);
+                statusList.add(MeasureStatusEnum.IN_MEASURE);
+                resultList = labExecutiveInfoMapper.selectListByDeptStatus( labExecutiveListRequest, deptId, null, statusList);
+                resultList.parallelStream().forEach(lab -> {
+                    lab.setCurrentSegmentId(deptId);
+                    lab.setCurrentSegment(deptName);
+                    //查询证书报告表
+                    if (MeasureStatusEnum.IN_MEASURE.equals(lab.getMeasureStatus())) {
+                        Integer alreadyCertificateNum = getAlreadyCertificateNum(lab.getOrderId(), lab.getSampleId(), deptId);
+                        lab.setAlreadyCertifications(alreadyCertificateNum);
+                    }
+                });
+                break;
+
+            //检测完，查询检测完，当前检定环节:其他实验室/检测完，已出具证书：查询证书报告表/无，证书总数：具体实验室/无
+            case MeasureStatusEnum.MEASURE_COMPLETE:
+                resultList = labExecutiveInfoMapper.selectListByDeptStatus( labExecutiveListRequest, deptId, MeasureStatusEnum.MEASURE_COMPLETE, null);
+                //查询样品检定到的其他实验室或样品检测完成
+                enrichLabExecutiveRecords(resultList);
+                break;
+        }
+        if (!CollectionUtils.isEmpty(resultList)) {
+            for (SampleLabExecutiveListResponse record : resultList) {
+                DictCodeUtils.convertDictCodeToName(record);
+            }
+        }
+        return resultList;
+    }
+
     @Override
     public Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception {
         AuthUser user = ShiroKit.getUser();
@@ -369,7 +432,7 @@
             case MeasureStatusEnum.MEASURE_COMPLETE:
                 resultPage = labExecutiveInfoMapper.selectListByUserIdAndStatus(page, labExecutiveListRequest, userId, MeasureStatusEnum.MEASURE_COMPLETE);
                 //查询样品检定到的其他实验室或样品检测完成
-                enrichLabExecutiveRecords(resultPage);
+                enrichLabExecutiveRecords(resultPage.getRecords());
                 break;
         }
         if (!CollectionUtils.isEmpty(resultPage.getRecords())) {
@@ -795,8 +858,8 @@
         return aLong.intValue();
     }
 
-    private void enrichLabExecutiveRecords(Page<SampleLabExecutiveListResponse> resultPage) {
-        resultPage.getRecords().parallelStream().forEach(lab -> {
+    private void enrichLabExecutiveRecords(List<SampleLabExecutiveListResponse> resultList) {
+        resultList.parallelStream().forEach(lab -> {
             List<HandOutLabExecutiveDTO> labExecutiveList = labExecutiveInfoMapper.selectListByInMeasureStatus(lab.getOrderId(), lab.getSampleId());
             //未在进行中的实验室则为检测完成（可能存在终止的情况，也算为检测完成）
             if (CollectionUtils.isEmpty(labExecutiveList)) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index cac583c..fc742ef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -58,7 +58,7 @@
         super.getSession().setAttribute(PermissionConstants.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (StrUtil.hasEmpty(username, password)) {
-            username = "wp";
+            username = "dtt";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
index 9e7b379..d529eb7 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessLabExecutiveInfoController.java
@@ -125,6 +125,21 @@
         return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest)));
     }
 
+
+    /**
+     * 实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）
+     */
+    @ApiOperation("实验室检测-部门检测-查询各状态列表（待检测、检测中、检测完）不分页列表")
+    @PostMapping("/deptExecutive/list")
+    @ResponseBody
+    public ReturnDTO<List<SampleLabExecutiveListResponse>> deptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        DictCodeUtils.validDictCode(labExecutiveListRequest);
+        return ReturnUtil.success(labExecutiveInfoService.deptExecutiveList(labExecutiveListRequest));
+    }
+
     /**
      * 实验室检测-我的检测-查询各状态列表（待检测、检测中、检测完）
      * 新增在检测中的原始记录和证书打印的集成状态
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java
index cd934f9..eaffa47 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java
@@ -27,6 +27,8 @@
     List<MeasureProcessDTO> selectExecutiveList(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId);
 
     Page<SampleLabExecutiveListResponse> selectListByDeptIdAndStatus(Page<SampleLabExecutiveListResponse> page, @Param("request") SampleLabExecutiveListRequest request, @Param("deptId") Long deptId, @Param("status") String status, @Param("statusList") List<String> statusList);
+    //新增bug
+    List<SampleLabExecutiveListResponse> selectListByDeptStatus( @Param("request") SampleLabExecutiveListRequest request, @Param("deptId") Long deptId, @Param("status") String status, @Param("statusList") List<String> statusList);
 
     Page<SampleLabExecutiveListResponse> selectListByUserIdAndStatus(Page<SampleLabExecutiveListResponse> page, @Param("request") SampleLabExecutiveListRequest request, @Param("userId") Long userId, @Param("status") String status);
 
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
index c821cf3..e884b36 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -113,6 +113,51 @@
         ORDER BY blei.update_time DESC
     </select>
 
+    <select id="selectListByDeptStatus" resultType="com.casic.missiles.dto.business.labExecutive.SampleLabExecutiveListResponse">
+        SELECT <include refid="Status_Column_List"/>
+        FROM business_lab_executive_info blei
+        JOIN customer_sample_info csi ON csi.id = blei.sample_id
+        JOIN business_order bo ON bo.id = blei.order_id
+        WHERE blei.measure_dept_id = #{deptId}
+        <if test="status != null and status != ''">
+            AND blei.measure_status = #{status}
+        </if>
+        <if test="statusList != null">
+            AND blei.measure_status IN
+            <foreach collection="statusList" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="request.sampleNo != null and request.sampleNo !=''">
+            AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+        </if>
+        <if test="request.sampleName != null and request.sampleName !=''">
+            AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+        </if>
+        <if test="request.orderNo != null and request.orderNo !=''">
+            AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+        </if>
+        <if test="request.customerNo != null and request.customerNo !=''">
+            AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+        </if>
+        <if test="request.customerName != null and request.customerName !=''">
+            AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+        </if>
+        <if test="request.startTime != null and request.startTime !=''">
+            AND bo.require_over_time &gt;= #{request.startTime}
+        </if>
+        <if test="request.endTime != null and request.endTime !=''">
+            AND bo.require_over_time &lt;= #{request.endTime}
+        </if>
+        <if test="request.isUrgent != null and request.isUrgent !=''">
+            AND bo.is_urgent = #{request.isUrgent}
+        </if>
+        <if test="request.sampleBelong != null and request.sampleBelong !=''">
+            AND csi.sample_belong = #{request.sampleBelong}
+        </if>
+        ORDER BY blei.update_time DESC
+    </select>
+
     <select id="selectListByUserIdAndStatus" resultType="com.casic.missiles.dto.business.labExecutive.SampleLabExecutiveListResponse">
         SELECT <include refid="Status_Column_List"/>, sd.ID AS measureDeptId, sd.SIMPLE_NAME AS measureDeptName
         FROM business_lab_executive_info blei
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index b4eb651..468fcb9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -303,7 +303,7 @@
             case MeasureStatusEnum.MEASURE_COMPLETE:
                 resultPage = labExecutiveInfoMapper.selectListByDeptIdAndStatus(page, labExecutiveListRequest, deptId, MeasureStatusEnum.MEASURE_COMPLETE, null);
                 //查询样品检定到的其他实验室或样品检测完成
-                enrichLabExecutiveRecords(resultPage);
+                enrichLabExecutiveRecords(resultPage.getRecords());
                 break;
         }
         if (!CollectionUtils.isEmpty(resultPage.getRecords())) {
@@ -314,6 +314,69 @@
         return resultPage;
     }
 
+    //selectListByDeptStatus
+    @Override
+    public List<SampleLabExecutiveListResponse> deptExecutiveList(SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception {
+        //本级部门主管可见本部门的检测
+        //根据用户id查询，用户角色中TIPS为director即为主管，取用户的部门id
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+
+        Map<String, Object> resultMap = selectDirectDept(user);
+        if (CollectionUtils.isEmpty(resultMap) || Objects.isNull(resultMap.get("deptId"))) {
+            return new ArrayList<>();
+        }
+        Long deptId = (Long) resultMap.get("deptId");
+        String deptName = (String) resultMap.get("deptName");
+        //获取部门下的各检测状态列表
+        String measureStatus = labExecutiveListRequest.getMeasureStatus();
+        List<SampleLabExecutiveListResponse>  resultList=new ArrayList<>();
+        switch (measureStatus) {
+            //待检测，查询待分配状态
+            //当前检定环节:具体实验室，已出具证书：无，出具证书总数:无
+            case MeasureStatusEnum.TO_MEASURE:
+                resultList = labExecutiveInfoMapper.selectListByDeptStatus(labExecutiveListRequest, deptId, MeasureStatusEnum.TO_ALLOCATE, null);
+                resultList.forEach(lab -> {
+                    lab.setCurrentSegmentId(deptId);
+                    lab.setCurrentSegment(deptName);
+                });
+                break;
+
+            //检测中，查询待检测和检测中
+            //当前检定环节:具体实验室，已出具证书：查询证书报告表(检测中，待检测无)，证书总数：具体实验室
+            case MeasureStatusEnum.IN_MEASURE:
+                List<String> statusList = new ArrayList<>();
+                statusList.add(MeasureStatusEnum.TO_MEASURE);
+                statusList.add(MeasureStatusEnum.IN_MEASURE);
+                resultList = labExecutiveInfoMapper.selectListByDeptStatus( labExecutiveListRequest, deptId, null, statusList);
+                resultList.parallelStream().forEach(lab -> {
+                    lab.setCurrentSegmentId(deptId);
+                    lab.setCurrentSegment(deptName);
+                    //查询证书报告表
+                    if (MeasureStatusEnum.IN_MEASURE.equals(lab.getMeasureStatus())) {
+                        Integer alreadyCertificateNum = getAlreadyCertificateNum(lab.getOrderId(), lab.getSampleId(), deptId);
+                        lab.setAlreadyCertifications(alreadyCertificateNum);
+                    }
+                });
+                break;
+
+            //检测完，查询检测完，当前检定环节:其他实验室/检测完，已出具证书：查询证书报告表/无，证书总数：具体实验室/无
+            case MeasureStatusEnum.MEASURE_COMPLETE:
+                resultList = labExecutiveInfoMapper.selectListByDeptStatus( labExecutiveListRequest, deptId, MeasureStatusEnum.MEASURE_COMPLETE, null);
+                //查询样品检定到的其他实验室或样品检测完成
+                enrichLabExecutiveRecords(resultList);
+                break;
+        }
+        if (!CollectionUtils.isEmpty(resultList)) {
+            for (SampleLabExecutiveListResponse record : resultList) {
+                DictCodeUtils.convertDictCodeToName(record);
+            }
+        }
+        return resultList;
+    }
+
     @Override
     public Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception {
         AuthUser user = ShiroKit.getUser();
@@ -369,7 +432,7 @@
             case MeasureStatusEnum.MEASURE_COMPLETE:
                 resultPage = labExecutiveInfoMapper.selectListByUserIdAndStatus(page, labExecutiveListRequest, userId, MeasureStatusEnum.MEASURE_COMPLETE);
                 //查询样品检定到的其他实验室或样品检测完成
-                enrichLabExecutiveRecords(resultPage);
+                enrichLabExecutiveRecords(resultPage.getRecords());
                 break;
         }
         if (!CollectionUtils.isEmpty(resultPage.getRecords())) {
@@ -795,8 +858,8 @@
         return aLong.intValue();
     }
 
-    private void enrichLabExecutiveRecords(Page<SampleLabExecutiveListResponse> resultPage) {
-        resultPage.getRecords().parallelStream().forEach(lab -> {
+    private void enrichLabExecutiveRecords(List<SampleLabExecutiveListResponse> resultList) {
+        resultList.parallelStream().forEach(lab -> {
             List<HandOutLabExecutiveDTO> labExecutiveList = labExecutiveInfoMapper.selectListByInMeasureStatus(lab.getOrderId(), lab.getSampleId());
             //未在进行中的实验室则为检测完成（可能存在终止的情况，也算为检测完成）
             if (CollectionUtils.isEmpty(labExecutiveList)) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
index 1cb6bb4..87f412b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessLabExecutiveInfoService.java
@@ -30,6 +30,8 @@
 
     Page<SampleLabExecutiveListResponse> deptLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception;
 
+    List<SampleLabExecutiveListResponse> deptExecutiveList(SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception;
+
     Page<SampleLabExecutiveListResponse> myLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception;
 
     List<SampleAmountResponse> myExecutiveAmount();