diff --git a/web/App_Code/api/guadanOrderController.cs b/web/App_Code/api/guadanOrderController.cs
index b3966af..497ce3d 100644
--- a/web/App_Code/api/guadanOrderController.cs
+++ b/web/App_Code/api/guadanOrderController.cs
@@ -69,15 +69,18 @@ public class guadanOrderController : ApiController
                 .Where(c => c.RegionRoomBedStatus.Code != GuaDanOrderGuest.STATUS_CANCELLED)
                 .Count(),
                 statusName = _db.GuaDanOrderGuest
-                .Where(g => g.GuaDanOrderNo == a.GuaDanOrderNo)
-                .All(g => g.StatusCode == "404") ? "預約" :
+                .Where(g => g.GuaDanOrderNo == a.GuaDanOrderNo && a.IsDeleted == false)
+                .Where(g => g.StatusCode != GuaDanOrderGuest.STATUS_CANCELLED)
+                .All(g => g.StatusCode == "401") ? "預約" :
                 _db.GuaDanOrderGuest
-                .Where(g => g.GuaDanOrderNo == a.GuaDanOrderNo)
+                .Where(g => g.GuaDanOrderNo == a.GuaDanOrderNo && a.IsDeleted == false)
+                .Where(g => g.StatusCode != GuaDanOrderGuest.STATUS_CANCELLED)
                 .All(g => g.StatusCode == "403") ? "全部退房" :
                 _db.GuaDanOrderGuest
-                .Where(g => g.GuaDanOrderNo == a.GuaDanOrderNo)
-                .Any(g => g.StatusCode == "401") ? "正在入住" :
-                "混合狀態"
+                .Where(g => g.GuaDanOrderNo == a.GuaDanOrderNo && a.IsDeleted == false)
+                .Where(g => g.StatusCode != GuaDanOrderGuest.STATUS_CANCELLED)
+                .Any(g => g.StatusCode == "402" && a.IsCancel == false) ? "正在入住" :
+                "部分退房"
             })
             .Skip((search.page - 1) * search.pageSize)
             .Take(search.pageSize)