diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
index 75cebb99..cbea3808 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
@@ -231,7 +231,7 @@ public class OrderController extends BaseController {
             orderMaster.setExpectTimeStart(DateUtils.parseDate(request.getServDate()+" "+split[0], "yyyy-MM-dd hh:mm"));
             orderMaster.setExpectTimeEnd(DateUtils.parseDate(request.getServDate()+" "+split[1], "yyyy-MM-dd hh:mm"));
         }catch (Exception e){
-            
+
         }
         orderMasterService.insertOrderMaster(orderMaster);
         Assert.notNull(orderMaster.getId(), "OrderMaster.id is null!");
@@ -392,9 +392,9 @@ public class OrderController extends BaseController {
                 om2up.setOrderStatus(OrderStatus.GOING.code());
             } else {
                 // 派完单 但是有其他师傅接单
-                om2up.setHasDispatchedAll(0);
+                om2up.setHasDispatchedAll(1);
                 om2up.setAllSelfAssigned(0);
-                om2up.setOrderStatus(OrderStatus.RECEIVE.code());
+                om2up.setOrderStatus(OrderStatus.PLAIN.code());
             }
         } else {
             // 未派完单