diff --git a/app/Http/Controllers/RoomControlController.php b/app/Http/Controllers/RoomControlController.php
index 4fab0ab..d59e037 100644
--- a/app/Http/Controllers/RoomControlController.php
+++ b/app/Http/Controllers/RoomControlController.php
@@ -70,7 +70,7 @@ class RoomControlController extends Controller
      */
     public function receiveRegister(ReceiveRoomRegisterRequest $request): JsonResponse 
     {
-        $data = $request->only(['branch_name', 'room_name', 'room_ip', 'email']); // 不記錄密碼
+        $data = $request->only(['branch_id', 'room_name', 'room_ip', 'email']); // 不記錄密碼
         Log::info('Token Request Payload:', $data);
 
         // 1. 驗證帳密（登入用）
@@ -103,8 +103,7 @@ class RoomControlController extends Controller
             $roomType = strtolower($matches[1]); // 'PC' → 'pc'
             $roomName = $matches[2];             // '101'
         }
-        $branch=Branch::where('name',$validated['branch_name'])->first();
-        $room = Room::where('branch_id', $branch->id)
+        $room = Room::where('branch_id', $validated['branch_id'])
             ->where('name', $roomName)
             ->where('type', $roomType)
             ->first();
@@ -184,8 +183,7 @@ class RoomControlController extends Controller
             $roomType = strtolower($matches[1]); // 'PC' → 'pc'
             $roomName = $matches[2];             // '101'
         }
-        $branch=Branch::where('name',$validated['branch_name'])->first();
-        $room = Room::where('branch_id', $branch->id)
+        $room = Room::where('branch_id', $validated['branch_id'])
             ->where('name', $roomName)
             ->where('type', $roomType)
             ->first();
diff --git a/app/Http/Requests/ReceiveRoomRegisterRequest.php b/app/Http/Requests/ReceiveRoomRegisterRequest.php
index 693d935..d092061 100644
--- a/app/Http/Requests/ReceiveRoomRegisterRequest.php
+++ b/app/Http/Requests/ReceiveRoomRegisterRequest.php
@@ -7,8 +7,8 @@ use Illuminate\Foundation\Http\FormRequest;
 /**
  * @OA\Schema(
  *     schema="ReceiveRoomRegisterRequest",
- *     required={"branch_name", "room_name", "email" ,"password"},
- *     @OA\Property(property="branch_name", type="string", example="測試"),
+ *     required={"branch_id", "room_name", "email" ,"password"},
+ *     @OA\Property(property="branch_id", type="integer", example="1"),
  *     @OA\Property(property="room_name", type="string", example="PC101"),
  *     @OA\Property(property="room_ip", type="string", example="192.168.1.1"),
  *     @OA\Property(property="email", type="string", example="XX@gmail.com"),
@@ -25,7 +25,7 @@ class ReceiveRoomRegisterRequest extends ApiRequest
     public function rules(): array
     {
         return [
-            'branch_name' => 'required|string|exists:branches,name',
+            'branch_id' => 'required|integer|exists:branches,id',
             'room_name' => 'required|string',
             'room_ip' => 'required|string',
             'email' => 'required|email',
diff --git a/app/Http/Requests/ReceiveRoomStatusDataRequest.php b/app/Http/Requests/ReceiveRoomStatusDataRequest.php
index ae90d82..f392b8d 100644
--- a/app/Http/Requests/ReceiveRoomStatusDataRequest.php
+++ b/app/Http/Requests/ReceiveRoomStatusDataRequest.php
@@ -7,8 +7,8 @@ use Illuminate\Foundation\Http\FormRequest;
 /**
  * @OA\Schema(
  *     schema="ReceiveRoomStatusDataRequest",
- *     required={"branch_name","hostname", "ip", "status"},
- *     @OA\Property(property="branch_name", type="string", example="測試"),
+ *     required={"branch_id","hostname", "ip", "status"},
+ *     @OA\Property(property="branch_id", type="integer", example="1"),
  *     @OA\Property(property="hostname", type="string", example="PC101"),
  *     @OA\Property(property="ip", type="string", example="192.168.XX.XX"),
  *     @OA\Property(property="cpu", type="numeric", example="0.00"),
@@ -26,7 +26,7 @@ class ReceiveRoomStatusDataRequest extends ApiRequest
     public function rules(): array
     {
         return [
-            'branch_name' =>'required|string|exists:branches,name',
+            'branch_id' =>'required|integer|exists:branches,id',
             'hostname' => 'required|string',
             'ip' => 'required|string',
             'cpu' => 'nullable|numeric',