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 2d1b908..44cfd33 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
@@ -464,7 +464,7 @@
                     //更新下一个审批的实验室为待分配
                     //注：分发员不可以调整待分配/检测中等有状态的节点（只能调整无状态的）
                     Optional<BusinessLabExecutiveInfo> minSeqLab = labExecutiveInfos.stream().filter(dto ->
-                            StringUtils.isEmpty(dto.getMeasureStatus()) && Objects.isNull(dto.getMeasurePersonId())
+                            StringUtils.isEmpty(dto.getMeasureStatus()) /*&& Objects.isNull(dto.getMeasurePersonId())*/
                     ).sorted(Comparator.comparing(BusinessLabExecutiveInfo::getMeasureStatus)).findFirst();
                     if(minSeqLab.isPresent()){
                         BusinessLabExecutiveInfo labExecutiveInfo = minSeqLab.get();

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 2d1b908..44cfd33 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
@@ -464,7 +464,7 @@
                     //更新下一个审批的实验室为待分配
                     //注：分发员不可以调整待分配/检测中等有状态的节点（只能调整无状态的）
                     Optional<BusinessLabExecutiveInfo> minSeqLab = labExecutiveInfos.stream().filter(dto ->
-                            StringUtils.isEmpty(dto.getMeasureStatus()) && Objects.isNull(dto.getMeasurePersonId())
+                            StringUtils.isEmpty(dto.getMeasureStatus()) /*&& Objects.isNull(dto.getMeasurePersonId())*/
                     ).sorted(Comparator.comparing(BusinessLabExecutiveInfo::getMeasureStatus)).findFirst();
                     if(minSeqLab.isPresent()){
                         BusinessLabExecutiveInfo labExecutiveInfo = minSeqLab.get();
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 88fc9cc..92c54eb 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
@@ -105,16 +105,22 @@
                     switch (sampleStatus) {
                         //待分发状态，当前检定环节:待分配，已出具证书：无，出具证书总数:无
                         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, MEASURE_COMPLETE);
                             break;
+                        case TO_GIVE_BACK:
+                            doDispatchVoPopulation(dispatchVO, sampleId, orderId, TO_GIVE_BACK);
+                            break;
+                        case GIVE_BACK_COMPLETE:
+                            doDispatchVoPopulation(dispatchVO, sampleId, orderId, GIVE_BACK_COMPLETE);
+                            break;
                         //超期样品(即检测超期，未在应检完时间检完),当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
                         case BE_OVERDUE:
                             HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
@@ -267,7 +273,7 @@
         if(TO_HANDOUT.equals(currentSegment)){
             dispatchVO.setCurrentSegment(TO_ALLOCATE);
         }
-        if(MEASURE_COMPLETE.equals(currentSegment)){
+        if(MEASURE_COMPLETE.equals(currentSegment) || TO_GIVE_BACK.equals(currentSegment) || GIVE_BACK_COMPLETE.equals(currentSegment)){
             dispatchVO.setCurrentSegment(COMPLETE);
         }
     }