diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java b/src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java
index 89d9e58cd..4febf3033 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java
@@ -172,7 +172,7 @@ public class ZCLogicLoop {
                 break;
             }
             //非通信车占用区段
-            if (temp.isNonCbtcOccupy()) {
+            if (temp.isNonCbtcOccupy() && !temp.isSwitchTrack()) {
                 deviceEnd = new MovementAuthority.End(section,
                         MovementAuthority.EndType.NCT_OCCUPIED_IN_FRONT_OF_SECTION);
                 break;
diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/data/CalculateService.java b/src/main/java/club/joylink/rtss/simulation/cbtc/data/CalculateService.java
index f29a3efa8..f36a4f48c 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/data/CalculateService.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/data/CalculateService.java
@@ -737,15 +737,15 @@ public class CalculateService {
                     Set<Section> sections = routeMap.keySet();
                     for (Section last : sections) {
                         List<Route> tempList = routeMap.get(last);
-                        if (tempList.contains(lastRouteSection)) {
+                        if (Objects.equals(last, lastRouteSection)) {
+                            break;
+                        }
+                        if (tempList.get(0).getSectionList().contains(lastRouteSection)) {
                             handled = true;
                             tempList.add(route);
                             List<Route> nextRouteList = route.getDestination().getRouteList();
-                            if (nextRouteList.size() == 1 &&
-                                    Objects.equals(nextRouteList.get(0).getLastRouteSection(), last)) {
+                            if (nextRouteList.size() == 1) {
                                 tempList.addAll(nextRouteList);
-                            } else {
-                                throw BusinessExceptionAssertEnum.SYSTEM_EXCEPTION.exception();
                             }
                         }
                     }