diff --git a/app/Http/Controllers/CampController.php b/app/Http/Controllers/CampController.php
index 83f48508..c122a258 100644
--- a/app/Http/Controllers/CampController.php
+++ b/app/Http/Controllers/CampController.php
@@ -17,7 +17,12 @@ class CampController extends Controller
     public function index(Request $request)
     {
         $province = $request->province ?? null;
-        $blockageDate = $request->blockage_date ?? null;
+        $city = $request->city ?? null;
+        $blockageStartDate = $request->blockage_start_date ?? null;
+        $blockageEndDate = $request->blockage_end_date ?? null;
+        $blockageDate = $blockageStartDate && $blockageEndDate ?
+            [$blockageStartDate . ' 00:00:00', $blockageEndDate . ' 23:59:59'] :
+            null;
         $axisType = $request->axis_type ?? null;
         $blockageReason = $request->blockage ?? null;
 
@@ -28,8 +33,11 @@ class CampController extends Controller
                                 ->when($province, function ($query, $province) {
                                     return $query->where('province_id', $province);
                                 })
+                                ->when($city, function ($query, $city) {
+                                    return $query->where('city_id', $city);
+                                })
                                 ->when($blockageDate, function ($query, $blockageDate) {
-                                    return $query->whereBetween('submited_at', [$blockageDate . ' 00:00:00', $blockageDate . ' 23:59:59']);
+                                    return $query->whereBetween('submited_at', $blockageDate);
                                 })
                                 ->when($axisType, function ($query, $axisType) {
                                     return $query->where('axis_type', $axisType);
@@ -48,6 +56,9 @@ class CampController extends Controller
                                 ->when($blockageDate, function ($query, $blockageDate) {
                                     return $query->whereBetween('submited_at', [$blockageDate . ' 00:00:00', $blockageDate . ' 23:59:59']);
                                 })
+                                ->when($city, function ($query, $city) {
+                                    return $query->where('city_id', $city);
+                                })
                                 ->when($axisType, function ($query, $axisType) {
                                     return $query->where('axis_type', $axisType);
                                 })