diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7b7b57e..435f9c8 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -40,7 +40,7 @@
      * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
      * 这些是列表实现的详细点
      */
-    @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
+    @ApiOperation("设备列表-分页")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -64,10 +64,10 @@
      * receive：设备收入(只有待收入的设备具有收入操作)
      * back：回填：置为前置状态，已收入、待归还、已归还
      */
-    @ApiOperation("无需检测")
+    @ApiOperation("( 回退、收入、归还、无需检测 按钮)")
     @PostMapping("/satus/change")
     public ReturnDTO<BusinessOrder> statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
-        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
         return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO));
@@ -76,10 +76,10 @@
     /**
      * 设备终止，，同时要进行终止原因的回填
      */
-    @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
+    @ApiOperation("设备终止")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) {
-        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
         return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
@@ -91,7 +91,7 @@
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
-        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
         return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7b7b57e..435f9c8 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -40,7 +40,7 @@
      * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
      * 这些是列表实现的详细点
      */
-    @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
+    @ApiOperation("设备列表-分页")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -64,10 +64,10 @@
      * receive：设备收入(只有待收入的设备具有收入操作)
      * back：回填：置为前置状态，已收入、待归还、已归还
      */
-    @ApiOperation("无需检测")
+    @ApiOperation("( 回退、收入、归还、无需检测 按钮)")
     @PostMapping("/satus/change")
     public ReturnDTO<BusinessOrder> statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
-        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
         return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO));
@@ -76,10 +76,10 @@
     /**
      * 设备终止，，同时要进行终止原因的回填
      */
-    @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
+    @ApiOperation("设备终止")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) {
-        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
         return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
@@ -91,7 +91,7 @@
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
-        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
         return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java
index b118a6b..8a8a5f0 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java
@@ -9,4 +9,6 @@
     String TO_ALLOCATE = "待分配";
     String TO_INCOME = "待收入";
     String COMPLETE = "完成";
+    String OUT_UNDERTAKE = "外包";
+    String OUT_MESASUR = "外检";
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7b7b57e..435f9c8 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -40,7 +40,7 @@
      * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
      * 这些是列表实现的详细点
      */
-    @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
+    @ApiOperation("设备列表-分页")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -64,10 +64,10 @@
      * receive：设备收入(只有待收入的设备具有收入操作)
      * back：回填：置为前置状态，已收入、待归还、已归还
      */
-    @ApiOperation("无需检测")
+    @ApiOperation("( 回退、收入、归还、无需检测 按钮)")
     @PostMapping("/satus/change")
     public ReturnDTO<BusinessOrder> statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
-        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
         return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO));
@@ -76,10 +76,10 @@
     /**
      * 设备终止，，同时要进行终止原因的回填
      */
-    @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
+    @ApiOperation("设备终止")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) {
-        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
         return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
@@ -91,7 +91,7 @@
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
-        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
         return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java
index b118a6b..8a8a5f0 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java
@@ -9,4 +9,6 @@
     String TO_ALLOCATE = "待分配";
     String TO_INCOME = "待收入";
     String COMPLETE = "完成";
+    String OUT_UNDERTAKE = "外包";
+    String OUT_MESASUR = "外检";
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index b57623d..a4e20fc 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -32,7 +32,7 @@
     <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
         SELECT csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
         bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
-        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType"
         FROM
         (
             SELECT *
@@ -53,7 +53,7 @@
             <if test="request.endTime != null and request.endTime !=''">
                 AND bo.require_over_time &gt; #{request.endTime}
             </if>
-            <if test="request.isUrgent != null and request.isUrgent !=''">
+            <if test="request.isUrgent != null and request.isUrgent !='2' ">
                 AND bo.is_urgent = #{request.isUrgent}
             </if>
         ) bo

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7b7b57e..435f9c8 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -40,7 +40,7 @@
      * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
      * 这些是列表实现的详细点
      */
-    @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
+    @ApiOperation("设备列表-分页")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -64,10 +64,10 @@
      * receive：设备收入(只有待收入的设备具有收入操作)
      * back：回填：置为前置状态，已收入、待归还、已归还
      */
-    @ApiOperation("无需检测")
+    @ApiOperation("( 回退、收入、归还、无需检测 按钮)")
     @PostMapping("/satus/change")
     public ReturnDTO<BusinessOrder> statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
-        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
         return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO));
@@ -76,10 +76,10 @@
     /**
      * 设备终止，，同时要进行终止原因的回填
      */
-    @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
+    @ApiOperation("设备终止")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) {
-        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
         return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
@@ -91,7 +91,7 @@
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
-        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
         return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java
index b118a6b..8a8a5f0 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java
@@ -9,4 +9,6 @@
     String TO_ALLOCATE = "待分配";
     String TO_INCOME = "待收入";
     String COMPLETE = "完成";
+    String OUT_UNDERTAKE = "外包";
+    String OUT_MESASUR = "外检";
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index b57623d..a4e20fc 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -32,7 +32,7 @@
     <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
         SELECT csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
         bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
-        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType"
         FROM
         (
             SELECT *
@@ -53,7 +53,7 @@
             <if test="request.endTime != null and request.endTime !=''">
                 AND bo.require_over_time &gt; #{request.endTime}
             </if>
-            <if test="request.isUrgent != null and request.isUrgent !=''">
+            <if test="request.isUrgent != null and request.isUrgent !='2' ">
                 AND bo.is_urgent = #{request.isUrgent}
             </if>
         ) bo
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index 216be0b..349b780 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -7,6 +7,7 @@
 import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -80,6 +81,9 @@
     @ExcelProperty(value = "应出具证书", order = 11)
     private Integer requireCertifications;
 
+    @JsonIgnore
+    private Integer measureType;
+
     //  终止、回退、收入、归还、催办按钮
     @ApiModelProperty(value = "回退状态（已收入的状态） 1真0假", dataType = "Integer")
     private Integer FallbackState;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7b7b57e..435f9c8 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -40,7 +40,7 @@
      * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
      * 这些是列表实现的详细点
      */
-    @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
+    @ApiOperation("设备列表-分页")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -64,10 +64,10 @@
      * receive：设备收入(只有待收入的设备具有收入操作)
      * back：回填：置为前置状态，已收入、待归还、已归还
      */
-    @ApiOperation("无需检测")
+    @ApiOperation("( 回退、收入、归还、无需检测 按钮)")
     @PostMapping("/satus/change")
     public ReturnDTO<BusinessOrder> statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
-        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
         return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO));
@@ -76,10 +76,10 @@
     /**
      * 设备终止，，同时要进行终止原因的回填
      */
-    @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
+    @ApiOperation("设备终止")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) {
-        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
         return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
@@ -91,7 +91,7 @@
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
-        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
         return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java
index b118a6b..8a8a5f0 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java
@@ -9,4 +9,6 @@
     String TO_ALLOCATE = "待分配";
     String TO_INCOME = "待收入";
     String COMPLETE = "完成";
+    String OUT_UNDERTAKE = "外包";
+    String OUT_MESASUR = "外检";
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index b57623d..a4e20fc 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -32,7 +32,7 @@
     <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
         SELECT csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
         bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
-        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType"
         FROM
         (
             SELECT *
@@ -53,7 +53,7 @@
             <if test="request.endTime != null and request.endTime !=''">
                 AND bo.require_over_time &gt; #{request.endTime}
             </if>
-            <if test="request.isUrgent != null and request.isUrgent !=''">
+            <if test="request.isUrgent != null and request.isUrgent !='2' ">
                 AND bo.is_urgent = #{request.isUrgent}
             </if>
         ) bo
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index 216be0b..349b780 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -7,6 +7,7 @@
 import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -80,6 +81,9 @@
     @ExcelProperty(value = "应出具证书", order = 11)
     private Integer requireCertifications;
 
+    @JsonIgnore
+    private Integer measureType;
+
     //  终止、回退、收入、归还、催办按钮
     @ApiModelProperty(value = "回退状态（已收入的状态） 1真0假", dataType = "Integer")
     private Integer FallbackState;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceStatusChangeDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceStatusChangeDTO.java
index f9110b1..725a39a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceStatusChangeDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceStatusChangeDTO.java
@@ -14,7 +14,7 @@
     @ApiModelProperty(value = "样品id", dataType = "Long")
     private Long sampleId;
 
-    @ApiModelProperty(value = "状态变更(无需检测状态7,收入状态2,回退状态2.5.1,终止5)", dataType = "String")
+    @ApiModelProperty(value = "状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)", dataType = "String")
     private String status;
 
     @ApiModelProperty(value = "操作原因（终止操作必填，其他无需填写）", dataType = "String")

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7b7b57e..435f9c8 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -40,7 +40,7 @@
      * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
      * 这些是列表实现的详细点
      */
-    @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
+    @ApiOperation("设备列表-分页")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -64,10 +64,10 @@
      * receive：设备收入(只有待收入的设备具有收入操作)
      * back：回填：置为前置状态，已收入、待归还、已归还
      */
-    @ApiOperation("无需检测")
+    @ApiOperation("( 回退、收入、归还、无需检测 按钮)")
     @PostMapping("/satus/change")
     public ReturnDTO<BusinessOrder> statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
-        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
         return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO));
@@ -76,10 +76,10 @@
     /**
      * 设备终止，，同时要进行终止原因的回填
      */
-    @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
+    @ApiOperation("设备终止")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) {
-        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
         return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
@@ -91,7 +91,7 @@
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
-        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
         return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java
index b118a6b..8a8a5f0 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java
@@ -9,4 +9,6 @@
     String TO_ALLOCATE = "待分配";
     String TO_INCOME = "待收入";
     String COMPLETE = "完成";
+    String OUT_UNDERTAKE = "外包";
+    String OUT_MESASUR = "外检";
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index b57623d..a4e20fc 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -32,7 +32,7 @@
     <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
         SELECT csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
         bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
-        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType"
         FROM
         (
             SELECT *
@@ -53,7 +53,7 @@
             <if test="request.endTime != null and request.endTime !=''">
                 AND bo.require_over_time &gt; #{request.endTime}
             </if>
-            <if test="request.isUrgent != null and request.isUrgent !=''">
+            <if test="request.isUrgent != null and request.isUrgent !='2' ">
                 AND bo.is_urgent = #{request.isUrgent}
             </if>
         ) bo
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index 216be0b..349b780 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -7,6 +7,7 @@
 import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -80,6 +81,9 @@
     @ExcelProperty(value = "应出具证书", order = 11)
     private Integer requireCertifications;
 
+    @JsonIgnore
+    private Integer measureType;
+
     //  终止、回退、收入、归还、催办按钮
     @ApiModelProperty(value = "回退状态（已收入的状态） 1真0假", dataType = "Integer")
     private Integer FallbackState;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceStatusChangeDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceStatusChangeDTO.java
index f9110b1..725a39a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceStatusChangeDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceStatusChangeDTO.java
@@ -14,7 +14,7 @@
     @ApiModelProperty(value = "样品id", dataType = "Long")
     private Long sampleId;
 
-    @ApiModelProperty(value = "状态变更(无需检测状态7,收入状态2,回退状态2.5.1,终止5)", dataType = "String")
+    @ApiModelProperty(value = "状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)", dataType = "String")
     private String status;
 
     @ApiModelProperty(value = "操作原因（终止操作必填，其他无需填写）", dataType = "String")
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index ec3a201..ba5ef78 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -203,14 +203,14 @@
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         queryWrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         queryWrapper.like(StringUtils.isNotBlank(request.getOrderCode()), "order_code", request.getOrderCode());
-        queryWrapper.like(ObjectUtil.isNotEmpty(request.getIsUrgent()) && request.getIsUrgent() != 0, "is_urgent", request.getIsUrgent());
+        queryWrapper.like(ObjectUtil.isNotEmpty(request.getIsUrgent()) && request.getIsUrgent() != 2, "is_urgent", request.getIsUrgent());
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         queryWrapper.like(ObjectUtil.isNotEmpty(request.getStatus()) && request.getStatus() != 0, "status", request.getStatus());
         queryWrapper.eq("is_del",0);
         queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
-                "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime());
+                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime());
         queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
-                "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime());
+                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime());
         queryWrapper.orderByDesc("create_time");
 
         return queryWrapper;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index 7b7b57e..435f9c8 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -40,7 +40,7 @@
      * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
      * 这些是列表实现的详细点
      */
-    @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
+    @ApiOperation("设备列表-分页")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -64,10 +64,10 @@
      * receive：设备收入(只有待收入的设备具有收入操作)
      * back：回填：置为前置状态，已收入、待归还、已归还
      */
-    @ApiOperation("无需检测")
+    @ApiOperation("( 回退、收入、归还、无需检测 按钮)")
     @PostMapping("/satus/change")
     public ReturnDTO<BusinessOrder> statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
-        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
         return ReturnUtil.success(bizDispatchService.statusChange(deviceReceiveDTO));
@@ -76,10 +76,10 @@
     /**
      * 设备终止，，同时要进行终止原因的回填
      */
-    @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
+    @ApiOperation("设备终止")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceStatusChangeDTO deviceReceiveDTO) {
-        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
         return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
@@ -91,7 +91,7 @@
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) {
-        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
         return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java
index b118a6b..8a8a5f0 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/sample/CurrentSegmentEnum.java
@@ -9,4 +9,6 @@
     String TO_ALLOCATE = "待分配";
     String TO_INCOME = "待收入";
     String COMPLETE = "完成";
+    String OUT_UNDERTAKE = "外包";
+    String OUT_MESASUR = "外检";
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index b57623d..a4e20fc 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -32,7 +32,7 @@
     <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
         SELECT csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
         bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
-        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType"
         FROM
         (
             SELECT *
@@ -53,7 +53,7 @@
             <if test="request.endTime != null and request.endTime !=''">
                 AND bo.require_over_time &gt; #{request.endTime}
             </if>
-            <if test="request.isUrgent != null and request.isUrgent !=''">
+            <if test="request.isUrgent != null and request.isUrgent !='2' ">
                 AND bo.is_urgent = #{request.isUrgent}
             </if>
         ) bo
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index 216be0b..349b780 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -7,6 +7,7 @@
 import com.alibaba.excel.annotation.write.style.ContentStyle;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -80,6 +81,9 @@
     @ExcelProperty(value = "应出具证书", order = 11)
     private Integer requireCertifications;
 
+    @JsonIgnore
+    private Integer measureType;
+
     //  终止、回退、收入、归还、催办按钮
     @ApiModelProperty(value = "回退状态（已收入的状态） 1真0假", dataType = "Integer")
     private Integer FallbackState;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceStatusChangeDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceStatusChangeDTO.java
index f9110b1..725a39a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceStatusChangeDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceStatusChangeDTO.java
@@ -14,7 +14,7 @@
     @ApiModelProperty(value = "样品id", dataType = "Long")
     private Long sampleId;
 
-    @ApiModelProperty(value = "状态变更(无需检测状态7,收入状态2,回退状态2.5.1,终止5)", dataType = "String")
+    @ApiModelProperty(value = "状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5)", dataType = "String")
     private String status;
 
     @ApiModelProperty(value = "操作原因（终止操作必填，其他无需填写）", dataType = "String")
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index ec3a201..ba5ef78 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -203,14 +203,14 @@
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         queryWrapper.like(StringUtils.isNotBlank(request.getDeliverer()), "deliverer", request.getDeliverer());
         queryWrapper.like(StringUtils.isNotBlank(request.getOrderCode()), "order_code", request.getOrderCode());
-        queryWrapper.like(ObjectUtil.isNotEmpty(request.getIsUrgent()) && request.getIsUrgent() != 0, "is_urgent", request.getIsUrgent());
+        queryWrapper.like(ObjectUtil.isNotEmpty(request.getIsUrgent()) && request.getIsUrgent() != 2, "is_urgent", request.getIsUrgent());
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         queryWrapper.like(ObjectUtil.isNotEmpty(request.getStatus()) && request.getStatus() != 0, "status", request.getStatus());
         queryWrapper.eq("is_del",0);
         queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
-                "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime());
+                "{0} >= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getStartTime());
         queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
-                "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime());
+                "{0} <= DATE_FORMAT(create_time,'%Y-%m-%d')", request.getEndTime());
         queryWrapper.orderByDesc("create_time");
 
         return queryWrapper;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index d2c8050..9e7a6db 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -11,7 +11,6 @@
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO;
-import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
 import com.casic.missiles.enums.*;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.sample.CurrentSegmentEnum;
@@ -43,6 +42,7 @@
     private final IBaseExportService iBaseExportService;
 
     //终止、回退、收入、归还、催办按钮
+    //列表返回只需要控制已收入回退按钮显示的权限即可，其中回退在没有任何实验室进行的情况，可以进行设备的回退
     @Override
     public Page<DeviceDispatchVO> listPage(Page<DeviceDispatchVO> page, DeviceDispatchDTO request) {
 //        //查询委托书和样品关联表中的各状态的样品
@@ -57,6 +57,10 @@
                     Long orderId = dispatchVO.getOrderId();
                     Long sampleId = dispatchVO.getSampleId();
                     String sampleStatus = dispatchVO.getSampleStatus();
+                    //先过滤超期状态下的外检外包
+                    if (request.getSampleStatus().equals("8") && noSelfMeasure(dispatchVO)) {
+                        return;
+                    }
                     switch (sampleStatus) {
                         //待分发状态，分发性质:有退回就是退回分发，当前检定环节:待分配，已出具证书：无，出具证书总数:无
                         case SampleStatusEnum.TO_HANDOUT:
@@ -72,19 +76,14 @@
                             break;
                         //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
                         case SampleStatusEnum.BE_OVERDUE:
-                            if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) {
-                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME);
-                                break;
-                            }
-                            if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) {
-                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
-                                break;
-                            }
                             HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
-                            dispatchVO.setCurrentSegment(overLabExecutiveDTO.getDeptName());
                             Long deptId = overLabExecutiveDTO.getMeasureDeptId();
                             dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, deptId));
                             dispatchVO.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
+                            if (checkSampleFinshStauts(dispatchVO)) {
+                                return;
+                            }
+                            dispatchVO.setCurrentSegment(overLabExecutiveDTO.getDeptName());
                             break;
                     }
                 }
@@ -93,10 +92,12 @@
     }
 
 
+    //进行已收入分页的当前环节回填、出具证书回填
     private void doDispatchVOPopulation(DeviceDispatchVO dispatchVO, Long sampleId, Long orderId) {
         dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
         HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
         Integer measureNumberStatus = labExecutiveInfoMapper.getMeasureNumberStatus(orderId, sampleId);
+        //
         if (!Objects.isNull(handOutLabExecutiveDTO)) {
             dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
             dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
@@ -125,7 +126,6 @@
         } catch (Exception e) {
             log.error("样品导出出现异常，异常信息为{}", e);
         }
-
     }
 
     @Override
@@ -192,7 +192,7 @@
         return wrapper;
     }
 
-    //更新检测完成后，执行顺序最小的实验室
+    //更新检测完成后，执行当前正在进行数据
     private Integer statusChangeUpdator(DeviceStatusChangeDTO statusChangeDTO) {
         QueryWrapper<BusinessOrderSampleRelation> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("order_id", statusChangeDTO.getOrderId());
@@ -205,4 +205,28 @@
         return this.orderSampleRelationMapper.update(businessOrderSampleRelation, queryWrapper);
     }
 
+    //判断不是自检
+    private Boolean noSelfMeasure(DeviceDispatchVO dispatchVO) {
+        if (!ObjectUtils.isEmpty(dispatchVO.getMeasureType()) && (dispatchVO.getMeasureType().equals("1") || dispatchVO.getMeasureType().equals("2"))) {
+            String currentSegment = dispatchVO.getMeasureType().equals("1") ? CurrentSegmentEnum.OUT_UNDERTAKE : CurrentSegmentEnum.OUT_MESASUR;
+            dispatchVO.setCurrentSegment(currentSegment);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    // 判断样品是完成或接收状态，直接显示即可
+    private Boolean checkSampleFinshStauts(DeviceDispatchVO dispatchVO) {
+        if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) {
+            dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME);
+            return true;
+        }
+        if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) {
+            dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+            return true;
+        }
+        return false;
+    }
+
 }