diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
index 7da2122640..441861d081 100644
--- a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
+++ b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
@@ -24,6 +24,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02Lis
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager.sendMsgToServer
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
@@ -37,6 +38,7 @@ import com.mogo.och.bus.passenger.bean.PM2RoutesResponse
 import com.mogo.och.bus.passenger.callback.AutoPilotStatusCallback
 import com.mogo.och.bus.passenger.callback.DrivingInfoCallback
 import com.mogo.och.bus.passenger.constant.BusPassengerConst
+import com.mogo.och.bus.passenger.model.PM2ServiceManager.driverAppSn
 import com.mogo.och.bus.passenger.network.PM2ModelLoopManager
 import com.mogo.och.common.module.bean.dpmsg.*
 import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager.pushAppOperationalMsgBox
@@ -188,7 +190,7 @@ class PM2DrivingModel private constructor() {
                         Logger.d(
                             SceneConstant.M_BUS_P + TAG, "onReceivedMsg = " + GsonUtils.toJson(msg)
                         )
-                        if (msg == null || msg.msg.isEmpty()) {
+                        if (msg == null || msg.msg?.isEmpty() == true) {
                             updateLocalOrder()
                             return
                         }
@@ -199,7 +201,7 @@ class PM2DrivingModel private constructor() {
                         }
 
                         if (routesResult == null ||
-                            (result != null && result.routesResult.writeVersion > routesResult!!.writeVersion)) {
+                            (result != null && result.routesResult?.writeVersion!! > routesResult!!.writeVersion)) {
                             routesResult = result.routesResult
                             updatePassengerRouteInfo(routesResult!!)
                         }
@@ -376,11 +378,11 @@ class PM2DrivingModel private constructor() {
                         updatePassengerRouteInfo(data.result)
                     }
 
-                    fun onError() {
+                    override fun onError() {
                         CallerLogger.d(
                             SceneConstant.Companion.M_BUS_P + TAG,
                             "queryDriverSiteByCoordinate = onError ="
-                                    + ", sn = " + BusPassengerServiceManager.driverAppSn
+                                    + ", sn = " + driverAppSn
                         )
                         queryDriverByLocalDriver()
                     }
@@ -416,7 +418,7 @@ class PM2DrivingModel private constructor() {
     private fun updatePassengerRouteInfo(result: BusRoutesResult) {
 
         if (result == null) {
-            clearLocalRouteResult()
+            updateLocalOrder()
             return
         }