diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index 85b5193..9567b34 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -64,15 +64,7 @@
             count = new AtomicLong(0);
             num.append(datePrefix).append("000").append(count.incrementAndGet());
         }else{
-            String s = String.valueOf(nowNum);
-            String substring = s.substring(0, s.length() - 4);
-            //不是预约送达日期，从0计算后4位
-            if (!datePrefix.equals(substring)) {
-                count = new AtomicLong(0);
-                num.append(datePrefix).append("000").append(count.incrementAndGet());
-            } else {
-                num.append(count.incrementAndGet());
-            }
+            num.append(count.incrementAndGet());
         }
 
         // 组合

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index 85b5193..9567b34 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -64,15 +64,7 @@
             count = new AtomicLong(0);
             num.append(datePrefix).append("000").append(count.incrementAndGet());
         }else{
-            String s = String.valueOf(nowNum);
-            String substring = s.substring(0, s.length() - 4);
-            //不是预约送达日期，从0计算后4位
-            if (!datePrefix.equals(substring)) {
-                count = new AtomicLong(0);
-                num.append(datePrefix).append("000").append(count.incrementAndGet());
-            } else {
-                num.append(count.incrementAndGet());
-            }
+            num.append(count.incrementAndGet());
         }
 
         // 组合
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java
index a087e92..9254817 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java
@@ -1,8 +1,8 @@
 package com.casic.missiles.mapper.business;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.dto.cockpit.CityTopResponse;
 import com.casic.missiles.dto.cockpit.BusTrendResponse;
+import com.casic.missiles.dto.cockpit.CityTopResponse;
 import com.casic.missiles.model.business.BusinessOrder;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -22,6 +22,7 @@
     @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
     Long selectMaxOrderNo();
 
+
     List<Long> selectIdsByStatus(@Param("orderStatus") String orderStatus);
 
     Integer ordersToday();
@@ -37,4 +38,7 @@
     List<BusTrendResponse> selectPreMonthCountByYear();
 
     BusinessOrder selectDetailById(@Param("id") Long id);
+
+    Long selectMaxOrderNoByDate(@Param("datePrefix") String datePrefix);
+
 }

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index 85b5193..9567b34 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -64,15 +64,7 @@
             count = new AtomicLong(0);
             num.append(datePrefix).append("000").append(count.incrementAndGet());
         }else{
-            String s = String.valueOf(nowNum);
-            String substring = s.substring(0, s.length() - 4);
-            //不是预约送达日期，从0计算后4位
-            if (!datePrefix.equals(substring)) {
-                count = new AtomicLong(0);
-                num.append(datePrefix).append("000").append(count.incrementAndGet());
-            } else {
-                num.append(count.incrementAndGet());
-            }
+            num.append(count.incrementAndGet());
         }
 
         // 组合
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java
index a087e92..9254817 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java
@@ -1,8 +1,8 @@
 package com.casic.missiles.mapper.business;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.dto.cockpit.CityTopResponse;
 import com.casic.missiles.dto.cockpit.BusTrendResponse;
+import com.casic.missiles.dto.cockpit.CityTopResponse;
 import com.casic.missiles.model.business.BusinessOrder;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -22,6 +22,7 @@
     @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
     Long selectMaxOrderNo();
 
+
     List<Long> selectIdsByStatus(@Param("orderStatus") String orderStatus);
 
     Integer ordersToday();
@@ -37,4 +38,7 @@
     List<BusTrendResponse> selectPreMonthCountByYear();
 
     BusinessOrder selectDetailById(@Param("id") Long id);
+
+    Long selectMaxOrderNoByDate(@Param("datePrefix") String datePrefix);
+
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index e336ea1..d629e56 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -107,4 +107,11 @@
         JOIN customer_info ci ON bo.customer_id = ci.id
         WHERE bo.id = #{id}
     </select>
+
+    <select id="selectMaxOrderNoByDate" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(order_code, 12)), 0)
+        FROM business_order
+        WHERE order_code LIKE concat('%',#{datePrefix},'%')
+        LIMIT 1;
+    </select>
 </mapper>

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index 85b5193..9567b34 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -64,15 +64,7 @@
             count = new AtomicLong(0);
             num.append(datePrefix).append("000").append(count.incrementAndGet());
         }else{
-            String s = String.valueOf(nowNum);
-            String substring = s.substring(0, s.length() - 4);
-            //不是预约送达日期，从0计算后4位
-            if (!datePrefix.equals(substring)) {
-                count = new AtomicLong(0);
-                num.append(datePrefix).append("000").append(count.incrementAndGet());
-            } else {
-                num.append(count.incrementAndGet());
-            }
+            num.append(count.incrementAndGet());
         }
 
         // 组合
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java
index a087e92..9254817 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java
@@ -1,8 +1,8 @@
 package com.casic.missiles.mapper.business;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.dto.cockpit.CityTopResponse;
 import com.casic.missiles.dto.cockpit.BusTrendResponse;
+import com.casic.missiles.dto.cockpit.CityTopResponse;
 import com.casic.missiles.model.business.BusinessOrder;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -22,6 +22,7 @@
     @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
     Long selectMaxOrderNo();
 
+
     List<Long> selectIdsByStatus(@Param("orderStatus") String orderStatus);
 
     Integer ordersToday();
@@ -37,4 +38,7 @@
     List<BusTrendResponse> selectPreMonthCountByYear();
 
     BusinessOrder selectDetailById(@Param("id") Long id);
+
+    Long selectMaxOrderNoByDate(@Param("datePrefix") String datePrefix);
+
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index e336ea1..d629e56 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -107,4 +107,11 @@
         JOIN customer_info ci ON bo.customer_id = ci.id
         WHERE bo.id = #{id}
     </select>
+
+    <select id="selectMaxOrderNoByDate" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(order_code, 12)), 0)
+        FROM business_order
+        WHERE order_code LIKE concat('%',#{datePrefix},'%')
+        LIMIT 1;
+    </select>
 </mapper>
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 c54129d..e21d452 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
@@ -889,8 +889,10 @@
         List<SampleOperateRequest> preList = new ArrayList<>();
         List<SampleOperateRequest> inList = labExecutiveInfoMapper.selectListForSampleOperate(requestList, userId, MeasureStatusEnum.IN_MEASURE);
         List<SampleOperateRequest> toList = labExecutiveInfoMapper.selectListForSampleOperate(requestList, userId, MeasureStatusEnum.TO_MEASURE);
+        List<SampleOperateRequest> noList = labExecutiveInfoMapper.selectListForSampleOperate(requestList, userId, SampleStatusEnum.NO_NEED_MEASURE);
         preList.addAll(inList);
         preList.addAll(toList);
+        preList.addAll(noList);
         if (CollectionUtils.isEmpty(preList)) {
             //throw new BusinessException(BusinessExceptionEnum.COMPLETE_SAMPLE_NOT_EXIST);
             return ReturnUtil.success();

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
index 85b5193..9567b34 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/NumberGeneratorUtil.java
@@ -64,15 +64,7 @@
             count = new AtomicLong(0);
             num.append(datePrefix).append("000").append(count.incrementAndGet());
         }else{
-            String s = String.valueOf(nowNum);
-            String substring = s.substring(0, s.length() - 4);
-            //不是预约送达日期，从0计算后4位
-            if (!datePrefix.equals(substring)) {
-                count = new AtomicLong(0);
-                num.append(datePrefix).append("000").append(count.incrementAndGet());
-            } else {
-                num.append(count.incrementAndGet());
-            }
+            num.append(count.incrementAndGet());
         }
 
         // 组合
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java
index a087e92..9254817 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderMapper.java
@@ -1,8 +1,8 @@
 package com.casic.missiles.mapper.business;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.dto.cockpit.CityTopResponse;
 import com.casic.missiles.dto.cockpit.BusTrendResponse;
+import com.casic.missiles.dto.cockpit.CityTopResponse;
 import com.casic.missiles.model.business.BusinessOrder;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -22,6 +22,7 @@
     @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
     Long selectMaxOrderNo();
 
+
     List<Long> selectIdsByStatus(@Param("orderStatus") String orderStatus);
 
     Integer ordersToday();
@@ -37,4 +38,7 @@
     List<BusTrendResponse> selectPreMonthCountByYear();
 
     BusinessOrder selectDetailById(@Param("id") Long id);
+
+    Long selectMaxOrderNoByDate(@Param("datePrefix") String datePrefix);
+
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
index e336ea1..d629e56 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderMapper.xml
@@ -107,4 +107,11 @@
         JOIN customer_info ci ON bo.customer_id = ci.id
         WHERE bo.id = #{id}
     </select>
+
+    <select id="selectMaxOrderNoByDate" resultType="java.lang.Long">
+        SELECT IFNULL(max(RIGHT(order_code, 12)), 0)
+        FROM business_order
+        WHERE order_code LIKE concat('%',#{datePrefix},'%')
+        LIMIT 1;
+    </select>
 </mapper>
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 c54129d..e21d452 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
@@ -889,8 +889,10 @@
         List<SampleOperateRequest> preList = new ArrayList<>();
         List<SampleOperateRequest> inList = labExecutiveInfoMapper.selectListForSampleOperate(requestList, userId, MeasureStatusEnum.IN_MEASURE);
         List<SampleOperateRequest> toList = labExecutiveInfoMapper.selectListForSampleOperate(requestList, userId, MeasureStatusEnum.TO_MEASURE);
+        List<SampleOperateRequest> noList = labExecutiveInfoMapper.selectListForSampleOperate(requestList, userId, SampleStatusEnum.NO_NEED_MEASURE);
         preList.addAll(inList);
         preList.addAll(toList);
+        preList.addAll(noList);
         if (CollectionUtils.isEmpty(preList)) {
             //throw new BusinessException(BusinessExceptionEnum.COMPLETE_SAMPLE_NOT_EXIST);
             return ReturnUtil.success();
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 7c2afa0..df4e8d4 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
@@ -357,6 +357,7 @@
             SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
             DateTime planDeliverTime = DateUtil.parse(businessOrder.getPlanDeliverTime());
             String datePrefix = format.format(planDeliverTime);
+            maxNo = this.baseMapper.selectMaxOrderNoByDate(datePrefix);
             orderNo = NumberGeneratorUtil.getOrderContactNo(ORDER_PREFIX, datePrefix, maxNo);
         } else {
             orderNo = NumberGeneratorUtil.getContactNo(ORDER_PREFIX, maxNo);