diff --git a/src/controllers/branch/branch-controller.ts b/src/controllers/branch/branch-controller.ts
index 51d03f3..7f8c448 100644
--- a/src/controllers/branch/branch-controller.ts
+++ b/src/controllers/branch/branch-controller.ts
@@ -22,4 +22,47 @@ import { RequestWithUser } from "../../interfaces/user";
 @Tags("Branch")
 @Security("keycloak")
 export class BranchController extends Controller {
+  @Get()
+  async getBranch(
+    @Query() zipCode?: string,
+    @Query() query: string = "",
+    @Query() page: number = 1,
+    @Query() pageSize: number = 30,
+  ) {
+    const where = {
+      OR: [
+        { nameEN: { contains: query }, zipCode },
+        { nameTH: { contains: query }, zipCode },
+        { email: { contains: query }, zipCode },
+      ],
+    } satisfies Prisma.BranchWhereInput;
+
+    const [result, total] = await prisma.$transaction([
+      prisma.branch.findMany({
+        include: {
+          province: true,
+          district: true,
+          subDistrict: true,
+        },
+        where,
+        take: pageSize,
+        skip: (page - 1) * pageSize,
+      }),
+      prisma.branch.count({ where }),
+    ]);
+
+    return { result, page, pageSize, total };
+  }
+
+  @Get("{branchId}")
+  async getBranchById(@Path() branchId: string) {
+    return await prisma.branch.findFirst({
+      include: {
+        province: true,
+        district: true,
+        subDistrict: true,
+      },
+      where: { id: branchId },
+    });
+  }
 }