diff --git a/resources/views/v3/Reports/RoadPatrols/CountryActivity.blade.php b/resources/views/v3/Reports/RoadPatrols/CountryActivity.blade.php
index 292615ea..bba1555a 100644
--- a/resources/views/v3/Reports/RoadPatrols/CountryActivity.blade.php
+++ b/resources/views/v3/Reports/RoadPatrols/CountryActivity.blade.php
@@ -82,48 +82,50 @@
     <tbody>
         @php
             // محاسبه مجموع مقدار s برای کل کشور
-            $totalForCountry = collect($activities)->where('province_id', -1)->get();
+            $totalForCountry = collect($activities)->where('province_id', -1)->first();
         @endphp
 
         {{-- ردیف کل کشور --}}
         <tr>
             <td style="border:1px solid black;text-align: center;">کل کشور</td>
-            <td style="border:1px solid black;text-align: center;">{{ $totalForCountry }}</td>
-            @foreach($items as $item)
-                <td style="border:1px solid black;text-align: center;">{{ $itemTotalsForCountry[$item['item']] ?? '-' }}</td>
-            @endforeach
+            <td style="border:1px solid black;text-align: center;">{{ $totalForCountry->tedade }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $totalForCountry->tedad_mavarede_moshede_shode_adi }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $totalForCountry->tedad_mavarede_moshede_shode_fori }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $totalForCountry->tedad_mavarede_moshede_shode_ani }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $totalForCountry->tedad_mavarede_peygiri_shode }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $totalForCountry->masafat_tey_shode }}</td>
+            <td style="border:1px solid black;text-align: center;">{{ $totalForCountry->tedad_faliyat_sabt_shode }}</td>
         </tr>
+
     @foreach ($provinces as $province)
-        @foreach($activities as $activity)
-            @if($province->name_fa == $activity->province_fa)
+        @php
+            $totalForProvince = collect($activities)->where('province_id', $province->id)->first();
+        @endphp
+            @if($totalForProvince)
                 <tr>
-                    <td style="border:1px solid black;text-align: center;">{{ $activity->province_fa }}</td>
-                    <td style="border:1px solid black;text-align: center;">{{ $activity->tedade }}</td>
-                    <td style="border:1px solid black;text-align: center;">{{ $activity->tedad_mavarede_moshede_shode_adi }}</td>
-                    <td style="border:1px solid black;text-align: center;">{{ $activity->tedad_mavarede_moshede_shode_fori }}</td>
-                    <td style="border:1px solid black;text-align: center;">{{ $activity->tedad_mavarede_moshede_shode_ani }}</td>
-                    <td style="border:1px solid black;text-align: center;">{{ $activity->tedad_mavarede_peygiri_shode }}</td>
-                    <td style="border:1px solid black;text-align: center;">{{ $activity->masafat_tey_shode }}</td>
-                    <td style="border:1px solid black;text-align: center;">{{ $activity->tedad_faliyat_sabt_shode }}</td>
+                    <td style="border:1px solid black;text-align: center;">{{ $totalForProvince->province_fa }}</td>
+                    <td style="border:1px solid black;text-align: center;">{{ $totalForProvince->tedade }}</td>
+                    <td style="border:1px solid black;text-align: center;">{{ $totalForProvince->tedad_mavarede_moshede_shode_adi }}</td>
+                    <td style="border:1px solid black;text-align: center;">{{ $totalForProvince->tedad_mavarede_moshede_shode_fori }}</td>
+                    <td style="border:1px solid black;text-align: center;">{{ $totalForProvince->tedad_mavarede_moshede_shode_ani }}</td>
+                    <td style="border:1px solid black;text-align: center;">{{ $totalForProvince->tedad_mavarede_peygiri_shode }}</td>
+                    <td style="border:1px solid black;text-align: center;">{{ $totalForProvince->masafat_tey_shode }}</td>
+                    <td style="border:1px solid black;text-align: center;">{{ $totalForProvince->tedad_faliyat_sabt_shode }}</td>
+                </tr>
+            @else
+                <tr>
+                    <td style="border:1px solid black;text-align: center;">{{ $province->name_fa }}</td>
+                    <td style="border:1px solid black;text-align: center;">0</td>
+                    <td style="border:1px solid black;text-align: center;">0</td>
+                    <td style="border:1px solid black;text-align: center;">0</td>
+                    <td style="border:1px solid black;text-align: center;">0</td>
+                    <td style="border:1px solid black;text-align: center;">0</td>
+                    <td style="border:1px solid black;text-align: center;">0</td>
+                    <td style="border:1px solid black;text-align: center;">0</td>
                 </tr>
             @endif
-            <tr>
-                <td style="border:1px solid black;text-align: center;">{{ $province->name_fa }}</td>
-                <td style="border:1px solid black;text-align: center;">-</td>
-                <td style="border:1px solid black;text-align: center;">-</td>
-                <td style="border:1px solid black;text-align: center;">-</td>
-                <td style="border:1px solid black;text-align: center;">-</td>
-                <td style="border:1px solid black;text-align: center;">-</td>
-                <td style="border:1px solid black;text-align: center;">-</td>
-                <td style="border:1px solid black;text-align: center;">-</td>
-            </tr>
-        @endforeach
     @endforeach
     </tbody>
-
-
 </table>
-
 </body>
-
 </html>
diff --git a/resources/views/v3/Reports/RoadPatrols/ProvinceActivity.blade.php b/resources/views/v3/Reports/RoadPatrols/ProvinceActivity.blade.php
index fe995428..5ab14deb 100644
--- a/resources/views/v3/Reports/RoadPatrols/ProvinceActivity.blade.php
+++ b/resources/views/v3/Reports/RoadPatrols/ProvinceActivity.blade.php
@@ -80,17 +80,50 @@
     </thead>
 
     <tbody>
-    @foreach ($activities as $activity)
-        <tr>
-            <td style="border:1px solid black;text-align: center;">{{ $activity->edare_name }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $activity->tedade }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $activity->tedad_mavarede_moshede_shode_adi }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $activity->tedad_mavarede_moshede_shode_fori }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $activity->tedad_mavarede_moshede_shode_ani }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $activity->tedad_mavarede_peygiri_shode }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $activity->masafat_tey_shode }}</td>
-            <td style="border:1px solid black;text-align: center;">{{ $activity->tedad_faliyat_sabt_shode }}</td>
-        </tr>
+    @php
+        // محاسبه مجموع مقدار s برای کل کشور
+        $totalForProvince = collect($activities)->where('edare_id', -1)->first();
+    @endphp
+
+    {{-- ردیف کل کشور --}}
+    <tr>
+        <td style="border:1px solid black;text-align: center;">کل استان</td>
+        <td style="border:1px solid black;text-align: center;">{{ $totalForProvince->tedade ?? 0 }}</td>
+        <td style="border:1px solid black;text-align: center;">{{ $totalForProvince->tedad_mavarede_moshede_shode_adi ?? 0 }}</td>
+        <td style="border:1px solid black;text-align: center;">{{ $totalForProvince->tedad_mavarede_moshede_shode_fori ?? 0 }}</td>
+        <td style="border:1px solid black;text-align: center;">{{ $totalForProvince->tedad_mavarede_moshede_shode_ani ?? 0 }}</td>
+        <td style="border:1px solid black;text-align: center;">{{ $totalForProvince->tedad_mavarede_peygiri_shode ?? 0 }}</td>
+        <td style="border:1px solid black;text-align: center;">{{ $totalForProvince->masafat_tey_shode ?? 0 }}</td>
+        <td style="border:1px solid black;text-align: center;">{{ $totalForProvince->tedad_faliyat_sabt_shode ?? 0 }}</td>
+    </tr>
+
+    @foreach ($edarateShahri as $edareShahri)
+        @php
+            $totalForEdare = collect($activities)->where('edare_id', $edareShahri->id)->first();
+        @endphp
+        @if($totalForEdare)
+            <tr>
+                <td style="border:1px solid black;text-align: center;">{{ $totalForEdare->edare_name }}</td>
+                <td style="border:1px solid black;text-align: center;">{{ $totalForEdare->tedade }}</td>
+                <td style="border:1px solid black;text-align: center;">{{ $totalForEdare->tedad_mavarede_moshede_shode_adi }}</td>
+                <td style="border:1px solid black;text-align: center;">{{ $totalForEdare->tedad_mavarede_moshede_shode_fori }}</td>
+                <td style="border:1px solid black;text-align: center;">{{ $totalForEdare->tedad_mavarede_moshede_shode_ani }}</td>
+                <td style="border:1px solid black;text-align: center;">{{ $totalForEdare->tedad_mavarede_peygiri_shode }}</td>
+                <td style="border:1px solid black;text-align: center;">{{ $totalForEdare->masafat_tey_shode }}</td>
+                <td style="border:1px solid black;text-align: center;">{{ $totalForEdare->tedad_faliyat_sabt_shode }}</td>
+            </tr>
+        @else
+            <tr>
+                <td style="border:1px solid black;text-align: center;">{{ $edareShahri->name_fa }}</td>
+                <td style="border:1px solid black;text-align: center;">0</td>
+                <td style="border:1px solid black;text-align: center;">0</td>
+                <td style="border:1px solid black;text-align: center;">0</td>
+                <td style="border:1px solid black;text-align: center;">0</td>
+                <td style="border:1px solid black;text-align: center;">0</td>
+                <td style="border:1px solid black;text-align: center;">0</td>
+                <td style="border:1px solid black;text-align: center;">0</td>
+            </tr>
+        @endif
     @endforeach
     </tbody>
 </table>