diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt
index 2cfcc662ad..937b37410f 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt
@@ -172,9 +172,9 @@ class TaxiCurrentTaskFragment : BaseFragment(),
                         mCurrentTaskWithOrder = taskAndOrderUiState.taskWithOrder
 
                         //如果在前往标定站点, 显示标定站点
-                        if (mDriveToNearestStationTask != null){
-                            return@collect
-                        }
+//                        if (mDriveToNearestStationTask != null){
+//                            return@collect
+//                        }
 
                         if (mCurrentTaskWithOrder == null) {
                             initContainerView(false)
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt
index f236edd44e..8c804727ad 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt
@@ -204,9 +204,7 @@ class TaxiCurrentTaskViewModel : BaseViewModel<UnmannedState, UnmannedIntent>(),
 
     override fun onTaskWithOrderDataChanged(result: QueryCurrentTaskRespBean.Result?) {
         d(TAG, "onTaskWithOrderChanged = result = " + GsonUtil.jsonFromObject(result))
-        result?.also {
-            updateTaskAndOrderUi(result)
-        }
+        updateTaskAndOrderUi(result)
     }
 
     override fun onTaskCompleted(isOrderArrivedAtStart: Boolean, siteId: Long) {
@@ -262,6 +260,7 @@ class TaxiCurrentTaskViewModel : BaseViewModel<UnmannedState, UnmannedIntent>(),
         } else {
             VoiceNotice.showNotice("暂停接单啦")
         }
+        // TODO 如果当前有订单就不要刷新
         updateDriveToNearestStationTaskUI(driveToNearestStationTask)
     }
 
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
index 2c3d9f59a0..6f4d5e2891 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
@@ -655,13 +655,17 @@ object TaxiTaskModel {
 
                     //订单或者伪任务更新, 都去刷新下界面
                     if (mCurrentTaskWithOrder == null
-                        || mCurrentTaskWithOrder!! != result
+                        || !mCurrentTaskWithOrder!!.equals(result)
                     ) {
                         d(TAG, "queryCurrentTaskOnce: 更新本地数据")
                         mCurrentTaskWithOrder = result
 
+                        // 任务为空
                         if (result.endSite == null && result.order == null) {
+                            d(TAG, "queryCurrentTaskOnce: 任务为空")
                             mCurrentTaskWithOrder = null
+                            mTaxiTaskWithOrderCallback?.onTaskWithOrderDataChanged(null)
+                            return
                         }
 
                         //当前任务完成且订单状态到达乘客上车点, 则立马去拉取任务 不再等30s,否则送驾任务要等30s后才能去执行
@@ -703,7 +707,9 @@ object TaxiTaskModel {
                             }
                         }
 
-                        mTaxiTaskWithOrderCallback?.onTaskWithOrderDataChanged(mCurrentTaskWithOrder)
+                        if (mDriveToNearestStationTask == null) {
+                            mTaxiTaskWithOrderCallback?.onTaskWithOrderDataChanged(mCurrentTaskWithOrder)
+                        }
                     }
                 }
 
@@ -1112,6 +1118,7 @@ object TaxiTaskModel {
      */
     fun clearCurrentOCHOrder() {
         mCurrentTaskWithOrder = null
+        mDriveToNearestStationTask = null
         clearAutopilotControlParameters()
         TaxiTrajectoryManager.getInstance().syncTrajectoryInfo()
         SharedPrefsMgr.getInstance(mContext).remove(TaxiUnmannedConst.SP_KEY_OCH_TAXI_ORDER)
@@ -1131,6 +1138,8 @@ object TaxiTaskModel {
             getChassisLocationGCJ02().latitude,
             getChassisLocationGCJ02().longitude
         )
+        mCurrentTaskWithOrder = null
+        mDriveToNearestStationTask = null
     }
 
     //导航去订单终点目的地