diff --git a/app/Exports/V3/RoadItemsProjects/CountryActivityPerItemReport.php b/app/Exports/V3/RoadItemsProjects/CountryActivityPerItemReport.php
index 692f21af..a5f33307 100644
--- a/app/Exports/V3/RoadItemsProjects/CountryActivityPerItemReport.php
+++ b/app/Exports/V3/RoadItemsProjects/CountryActivityPerItemReport.php
@@ -21,7 +21,7 @@ class CountryActivityPerItemReport implements FromView, WithEvents, ShouldAutoSi
 
     public function view(): View
     {
-        $fromDate = $this->fromDate ?? '2021-03-21';
+        $fromDate = $this->fromDate ?? '2021-03-21 00:00:00';
         $toDate = $this->toDate ?? \Carbon\Carbon::now();
 
         $query = "SELECT 
@@ -43,7 +43,7 @@ class CountryActivityPerItemReport implements FromView, WithEvents, ShouldAutoSi
                 COUNT(CASE WHEN item = 16 THEN 1 END) AS EmergencyCount,
                 province_fa,
                 province_id,
-                COUNT(CASE WHEN item != -1 THEN 1 END) AS TotalProvinceCount
+                COUNT(CASE WHEN item != 20 THEN 1 END) AS TotalProvinceCount
             FROM (
                 SELECT 
                     province_fa,
@@ -51,7 +51,7 @@ class CountryActivityPerItemReport implements FromView, WithEvents, ShouldAutoSi
                     item,
                     status
                 FROM road_items_projects
-                WHERE activity_date_time BETWEEN '{$fromDate} 00:00:00' and '{$toDate} 23:59:59'
+                WHERE activity_date_time BETWEEN '{$fromDate}' and '{$toDate}'
             ) AS merged_table
             WHERE status = 1
             GROUP BY province_id, province_fa;";
diff --git a/app/Exports/V3/RoadItemsProjects/ProvinceActivityPerItemReport.php b/app/Exports/V3/RoadItemsProjects/ProvinceActivityPerItemReport.php
index 5afd7875..7b8f99b2 100644
--- a/app/Exports/V3/RoadItemsProjects/ProvinceActivityPerItemReport.php
+++ b/app/Exports/V3/RoadItemsProjects/ProvinceActivityPerItemReport.php
@@ -24,7 +24,7 @@ class ProvinceActivityPerItemReport implements FromView, WithEvents, ShouldAutoS
 
     public function view(): View
     {
-        $fromDate = $this->fromDate ?? '2021-03-21';
+        $fromDate = $this->fromDate ?? '2021-03-21 00:00:00';
         $toDate = $this->toDate ?? \Carbon\Carbon::now();
 
         $query = "SELECT 
@@ -48,7 +48,7 @@ class ProvinceActivityPerItemReport implements FromView, WithEvents, ShouldAutoS
                 province_id,
                 edarat_name,
                 edarat_id,
-                COUNT(CASE WHEN item != -1 THEN 1 END) AS TotalCityCount
+                COUNT(CASE WHEN item != 20 THEN 1 END) AS TotalCityCount
             FROM (
                 SELECT 
                     province_fa,
@@ -58,11 +58,11 @@ class ProvinceActivityPerItemReport implements FromView, WithEvents, ShouldAutoS
                     item,
                     status
                 FROM road_items_projects
-                WHERE activity_date_time BETWEEN '{$fromDate} 00:00:00' and '{$toDate} 23:59:59'
+                WHERE activity_date_time BETWEEN '{$fromDate}' and '{$toDate}'
             ) AS merged_table
             WHERE status = 1
             AND province_id = {$this->provinceId}
-            GROUP BY edarat_id, edarat_name, order by province_id ASC;";
+            GROUP BY edarat_id, edarat_name order by province_id ASC;";
 
         $cityActivities = collect(DB::select($query));
 
diff --git a/resources/views/v3/Reports/RoadItems/CountryActivityPerItem.blade.php b/resources/views/v3/Reports/RoadItems/CountryActivityPerItem.blade.php
index 1fb13aec..cc387f3d 100644
--- a/resources/views/v3/Reports/RoadItems/CountryActivityPerItem.blade.php
+++ b/resources/views/v3/Reports/RoadItems/CountryActivityPerItem.blade.php
@@ -67,6 +67,27 @@
     </thead>
 
     <tbody>
+        <tr>
+            <td style="border:1px solid black;text-align: center;">کل کشور</td>
+            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalMarematRooyeCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalPaksaziCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalAlaemCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalHefazCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalRoshanayiCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalKhatkeshiCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalRangamiziCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalWashingCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalImenSaziCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalHarimCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalPolCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalToonelCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalAmaliatZemestaniCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalMashinAlatCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalTollhouseCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalEmergencyCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalCountryCount'] }}</td>
+        </tr>
+
     @foreach ($provinceCount as $activity)
         <tr>
             <td style="border:1px solid black;text-align: center;">{{ $activity->province_fa }}</td>
@@ -89,26 +110,6 @@
             <td style="border:1px solid black;text-align: center;">{{ $activity->TotalProvinceCount }}</td>
         </tr>
     @endforeach
-        <tr>
-            <td style="border:1px solid black;text-align: center;">کشوری</td>
-            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalMarematRooyeCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalPaksaziCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalAlaemCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalHefazCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalRoshanayiCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalKhatkeshiCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalRangamiziCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalWashingCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalImenSaziCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalHarimCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalPolCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalToonelCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalAmaliatZemestaniCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalMashinAlatCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalTollhouseCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalEmergencyCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $countryCount['totalCountryCount'] }}</td>
-        </tr>
     </tbody>
 
 
diff --git a/resources/views/v3/Reports/RoadItems/ProvinceActivityPerItem.blade.php b/resources/views/v3/Reports/RoadItems/ProvinceActivityPerItem.blade.php
index abacb6e1..55a708ee 100644
--- a/resources/views/v3/Reports/RoadItems/ProvinceActivityPerItem.blade.php
+++ b/resources/views/v3/Reports/RoadItems/ProvinceActivityPerItem.blade.php
@@ -67,9 +67,30 @@
     </thead>
 
     <tbody>
+        <tr>
+            <td style="border:1px solid black;text-align: center;">کل استان</td>
+            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalMarematRooyeCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalPaksaziCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalAlaemCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalHefazCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalRoshanayiCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalKhatkeshiCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalRangamiziCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalWashingCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalImenSaziCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalHarimCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalPolCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalToonelCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalAmaliatZemestaniCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalMashinAlatCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalTollhouseCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalEmergencyCount'] }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['TotalProvinceCount'] }}</td>
+        </tr>
+
     @foreach ($cityCount as $activity)
         <tr>
-            <td style="border:1px solid black;text-align: center;">{{ $activity->province_fa }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $activity->edarat_name }}</td>
             <td style="border:1px solid black;text-align: center;">{{ $activity->MarematRooyeCount }}</td>
             <td style="border:1px solid black;text-align: center;">{{ $activity->PaksaziCount }}</td>
             <td style="border:1px solid black;text-align: center;">{{ $activity->AlaemCount }}</td>
@@ -89,26 +110,6 @@
             <td style="border:1px solid black;text-align: center;">{{ $activity->TotalCityCount }}</td>
         </tr>
     @endforeach
-        <tr>
-            <td style="border:1px solid black;text-align: center;">کشوری</td>
-            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalMarematRooyeCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalPaksaziCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalAlaemCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalHefazCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalRoshanayiCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalKhatkeshiCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalRangamiziCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalWashingCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalImenSaziCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalHarimCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalPolCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalToonelCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalAmaliatZemestaniCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalMashinAlatCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalTollhouseCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['totalEmergencyCount'] }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $provinceCount['TotalProvinceCount'] }}</td>
-        </tr>
     </tbody>