diff --git a/src/stores/chekin.ts b/src/stores/chekin.ts
index 0ffc891..c909e2a 100644
--- a/src/stores/chekin.ts
+++ b/src/stores/chekin.ts
@@ -22,10 +22,10 @@ export const useChekIn = defineStore('checkin', () => {
       checkInDateTime: e.checkInDate,
       checkInTime: e.checkInTime,
       checkOutTime: e.checkOutTime != '' ? e.checkOutTime : '-',
-      checkInStatus: convertStatus(e.checkInStatus),
+      checkInStatus: e.checkInStatus ? convertStatus(e.checkInStatus) : '-',
       checkOutStatus:
         e.checkOutStatus != null ? convertStatus(e.checkOutStatus) : '-',
-      checkInLocation: e.checkInLocation,
+      checkInLocation: e.checkInLocation ? e.checkInLocation : '-',
       checkOutLocation: e.checkOutLocation != '' ? e.checkOutLocation : '-',
       editStatus: e.editStatus != '' ? convertEditStatus(e.editStatus) : '',
       editReason: e.editReason,