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 688360e..4f67d85 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -52,7 +52,6 @@
              FROM  business_lab_executive_info  blei
              WHERE blei.order_id = #{orderId}
              AND blei.sample_id = #{sampleId}
-             AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status=3)<!--待分配or待检测均属于分发中的检测中-->
         ) blei
         JOIN sys_dept sd ON blei.measure_dept_id = sd.ID
         limit 1

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 688360e..4f67d85 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -52,7 +52,6 @@
              FROM  business_lab_executive_info  blei
              WHERE blei.order_id = #{orderId}
              AND blei.sample_id = #{sampleId}
-             AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status=3)<!--待分配or待检测均属于分发中的检测中-->
         ) blei
         JOIN sys_dept sd ON blei.measure_dept_id = sd.ID
         limit 1
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceBatchStatusChangeDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceBatchStatusChangeDTO.java
index 6b5601c..d6c755a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceBatchStatusChangeDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceBatchStatusChangeDTO.java
@@ -18,6 +18,7 @@
     @ApiModelProperty(value = "委托书样品关系列表", dataType = "list")
     private List<DeviceStatusChangeDTO> deviceStatusChangeDTOS;
 
+    //不同页面传入前进状态、回退状态不同，并且回退到对应状态的前一个状态码
     @ApiModelProperty(value = "状态变更(无需检测状态7,前进状态2、5、6,回退状态1,2,5)", dataType = "String")
     private 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 688360e..4f67d85 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -52,7 +52,6 @@
              FROM  business_lab_executive_info  blei
              WHERE blei.order_id = #{orderId}
              AND blei.sample_id = #{sampleId}
-             AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status=3)<!--待分配or待检测均属于分发中的检测中-->
         ) blei
         JOIN sys_dept sd ON blei.measure_dept_id = sd.ID
         limit 1
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceBatchStatusChangeDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceBatchStatusChangeDTO.java
index 6b5601c..d6c755a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceBatchStatusChangeDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceBatchStatusChangeDTO.java
@@ -18,6 +18,7 @@
     @ApiModelProperty(value = "委托书样品关系列表", dataType = "list")
     private List<DeviceStatusChangeDTO> deviceStatusChangeDTOS;
 
+    //不同页面传入前进状态、回退状态不同，并且回退到对应状态的前一个状态码
     @ApiModelProperty(value = "状态变更(无需检测状态7,前进状态2、5、6,回退状态1,2,5)", dataType = "String")
     private String status;
 
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 91e49fe..f7a49e8 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
@@ -18,6 +18,7 @@
     @ApiModelProperty(value = "样品id", dataType = "Long")
     private Long sampleId;
 
+    //不同页面传入前进状态、回退状态不同，并且回退到对应状态的前一个状态码
     @ApiModelProperty(value = "状态变更(无需检测状态7,前进状态2、5、6,回退状态1,2,5)", dataType = "String")
     private 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 688360e..4f67d85 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -52,7 +52,6 @@
              FROM  business_lab_executive_info  blei
              WHERE blei.order_id = #{orderId}
              AND blei.sample_id = #{sampleId}
-             AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status=3)<!--待分配or待检测均属于分发中的检测中-->
         ) blei
         JOIN sys_dept sd ON blei.measure_dept_id = sd.ID
         limit 1
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceBatchStatusChangeDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceBatchStatusChangeDTO.java
index 6b5601c..d6c755a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceBatchStatusChangeDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceBatchStatusChangeDTO.java
@@ -18,6 +18,7 @@
     @ApiModelProperty(value = "委托书样品关系列表", dataType = "list")
     private List<DeviceStatusChangeDTO> deviceStatusChangeDTOS;
 
+    //不同页面传入前进状态、回退状态不同，并且回退到对应状态的前一个状态码
     @ApiModelProperty(value = "状态变更(无需检测状态7,前进状态2、5、6,回退状态1,2,5)", dataType = "String")
     private String status;
 
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 91e49fe..f7a49e8 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
@@ -18,6 +18,7 @@
     @ApiModelProperty(value = "样品id", dataType = "Long")
     private Long sampleId;
 
+    //不同页面传入前进状态、回退状态不同，并且回退到对应状态的前一个状态码
     @ApiModelProperty(value = "状态变更(无需检测状态7,前进状态2、5、6,回退状态1,2,5)", dataType = "String")
     private String status;
 
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 c2cb75d..2d1b908 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
@@ -528,7 +528,8 @@
         //新增之前不存在的实验室列表（根据id判断）
         List<BusinessLabExecutiveInfo> addList = new ArrayList<>();
         for (UpdateExecutiveListDTO executiveDTO : executiveList) {
-            if(StringUtils.isNotEmpty(executiveDTO.getMeasureStatus())) continue;
+            //待分配状态分发员可更新检定员
+            if(StringUtils.isNotEmpty(executiveDTO.getMeasureStatus()) && !MeasureStatusEnum.TO_ALLOCATE.equals(executiveDTO.getMeasureStatus())) continue;
             if(Objects.isNull(executiveDTO.getId())){
                 BusinessLabExecutiveInfo labExecutiveInfo = new BusinessLabExecutiveInfo();
                 labExecutiveInfo.setId(executiveDTO.getId());

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 688360e..4f67d85 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -52,7 +52,6 @@
              FROM  business_lab_executive_info  blei
              WHERE blei.order_id = #{orderId}
              AND blei.sample_id = #{sampleId}
-             AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status=3)<!--待分配or待检测均属于分发中的检测中-->
         ) blei
         JOIN sys_dept sd ON blei.measure_dept_id = sd.ID
         limit 1
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceBatchStatusChangeDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceBatchStatusChangeDTO.java
index 6b5601c..d6c755a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceBatchStatusChangeDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceBatchStatusChangeDTO.java
@@ -18,6 +18,7 @@
     @ApiModelProperty(value = "委托书样品关系列表", dataType = "list")
     private List<DeviceStatusChangeDTO> deviceStatusChangeDTOS;
 
+    //不同页面传入前进状态、回退状态不同，并且回退到对应状态的前一个状态码
     @ApiModelProperty(value = "状态变更(无需检测状态7,前进状态2、5、6,回退状态1,2,5)", dataType = "String")
     private String status;
 
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 91e49fe..f7a49e8 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
@@ -18,6 +18,7 @@
     @ApiModelProperty(value = "样品id", dataType = "Long")
     private Long sampleId;
 
+    //不同页面传入前进状态、回退状态不同，并且回退到对应状态的前一个状态码
     @ApiModelProperty(value = "状态变更(无需检测状态7,前进状态2、5、6,回退状态1,2,5)", dataType = "String")
     private String status;
 
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 c2cb75d..2d1b908 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
@@ -528,7 +528,8 @@
         //新增之前不存在的实验室列表（根据id判断）
         List<BusinessLabExecutiveInfo> addList = new ArrayList<>();
         for (UpdateExecutiveListDTO executiveDTO : executiveList) {
-            if(StringUtils.isNotEmpty(executiveDTO.getMeasureStatus())) continue;
+            //待分配状态分发员可更新检定员
+            if(StringUtils.isNotEmpty(executiveDTO.getMeasureStatus()) && !MeasureStatusEnum.TO_ALLOCATE.equals(executiveDTO.getMeasureStatus())) continue;
             if(Objects.isNull(executiveDTO.getId())){
                 BusinessLabExecutiveInfo labExecutiveInfo = new BusinessLabExecutiveInfo();
                 labExecutiveInfo.setId(executiveDTO.getId());
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 1308454..996b525 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
@@ -130,7 +130,7 @@
                 ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
                 sampleUpdateFlag = sampleUpdateFlag && returnDTO.getCode() == 200;
             }
-            sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(businessOrder.getId(), sampleInfo.getMeasureContent(), sampleInfo.getId()) > 0;
+            sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(businessOrder.getId(), businessOrder.getRemark(), sampleInfo.getMeasureContent(), sampleInfo.getId()) > 0;
         }
         if (updateFlag > 0 && sampleUpdateFlag) {
             return ReturnUtil.success();
@@ -162,7 +162,7 @@
                 ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode().equals(200);
             }
-            sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getMeasureContent(), sampleInfo.getId()) > 0;
+            sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getRemark(), sampleInfo.getMeasureContent(), sampleInfo.getId()) > 0;
         }
         if (addFlag > 0 && sampleAddFlag) {
             return ReturnUtil.success();
@@ -332,9 +332,10 @@
         return this.sampleRelationMapper.delete(sampleStatusRelationWrapper);
     }
 
-    private int sampleStatusCreator(Long orderId, String measureContent, Long sampleId) {
+    private int sampleStatusCreator(Long orderId, String remark, String measureContent, Long sampleId) {
         BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation();
         sampleStatusPopulation.setOrderId(orderId);
+        sampleStatusPopulation.setRemark(remark);
         sampleStatusPopulation.setSampleId(sampleId);
         sampleStatusPopulation.setMeasureContent(measureContent);
         sampleStatusPopulation.setMeasureType(INSIDE_MEASURE);

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 688360e..4f67d85 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml
@@ -52,7 +52,6 @@
              FROM  business_lab_executive_info  blei
              WHERE blei.order_id = #{orderId}
              AND blei.sample_id = #{sampleId}
-             AND (blei.measure_status = 1 OR blei.measure_status = 2 OR blei.measure_status=3)<!--待分配or待检测均属于分发中的检测中-->
         ) blei
         JOIN sys_dept sd ON blei.measure_dept_id = sd.ID
         limit 1
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceBatchStatusChangeDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceBatchStatusChangeDTO.java
index 6b5601c..d6c755a 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceBatchStatusChangeDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceBatchStatusChangeDTO.java
@@ -18,6 +18,7 @@
     @ApiModelProperty(value = "委托书样品关系列表", dataType = "list")
     private List<DeviceStatusChangeDTO> deviceStatusChangeDTOS;
 
+    //不同页面传入前进状态、回退状态不同，并且回退到对应状态的前一个状态码
     @ApiModelProperty(value = "状态变更(无需检测状态7,前进状态2、5、6,回退状态1,2,5)", dataType = "String")
     private String status;
 
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 91e49fe..f7a49e8 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
@@ -18,6 +18,7 @@
     @ApiModelProperty(value = "样品id", dataType = "Long")
     private Long sampleId;
 
+    //不同页面传入前进状态、回退状态不同，并且回退到对应状态的前一个状态码
     @ApiModelProperty(value = "状态变更(无需检测状态7,前进状态2、5、6,回退状态1,2,5)", dataType = "String")
     private String status;
 
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 c2cb75d..2d1b908 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
@@ -528,7 +528,8 @@
         //新增之前不存在的实验室列表（根据id判断）
         List<BusinessLabExecutiveInfo> addList = new ArrayList<>();
         for (UpdateExecutiveListDTO executiveDTO : executiveList) {
-            if(StringUtils.isNotEmpty(executiveDTO.getMeasureStatus())) continue;
+            //待分配状态分发员可更新检定员
+            if(StringUtils.isNotEmpty(executiveDTO.getMeasureStatus()) && !MeasureStatusEnum.TO_ALLOCATE.equals(executiveDTO.getMeasureStatus())) continue;
             if(Objects.isNull(executiveDTO.getId())){
                 BusinessLabExecutiveInfo labExecutiveInfo = new BusinessLabExecutiveInfo();
                 labExecutiveInfo.setId(executiveDTO.getId());
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 1308454..996b525 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
@@ -130,7 +130,7 @@
                 ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
                 sampleUpdateFlag = sampleUpdateFlag && returnDTO.getCode() == 200;
             }
-            sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(businessOrder.getId(), sampleInfo.getMeasureContent(), sampleInfo.getId()) > 0;
+            sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(businessOrder.getId(), businessOrder.getRemark(), sampleInfo.getMeasureContent(), sampleInfo.getId()) > 0;
         }
         if (updateFlag > 0 && sampleUpdateFlag) {
             return ReturnUtil.success();
@@ -162,7 +162,7 @@
                 ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode().equals(200);
             }
-            sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getMeasureContent(), sampleInfo.getId()) > 0;
+            sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getRemark(), sampleInfo.getMeasureContent(), sampleInfo.getId()) > 0;
         }
         if (addFlag > 0 && sampleAddFlag) {
             return ReturnUtil.success();
@@ -332,9 +332,10 @@
         return this.sampleRelationMapper.delete(sampleStatusRelationWrapper);
     }
 
-    private int sampleStatusCreator(Long orderId, String measureContent, Long sampleId) {
+    private int sampleStatusCreator(Long orderId, String remark, String measureContent, Long sampleId) {
         BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation();
         sampleStatusPopulation.setOrderId(orderId);
+        sampleStatusPopulation.setRemark(remark);
         sampleStatusPopulation.setSampleId(sampleId);
         sampleStatusPopulation.setMeasureContent(measureContent);
         sampleStatusPopulation.setMeasureType(INSIDE_MEASURE);
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 39ddf01..88fc9cc 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
@@ -106,11 +106,15 @@
                         //待分发状态，当前检定环节:待分配，已出具证书：无，出具证书总数:无
                         case TO_HANDOUT:
                             //检测中状态，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
+                            doDispatchVoPopulation(dispatchVO, sampleId, orderId, TO_HANDOUT);
+                            break;
                         case IN_MEASURE:
                             //检测完状态，当前检定环节:完成，已出具证书：无，出具证书总数:无
+                            doDispatchVoPopulation(dispatchVO, sampleId, orderId, IN_MEASURE);
+                            break;
                         case MEASURE_COMPLETE:
-                            doDispatchVoPopulation(dispatchVO, sampleId, orderId);
-                            return;
+                            doDispatchVoPopulation(dispatchVO, sampleId, orderId, MEASURE_COMPLETE);
+                            break;
                         //超期样品(即检测超期，未在应检完时间检完),当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
                         case BE_OVERDUE:
                             HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
@@ -241,8 +245,7 @@
     /**
      * 进行已收入分页的当前环节回填、出具证书回填
      */
-    private void doDispatchVoPopulation(DeviceDispatchVO dispatchVO, Long sampleId, Long orderId) {
-        dispatchVO.setCurrentSegment(EARNED_INCOME);
+    private void doDispatchVoPopulation(DeviceDispatchVO dispatchVO, Long sampleId, Long orderId, String currentSegment) {
         HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
         Integer measureNumberStatus = labExecutiveInfoMapper.getMeasureNumberStatus(orderId, sampleId);
         //证书，当前环节的回填
@@ -261,6 +264,12 @@
         } else {
             dispatchVO.setFallbackState(1);
         }
+        if(TO_HANDOUT.equals(currentSegment)){
+            dispatchVO.setCurrentSegment(TO_ALLOCATE);
+        }
+        if(MEASURE_COMPLETE.equals(currentSegment)){
+            dispatchVO.setCurrentSegment(COMPLETE);
+        }
     }
 
     private void updateLabExecutiveInfo(DeviceStatusChangeDTO deviceStatusChangeDTO, String measureStatus) {
@@ -399,6 +408,10 @@
         }
         BusinessOrderSampleRelation businessOrderSampleRelation = new BusinessOrderSampleRelation();
         businessOrderSampleRelation.setSampleStatus(statusChangeDTO.getStatus());
+        //回退操作更新实验室数据状态
+        if("1".equals(statusChangeDTO.getStatus())){
+            updateLabExecutiveInfo(statusChangeDTO, MeasureStatusEnum.TERMINATED);
+        }
         return this.orderSampleRelationMapper.update(businessOrderSampleRelation, queryWrapper);
     }