diff --git a/src/controllers/user_to_room.ts b/src/controllers/user_to_room.ts
index a8f2b75..c3620f8 100644
--- a/src/controllers/user_to_room.ts
+++ b/src/controllers/user_to_room.ts
@@ -449,6 +449,63 @@ export class UserToRoomController {
     }
 
     static async listRoom(req: Request, res: Response, next: NextFunction): Promise<void | Response> {
+        /*
+            #swagger.tags = ['UserToRoom']
+            #swagger.security = [{ "bearerAuth": [] }]
+            #swagger.parameters['filter'] = { description: 'Filter in JSON format. Available fields: user_id (string, uuid, exact match), name (string, partial match case-insensitive), status (string, exact match). Example: {\"user_id\":\"uuid-here\",\"name\":\"john\",\"status\":\"active\"}', in: 'query', type: 'string' }
+            #swagger.parameters['limit'] = { in: 'query', required: true, type: 'number' }
+            #swagger.parameters['page'] = { in: 'query', required: true, type: 'number' }
+            #swagger.parameters['with_deleted'] = { in: 'query', required: true, type: 'boolean' }
+            #swagger.parameters['order_field'] = { in: 'query', required: true, type: 'string' }
+            #swagger.parameters['order_direction'] = { in: 'query', required: true, schema: { '@enum': ['ASC', 'DESC'] } }
+        */
+        try {
+            const schema = Joi.object().keys({
+                filter: Joi.string().allow("").optional().label("Filter"),
+                page: Joi.number().required().min(1).label("Page"),
+                limit: Joi.number().required().min(1).label("Limit"),
+                with_deleted: Joi.bool().required().label("With Deleted"),
+                order_field: Joi.string().required().label("Order Field"),
+                order_direction: Joi.string().allow("asc", "desc").required().label("Order Direction"),
+            });
+
+            let param: Paging = await schema.validateAsync(req.query);
+            let filter = param.filter && param.filter !== "" ? JSON.parse(param.filter) : {};
+
+            const query = await RoomModel.list(filter);
+
+            const offset = (param.page - 1) * param.limit;
+            const limit = param.limit;
+
+            const res_count = query;
+            const res_list = query
+                .leftJoinAndSelect("Room.department", "department")
+                .orderBy("Room." + param.order_field, param.order_direction as "ASC" | "DESC")
+                .take(limit)
+                .skip(offset);
+
+            if (param.with_deleted) {
+                res_count.withDeleted();
+                res_list.withDeleted();
+            }
+
+            const current_page = param.page;
+            const total_count_data = await res_count.getCount();
+            const list_data = await res_list.getMany();
+            const count_data = CommonHelper.countObject(list_data);
+
+            return ReturnHelper.successResponselist(
+                res, 200, Language.lang.success_view, count_data, current_page, total_count_data, list_data
+            );
+        }
+        catch (e: unknown) {
+            log.error(e);
+            const err = e as Error;
+            return ReturnHelper.errorResponse(res, 400, 401, Language.lang.failed_not_found, err.message);
+        }
+    }
+
+    static async listRoomByUser(req: Request, res: Response, next: NextFunction): Promise<void | Response> {
         /*
             #swagger.tags = ['UserToRoom']
             #swagger.security = [{ "bearerAuth": [] }]
diff --git a/src/routes/private.ts b/src/routes/private.ts
index 1acbf77..e30aa04 100644
--- a/src/routes/private.ts
+++ b/src/routes/private.ts
@@ -511,7 +511,8 @@ export class RoutePrivate {
 		app.get("/api/user-to-room/export", UserToRoomController.export);
 		app.put("/api/user-to-room/update/:user_id", UserToRoomController.update);
 		app.get("/api/user-to-room/view/:id", UserToRoomController.detail);
-		app.get("/api/user-to-room/list-room/:user_id", UserToRoomController.listRoom);
+		app.get("/api/user-to-room/list-room", UserToRoomController.listRoom);
+		app.get("/api/user-to-room/list-room/:user_id", UserToRoomController.listRoomByUser);
 
 		app.get("/api/room-to-pharmacy/list", RoomToPharmacyController.list);
 		app.get("/api/room-to-pharmacy/export", RoomToPharmacyController.export);