diff --git a/resources/views/components/excel-download-button.blade.php b/resources/views/components/excel-download-button.blade.php
index 85ec96e5..d71cf373 100644
--- a/resources/views/components/excel-download-button.blade.php
+++ b/resources/views/components/excel-download-button.blade.php
@@ -69,7 +69,9 @@
 
                         // Prepare download URL
                         const url = new URL(downloadUrl);
-
+                        url.searchParams.set("kode_kabupaten", "{{ session('kabupaten.kode_kabupaten') ?? '' }}");
+                        url.searchParams.set("kode_kecamatan", "{{ session('kecamatan.kode_kecamatan') ?? '' }}");
+                        url.searchParams.set("kode_desa", "{{ session('desa.id') ?? '' }}");                
                         let urlParams = new URLSearchParams();
 
                         if (tableId) {
@@ -110,7 +112,7 @@
                             const info = table.page.info();
                             urlParams.append('totalData', info.recordsTotal);
                         }
-
+        
                         // Make fetch request
                         const response = await fetch(url, {
                             method: 'POST',
diff --git a/resources/views/components/print-button.blade.php b/resources/views/components/print-button.blade.php
index 8508118c..fb3c72fd 100644
--- a/resources/views/components/print-button.blade.php
+++ b/resources/views/components/print-button.blade.php
@@ -30,6 +30,9 @@
                 e.preventDefault();
 
                 const printUrl = new URL(this.dataset.printUrl);
+                printUrl.searchParams.set("kode_kabupaten", "{{ session('kabupaten.kode_kabupaten') ?? '' }}");
+                printUrl.searchParams.set("kode_kecamatan", "{{ session('kecamatan.kode_kecamatan') ?? '' }}");
+                printUrl.searchParams.set("kode_desa", "{{ session('desa.id') ?? '' }}");                
                 const tableId = this.dataset.tableId;
                 const filters = JSON.parse(this.dataset.filters || '{}');
                 const additionalParams = JSON.parse(this.dataset.additionalParams || '{}');
@@ -48,6 +51,7 @@
                     // Get filters/search from DataTable's ajax.params
                     if (typeof dataTable.ajax.params === 'function') {
                         const params = dataTable.ajax.params();
+                        
                         Object.entries(params).forEach(([key, value]) => {
                             if (value && value !== '' && value !== 'null') {
                                 printUrl.searchParams.append(key, value);
@@ -59,8 +63,7 @@
                 // Add additional static parameters
                 Object.entries(additionalParams).forEach(([key, value]) => {
                     printUrl.searchParams.append(key, value);
-                });
-
+                });                
                 // Open print URL in new window
                 window.open(printUrl.href, '_blank');
             });
diff --git a/resources/views/data_pokok/data_presisi/adat/index.blade.php b/resources/views/data_pokok/data_presisi/adat/index.blade.php
index a6314b44..55202bbf 100644
--- a/resources/views/data_pokok/data_presisi/adat/index.blade.php
+++ b/resources/views/data_pokok/data_presisi/adat/index.blade.php
@@ -5,241 +5,227 @@
 @section('title', 'Data adat')
 
 @section('content_header')
-    <h1>{{ $title }}</h1>
+<h1>{{ $title }}</h1>
 @stop
 
 @section('content')
-    @include('partials.breadcrumbs')
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="card">
-                <div class="card-header">Statistik Adat</div>
-                <div class="card-body">
-                    <div>
-                        <div class="chart" id="pie1">
+@include('partials.breadcrumbs')
+<div class="row">
+    <div class="col-lg-12">
+        <div class="card">
+            <div class="card-header">Statistik Adat</div>
+            <div class="card-body">
+                <div>
+                    <div class="chart" id="pie1">
 
-                        </div>
-                        <hr class="hr-chart">
                     </div>
+                    <hr class="hr-chart">
                 </div>
             </div>
         </div>
     </div>
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="card card-outline card-primary">
-                <div class="card-header">
-                    <div class="row">
-                        <div class="col-sm-2">
-                            <select id="filter-tahun" class="form-control form-control-sm">
-                                @php
-                                    $currentYear = date('Y');
-                                    $startYear = 2020;
-                                @endphp
-                                @for($year = $currentYear; $year >= $startYear; $year--)
-                                    <option value="{{ $year }}" {{ $year == $currentYear ? 'selected' : '' }}>{{ $year }}</option>
-                                @endfor
-                            </select>
-                        </div>
-                        <div class="col-sm-3">
-                            <button id="cetak" type="button" class="btn btn-primary btn-sm" data-url="">
-                                <i class="fa fa-print"></i> Cetak
-                            </button>
-                        </div>
+</div>
+<div class="row">
+    <div class="col-lg-12">
+        <div class="card card-outline card-primary">
+            <div class="card-header">
+                <div class="row mb-2">
+                    <x-filter-tahun />
+                    <div class="col-auto">
+                        <x-print-button :print-url="url('data-pokok/data-presisi-adat/cetak')" table-id="adat" :filter="[]" />
                     </div>
+                    <x-excel-download-button :download-url="config('app.databaseGabunganUrl') . '/api/v1/data-presisi/adat/download'" table-id="adat" filename="data_adat" />
                 </div>
-                <div class="card-body">
-                    <div class="table-responsive">
-                        <table class="table table-striped" id="adat">
-                            <thead>
-                                <tr>
-                                    <th>Aksi</th>
-                                    <th>#</th>
-                                    <th>NIK</th>
-                                    <th>Nama Kepala Keluarga</th>
-                                    <th>Jumlah Anggota RTM</th>
-                                    <th>Status Keanggotaan</th>
-                                    <th>Frekwensi Mengikuti Kegiatan Adat Dalam Setahun</th>
-                                </tr>
-                            </thead>
-                            <tbody></tbody>
-                        </table>
-                    </div>
+            </div>
+            <div class="card-body">
+                <div class="table-responsive">
+                    <table class="table table-striped" id="adat">
+                        <thead>
+                            <tr>
+                                <th>Aksi</th>
+                                <th>#</th>
+                                <th>NIK</th>
+                                <th>Nama Kepala Keluarga</th>
+                                <th>Jumlah Anggota RTM</th>
+                                <th>Status Keanggotaan</th>
+                                <th>Frekwensi Mengikuti Kegiatan Adat Dalam Setahun</th>
+                            </tr>
+                        </thead>
+                        <tbody></tbody>
+                    </table>
                 </div>
             </div>
         </div>
     </div>
+</div>
 @endsection
 
 @section('js')
 @include('data_pokok.data_presisi.adat.chart')
-    <script nonce="{{ csp_nonce() }}">
-        let data_grafik = [];
-        let transformedIncluded = {};
-        document.addEventListener("DOMContentLoaded", function(event) {
-            const header = @include('layouts.components.header_bearer_api_gabungan');
-            var url = new URL("{{ config('app.databaseGabunganUrl') . '/api/v1/data-presisi/adat' }}");
-            url.searchParams.set("kode_kabupaten", "{{ session('kabupaten.kode_kabupaten') ?? '' }}");
-            url.searchParams.set("kode_kecamatan", "{{ session('kecamatan.kode_kecamatan') ?? '' }}");
-            url.searchParams.set("config_desa", "{{ session('desa.id') ?? '' }}");
-            var adat = $('#adat').DataTable({
-                processing: true,
-                serverSide: true,
-                autoWidth: false,
-                ordering: false,
-                searchPanes: {
-                    viewTotal: false,
-                    columns: [0]
+<script nonce="{{ csp_nonce() }}">
+    let data_grafik = [];
+    let transformedIncluded = {};
+    document.addEventListener("DOMContentLoaded", function(event) {
+        const header = @include('layouts.components.header_bearer_api_gabungan');
+        var url = new URL("{{ config('app.databaseGabunganUrl') . '/api/v1/data-presisi/adat' }}");
+        url.searchParams.set("kode_kabupaten", "{{ session('kabupaten.kode_kabupaten') ?? '' }}");
+        url.searchParams.set("kode_kecamatan", "{{ session('kecamatan.kode_kecamatan') ?? '' }}");
+        url.searchParams.set("config_desa", "{{ session('desa.id') ?? '' }}");
+        var adat = $('#adat').DataTable({
+            processing: true,
+            serverSide: true,
+            autoWidth: false,
+            ordering: false,
+            searchPanes: {
+                viewTotal: false,
+                columns: [0]
+            },
+            ajax: {
+                url: url.href,
+                headers: header,
+                method: 'get',
+                data: function(row) {
+                    return {
+                        "page[size]": row.length,
+                        "page[number]": (row.start / row.length) + 1,
+                        'include': 'anggota,penduduk,rtm,keluarga',
+                        "filter[search]": row.search.value,
+                        "filter[kepala_rtm]": true,
+                        "sort": "id",
+                        "filter[kode_desa]": $("#kode_desa").val(),
+                        "filter[tahun]": $('#filter-tahun').val(),
+                    };
                 },
-                ajax: {
-                    url: url.href,
-                    headers: header,
-                    method: 'get',
-                    data: function(row) {
-                        return {
-                            "page[size]": row.length,
-                            "page[number]": (row.start / row.length) + 1,
-                            'include': 'anggota,penduduk,rtm,keluarga',
-                            "filter[search]": row.search.value,
-                            "filter[kepala_rtm]": true,
-                            // "sort": (row.order[0]?.dir === "asc" ? "" : "-") + row.columns[row.order[0]
-                            //         ?.column]
-                            //     ?.name,
-                            "filter[kode_desa]": $("#kode_desa").val(),
-                            "filter[tahun]": $('#filter-tahun').val(),
-                        };
-                    },
-                    dataSrc: function(json) {
-
-                        if (json.data.length > 0) {
-                            json.recordsTotal = json.meta.pagination.total
-                            json.recordsFiltered = json.meta.pagination.total
-                            data_grafik = [];
-                            // Transform the included array into an object
-                            transformedIncluded = json.included.reduce((acc, item) => {
-                                if (!acc[item.type]) {
-                                    acc[item.type] = {};
-                                }
-                                acc[item.type][item.id] = item.attributes;
-                                return acc;
-                            }, {});
+                dataSrc: function(json) {
+                    json.recordsTotal = json.meta?.pagination?.total || 0
+                    json.recordsFiltered = json.meta?.pagination?.total || 0
+                    if (json.data.length > 0) {                        
+                        data_grafik = [];
+                        // Transform the included array into an object
+                        transformedIncluded = json.included.reduce((acc, item) => {
+                            if (!acc[item.type]) {
+                                acc[item.type] = {};
+                            }
+                            acc[item.type][item.id] = item.attributes;
+                            return acc;
+                        }, {});
 
-                            json.data.forEach(function(item, index) {
-                                data_grafik.push(item.attributes)
-                                item.attributes.nik = transformedIncluded.penduduk[item
-                                    .relationships.penduduk.data.id].nik;
-                                item.attributes.nama = transformedIncluded.penduduk[item
-                                    .relationships.penduduk.data.id].nama;
-                                if (!item.attributes.frekwensi) {
-                                    item.attributes.frekwensi = 'TIDAK TAHU'
-                                }
-                                if (!item.attributes.status_keanggotaan) {
-                                    item.attributes.status_keanggotaan = 'TIDAK TAHU'
-                                }
-                                item.attributes.dtks = transformedIncluded.rtm[item
-                                        .relationships.rtm.data.id].dtks ? 'Terdaftar' :
-                                    'Tidak Terdaftar';
-                                item.attributes.tgl_daftar = transformedIncluded.rtm[item
-                                    .relationships.rtm.data.id].tgl_daftar;
-                                item.attributes.jumlah_kk = transformedIncluded.rtm[item
-                                    .relationships.rtm.data.id].jumlah_kk;
-                                item.attributes.alamat = transformedIncluded.keluarga[item
-                                    .relationships.keluarga.data.id].alamat;
-                                item.attributes.dusun = transformedIncluded.keluarga[item
-                                    .relationships.keluarga.data.id].wilayah?.dusun;
-                                item.attributes.rt = transformedIncluded.keluarga[item
-                                    .relationships.keluarga.data.id].wilayah?.rt;
-                                item.attributes.rw = transformedIncluded.keluarga[item
-                                    .relationships.keluarga.data.id].wilayah?.rw;
-                            })
-                            grafikPie()
-                            return json.data;
-                        }
-                        return false;
-                    },
-                },
-                columnDefs: [{
-                    targets: '_all',
-                    className: 'text-nowrap',
-                }, ],
-                columns: [{
-                        data: function(data) {
-                            let d = data.attributes
-                            let obj = {
-                                'rtm_id': data.relationships.rtm.data.id,
-                                'no_kartu_rumah': transformedIncluded.rtm[data.relationships.rtm
-                                    .data.id].no_kk,
-                                'nama_kepala_keluarga': d.nama,
-                                'alamat': transformedIncluded.keluarga[data.relationships
-                                    .keluarga.data.id].alamat,
-                                'jumlah_anggota': d.anggota_count,
-                                'jumlah_kk': transformedIncluded.rtm[data.relationships.rtm
-                                    .data.id].jumlah_kk,
+                        json.data.forEach(function(item, index) {
+                            data_grafik.push(item.attributes)
+                            item.attributes.nik = transformedIncluded.penduduk[item
+                                .relationships.penduduk.data.id].nik;
+                            item.attributes.nama = transformedIncluded.penduduk[item
+                                .relationships.penduduk.data.id].nama;
+                            if (!item.attributes.frekwensi) {
+                                item.attributes.frekwensi = 'TIDAK TAHU'
+                            }
+                            if (!item.attributes.status_keanggotaan) {
+                                item.attributes.status_keanggotaan = 'TIDAK TAHU'
                             }
-                            let jsonData = encodeURIComponent(JSON.stringify(obj));
-                            const _url =
-                                "{{ route('data-pokok.data-presisi-adat.detail', ['data' => '__DATA__']) }}"
-                                .replace('__DATA__', jsonData)
-                            return `<a href="${_url}" title="Detail" data-button="Detail">
+                            item.attributes.dtks = transformedIncluded.rtm[item
+                                    .relationships.rtm.data.id].dtks ? 'Terdaftar' :
+                                'Tidak Terdaftar';
+                            item.attributes.tgl_daftar = transformedIncluded.rtm[item
+                                .relationships.rtm.data.id].tgl_daftar;
+                            item.attributes.jumlah_kk = transformedIncluded.rtm[item
+                                .relationships.rtm.data.id].jumlah_kk;
+                            item.attributes.alamat = transformedIncluded.keluarga[item
+                                .relationships.keluarga.data.id].alamat;
+                            item.attributes.dusun = transformedIncluded.keluarga[item
+                                .relationships.keluarga.data.id].wilayah?.dusun;
+                            item.attributes.rt = transformedIncluded.keluarga[item
+                                .relationships.keluarga.data.id].wilayah?.rt;
+                            item.attributes.rw = transformedIncluded.keluarga[item
+                                .relationships.keluarga.data.id].wilayah?.rw;
+                        })
+                        grafikPie()
+                        return json.data;
+                    }
+                    return false;
+                },
+            },
+            columnDefs: [{
+                targets: '_all',
+                className: 'text-nowrap',
+            }, ],
+            columns: [{
+                    data: function(data) {
+                        let d = data.attributes
+                        let obj = {
+                            'rtm_id': data.relationships.rtm.data.id,
+                            'no_kartu_rumah': transformedIncluded.rtm[data.relationships.rtm
+                                .data.id].no_kk,
+                            'nama_kepala_keluarga': d.nama,
+                            'alamat': transformedIncluded.keluarga[data.relationships
+                                .keluarga.data.id].alamat,
+                            'jumlah_anggota': d.anggota_count,
+                            'jumlah_kk': transformedIncluded.rtm[data.relationships.rtm
+                                .data.id].jumlah_kk,
+                        }
+                        let jsonData = encodeURIComponent(JSON.stringify(obj));
+                        const _url =
+                            "{{ route('data-pokok.data-presisi-adat.detail', ['data' => '__DATA__']) }}"
+                            .replace('__DATA__', jsonData)
+                        return `<a href="${_url}" title="Detail" data-button="Detail">
                                 <button type="button" class="btn btn-info btn-sm">Detail</button>
                             </a>`;
-                        },
-                        searchable: false,
-                        orderable: false
-                    },
-                    {
-                        "className": 'details-control',
-                        "orderable": false,
-                        "data": null,
-                        "defaultContent": ''
-                    },
-                    {
-                        data: "attributes.nik",
-                        name: "penduduk.nik",
-                    },
-                    {
-                        data: "attributes.nama",
-                        name: "rtm.nama_kepala_keluarga",
-                        orderable: false
                     },
-                    {
-                        data: "attributes.anggota_count",
-                        name: null,
-                        orderable: false,
-                        searchable: false
-                    },
-                    {
-                        data: "attributes.status_keanggotaan",
-                        name: "status_keanggotaan",
-                        orderable: false,
-                        searchable: false
-                    },
-                    {
-                        data: "attributes.frekwensi",
-                        name: "frekwensi_mengikuti_kegiatan_setahun",
-                        orderable: false,
-                        searchable: false
-                    },
-                ],
-            })
+                    searchable: false,
+                    orderable: false
+                },
+                {
+                    "className": 'details-control',
+                    "orderable": false,
+                    "data": null,
+                    "defaultContent": ''
+                },
+                {
+                    data: "attributes.nik",
+                    name: "penduduk.nik",
+                },
+                {
+                    data: "attributes.nama",
+                    name: "rtm.nama_kepala_keluarga",
+                    orderable: false
+                },
+                {
+                    data: "attributes.anggota_count",
+                    name: null,
+                    orderable: false,
+                    searchable: false
+                },
+                {
+                    data: "attributes.status_keanggotaan",
+                    name: "status_keanggotaan",
+                    orderable: false,
+                    searchable: false
+                },
+                {
+                    data: "attributes.frekwensi",
+                    name: "frekwensi_mengikuti_kegiatan_setahun",
+                    orderable: false,
+                    searchable: false
+                },
+            ],
+        })
 
-            // Add event listener for opening and closing details
-            adat.on('click', 'td.details-control', function() {
-                let tr = $(this).closest('tr');
-                let row = adat.row(tr);
-                if (row.child.isShown()) {
-                    // This row is already open - close it
-                    row.child.hide();
-                    tr.removeClass('shown');
-                } else {
-                    // Open this row
-                    row.child(format(row.data())).show();
-                    tr.addClass('shown');
-                }
-            });
+        // Add event listener for opening and closing details
+        adat.on('click', 'td.details-control', function() {
+            let tr = $(this).closest('tr');
+            let row = adat.row(tr);
+            if (row.child.isShown()) {
+                // This row is already open - close it
+                row.child.hide();
+                tr.removeClass('shown');
+            } else {
+                // Open this row
+                row.child(format(row.data())).show();
+                tr.addClass('shown');
+            }
+        });
 
-            function format(data) {
-                return `
+        function format(data) {
+            return `
                     <table class="table table-striped">
                         <tr>
                             <td><strong>DTKS:</strong></td>
@@ -271,20 +257,13 @@ function format(data) {
                         </tr>
                     </table>
                 `;
-            }
-            // Event listener for year filter change
-            $('#filter-tahun').on('change', function() {
-                adat.ajax.reload();
-                data_grafik = [];
-                grafikPie();
-            });
-            
-            $('#cetak').on('click', function() {
-                let baseUrl = "{{ route('data-pokok.data-presisi-adat.cetak') }}";
-                let params = adat.ajax.params(); // Get DataTables params
-                let queryString = new URLSearchParams(params).toString(); // Convert params to query string
-                window.open(`${baseUrl}?${queryString}`, '_blank'); // Open the URL with appended query
-            });
-        })
-    </script>
-@endsection
+        }
+        // Event listener for year filter change
+        $('#filter-tahun').on('change', function() {
+            adat.ajax.reload();
+            data_grafik = [];
+            grafikPie();
+        });
+    })
+</script>
+@endsection
\ No newline at end of file
diff --git a/resources/views/data_pokok/data_presisi/kesehatan/cetak.blade.php b/resources/views/data_pokok/data_presisi/kesehatan/cetak.blade.php
index 6551fc10..5dfb2d20 100644
--- a/resources/views/data_pokok/data_presisi/kesehatan/cetak.blade.php
+++ b/resources/views/data_pokok/data_presisi/kesehatan/cetak.blade.php
@@ -16,9 +16,9 @@
         <thead>
             <tr class="border thick">
                 <th>NO</th>
-                <th>NIK</th>
-                <th>NOMOR KK</th>
-                <th>NAMA</th>
+                <th>NIK</th>                
+                <th>NAMA KEPALA KELUARGA</th>
+                <th>JUMLAH ANGGOTA RTM</th>
                 <th>JNS ASURANSI</th>
                 <th>JNS PENGGUNAAN ALAT KONTRASEPSI</th>
                 <th>JNS PENYAKIT YANG DIDERITA</th>
@@ -27,8 +27,7 @@
                 <th>KUNJUNGAN KE DOKTER DALAM 1 TAHUN</th>
                 <th>KONDISI FISIK SEJAK LAHIR</th>
                 <th>STATUS GIZI BALITA</th>
-                <th>TANGGAL PENGISIAN</th>
-                <th>STATUS PENGISIAN</th>
+                <th>TANGGAL PENGISIAN</th>                
             </tr>
         </thead>
         <tbody></tbody>
@@ -39,10 +38,10 @@
     <script nonce="{{ csp_nonce() }}"  >
         document.addEventListener("DOMContentLoaded", function(event) {
             var str = `{{ $filter }}`
-            var filter = str.replace(/&amp;/g, '&')
+             var filter = str.replace(/&amp;/g, '&').replace(/undefined/g, '')
             const header = @include('layouts.components.header_bearer_api_gabungan');
             $.ajax({
-                url: `{{ config('app.databaseGabunganUrl').'/api/v1/data-presisi/kesehatan' }}?${filter}`,
+                url: `{{ config('app.databaseGabunganUrl').'/api/v1/data-presisi/kesehatan/rtm' }}?${filter}`,
                 headers: header,
                 method: 'get',
                 success: function(json) {
@@ -52,8 +51,8 @@
                             <tr>
                                 <td class="padat">${no}</td>
                                 <td>${item.attributes.nik || 'N/A'}</td>
-                                <td>${item.attributes.no_kk || 'N/A'}</td>
-                                <td>${item.attributes.nama || 'N/A'}</td>
+                                <td>${item.attributes.kepala_keluarga || 'N/A'}</td>    
+                                <td>${item.attributes.jumlah_anggota || 'N/A'}</td>                                
                                 <td>${item.attributes.jns_ansuransi || 'N/A'}</td>
                                 <td>${item.attributes.jns_penggunaan_alat_kontrasepsi || 'N/A'}</td>
                                 <td>${item.attributes.jns_penyakit_diderita || 'N/A'}</td>
@@ -62,8 +61,7 @@
                                 <td>${item.attributes.frekwensi_kunjungan_dokter_pertahun || 'N/A'}</td>
                                 <td>${item.attributes.kondisi_fisik_sejak_lahir || 'N/A'}</td>
                                 <td>${item.attributes.status_gizi_balita || 'N/A'}</td>
-                                <td>${item.attributes.tanggal_pengisian || 'N/A'}</td>
-                                <td>${item.attributes.status_pengisian || 'N/A'}</td>
+                                <td>${item.attributes.tanggal_pengisian || 'N/A'}</td>                                
                             </tr>
                             `
                         $('#tabel-sandang tbody').append(row)
diff --git a/resources/views/data_pokok/data_presisi/kesehatan/index.blade.php b/resources/views/data_pokok/data_presisi/kesehatan/index.blade.php
index 4d4aea7a..5f3ba5da 100644
--- a/resources/views/data_pokok/data_presisi/kesehatan/index.blade.php
+++ b/resources/views/data_pokok/data_presisi/kesehatan/index.blade.php
@@ -3,189 +3,180 @@
 @section('title', $title)
 
 @section('content_header')
-    <h1>{{ $title }}</h1>
+<h1>{{ $title }}</h1>
 @stop
 
 @push('css')
-    <style nonce="{{ csp_nonce() }}">
-        .details {
-            margin-left: 20px;
-        }
-    </style>
+<style nonce="{{ csp_nonce() }}">
+    .details {
+        margin-left: 20px;
+    }
+</style>
 @endpush
 
 @section('content')
-    @include('partials.breadcrumbs')
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="card card-outline card-primary">
-                <div class="card-body">
-                    <div class="chart" id="grafik">
-                        <canvas id="barChart"></canvas>
-                    </div>
+@include('partials.breadcrumbs')
+<div class="row">
+    <div class="col-lg-12">
+        <div class="card card-outline card-primary">
+            <div class="card-body">
+                <div class="chart" id="grafik">
+                    <canvas id="barChart"></canvas>
                 </div>
             </div>
-            <div class="card card-outline card-primary">
-                <div class="card-header">
-                    <div class="row">
-                        <div class="col-sm-2">
-                            <select id="filter-tahun" class="form-control form-control-sm">
-                                @php
-                                    $currentYear = date('Y');
-                                    $startYear = 2020;
-                                @endphp
-                                @for($year = $currentYear; $year >= $startYear; $year--)
-                                    <option value="{{ $year }}" {{ $year == $currentYear ? 'selected' : '' }}>{{ $year }}</option>
-                                @endfor
-                            </select>
-                        </div>
-                        <div class="col-sm-3">
-                            <button id="cetak" type="button" class="btn btn-primary btn-sm" data-url="">
-                                <i class="fa fa-print"></i> Cetak
-                            </button>
-                        </div>
+        </div>
+        <div class="card card-outline card-primary">
+            <div class="card-header">
+                <div class="row">
+                    <x-filter-tahun />
+                    <div class="col-auto">
+                        <x-print-button :print-url="url('data-presisi/kesehatan/cetak')" table-id="table-kesehatan" :filter="[]" />
                     </div>
+                    <x-excel-download-button :download-url="config('app.databaseGabunganUrl') . '/api/v1/data-presisi/kesehatan/rtm/download'" table-id="table-kesehatan" filename="data_presisi_kesehatan" />
                 </div>
-                <div class="card-body">
-                    <div class="table-responsive">
-                        <table class="table table-striped" id="table-kesehatan">
-                            <thead>
-                                <tr>
-                                    <th>Aksi</th>
-                                    <th>#</th>
-                                    <th>NIK</th>
-                                    <th>Nama Kepala Keluarga</th>
-                                    <th>Jumlah Anggota RTM</th>
-                                    <th>Jenis Ansuransi</th>
-                                    <th>Jenis Penggunaan Alat Kontrasepsi</th>
-                                </tr>
-                            </thead>
-                            <tbody></tbody>
-                        </table>
-                    </div>
+            </div>
+            <div class="card-body">
+                <div class="table-responsive">
+                    <table class="table table-striped" id="table-kesehatan">
+                        <thead>
+                            <tr>
+                                <th>Aksi</th>
+                                <th>#</th>
+                                <th>NIK</th>
+                                <th>Nama Kepala Keluarga</th>
+                                <th>Jumlah Anggota RTM</th>
+                                <th>Jenis Ansuransi</th>
+                                <th>Jenis Penggunaan Alat Kontrasepsi</th>
+                            </tr>
+                        </thead>
+                        <tbody></tbody>
+                    </table>
                 </div>
             </div>
         </div>
     </div>
+</div>
 @endsection
 
 @section('js')
-    @include('data_pokok.data_presisi.kesehatan.chart')
-    <script nonce="{{ csp_nonce() }}">
-        let data_grafik = [];
-        document.addEventListener("DOMContentLoaded", function(event) {
-            const header = @include('layouts.components.header_bearer_api_gabungan');
-            var url = new URL("{{ config('app.databaseGabunganUrl') . '/api/v1/data-presisi/kesehatan/rtm' }}");
-            url.searchParams.set("kode_kabupaten", "{{ session('kabupaten.kode_kabupaten') ?? '' }}");
-            url.searchParams.set("kode_kecamatan", "{{ session('kecamatan.kode_kecamatan') ?? '' }}");
-            url.searchParams.set("kode_desa", "{{ session('desa.id') ?? '' }}");
-            var dtks = $('#table-kesehatan').DataTable({
-                processing: true,
-                serverSide: true,
-                autoWidth: false,
-                ordering: false,
-                searchPanes: {
-                    viewTotal: false,
-                    columns: [0]
+@include('data_pokok.data_presisi.kesehatan.chart')
+<script nonce="{{ csp_nonce() }}">
+    let data_grafik = [];
+    document.addEventListener("DOMContentLoaded", function(event) {
+        const header = @include('layouts.components.header_bearer_api_gabungan');
+        var url = new URL("{{ config('app.databaseGabunganUrl') . '/api/v1/data-presisi/kesehatan/rtm' }}");
+        url.searchParams.set("kode_kabupaten", "{{ session('kabupaten.kode_kabupaten') ?? '' }}");
+        url.searchParams.set("kode_kecamatan", "{{ session('kecamatan.kode_kecamatan') ?? '' }}");
+        url.searchParams.set("kode_desa", "{{ session('desa.id') ?? '' }}");
+        var dtks = $('#table-kesehatan').DataTable({
+            processing: true,
+            serverSide: true,
+            autoWidth: false,
+            searchPanes: {
+                viewTotal: false,
+                columns: [0]
+            },
+            ajax: {
+                url: url.href,
+                headers: header,
+                method: 'get',
+                data: function(row) {
+                    return {
+                        "page[size]": row.length,
+                        "page[number]": (row.start / row.length) + 1,
+                        "filter[search]": row.search.value,
+                        "filter[tahun]": $('#filter-tahun').val(),
+                        "sort": "id"
+                    };
                 },
-                ajax: {
-                    url: url.href,
-                    headers: header,
-                    method: 'get',
-                    data: function(row) {
-                        return {
-                            "page[size]": row.length,
-                            "page[number]": (row.start / row.length) + 1,
-                            "filter[search]": row.search.value,
-                            "kode_kecamatan": "{{ session('kecamatan.kode_kecamatan') ?? '' }}",
-                            "config_desa": "{{ session('desa.id') ?? '' }}",
-                            "filter[tahun]": $('#filter-tahun').val(),
-                        };
-                    },
-                    dataSrc: function(json) {
-                        if (json.data.length > 0) {
-                            json.recordsTotal = json.meta.pagination.total
-                            json.recordsFiltered = json.meta.pagination.total
-                            data_grafik = [];
-                            json.data.forEach(function(item, index) {
-                                data_grafik.push(item.attributes)
-                            })
-                            grafikPie()
-                            return json.data;
-                        }
-                        return false;
-                    },
+                dataSrc: function(json) {
+                    json.recordsTotal = json.meta?.pagination?.total || 0;
+                    json.recordsFiltered = json.meta?.pagination?.total || 0;
+                    if (json.data.length > 0) {
+                        data_grafik = [];
+                        json.data.forEach(function(item, index) {
+                            data_grafik.push(item.attributes)
+                        })
+                        grafikPie()
+                        return json.data;
+                    }
+                    return false;
                 },
-                columnDefs: [{
-                    targets: '_all',
-                    className: 'text-nowrap',
-                }, ],
-                columns: [{
-                        data: function(data) {
-                            let d = data.attributes
-                            let obj = {
-                                'rtm_id': data.id,
-                                'no_kartu_rumah': d.no_kk,
-                                'nama_kepala_keluarga': d.kepala_keluarga,
-                                'alamat': d.alamat,
-                                'jumlah_anggota': d.jumlah_anggota,
-                                'jumlah_kk': d.jumlah_kk,
-                            }
-                            let jsonData = encodeURIComponent(JSON.stringify(obj));
-                            const _url =
-                                "{{ route('data-pokok.data-presisi.detail', ['data' => '__DATA__']) }}"
-                                .replace('__DATA__', jsonData)
-                            return `<a href="${_url}" title="Detail" data-button="Detail">
+            },
+            columnDefs: [{
+                targets: '_all',
+                className: 'text-nowrap',
+            }, ],
+            columns: [{
+                    data: function(data) {
+                        let d = data.attributes
+                        let obj = {
+                            'rtm_id': data.id,
+                            'no_kartu_rumah': d.no_kk,
+                            'nama_kepala_keluarga': d.kepala_keluarga,
+                            'alamat': d.alamat,
+                            'jumlah_anggota': d.jumlah_anggota,
+                            'jumlah_kk': d.jumlah_kk,
+                        }
+                        let jsonData = encodeURIComponent(JSON.stringify(obj));
+                        const _url =
+                            "{{ route('data-pokok.data-presisi.detail', ['data' => '__DATA__']) }}"
+                            .replace('__DATA__', jsonData)
+                        return `<a href="${_url}" title="Detail" data-button="Detail">
                                 <button type="button" class="btn btn-info btn-sm">Detail</button>
                             </a>`;
-                        },
-                        searchable: false,
-                        orderable: false
-                    },
-                    {
-                        "className": 'details-control',
-                        "orderable": false,
-                        "data": null,
-                        "defaultContent": ''
-                    },
-                    {
-                        data: "attributes.nik",
-                        orderable: false,
-                    },
-                    {
-                        data: "attributes.kepala_keluarga",
-                    },
-                    {
-                        data: "attributes.jumlah_anggota",
-                    },
-                    {
-                        data: "attributes.jns_ansuransi",
-                        render: (data) => data || 'N/A',
-                    },
-                    {
-                        data: "attributes.jns_penggunaan_alat_kontrasepsi",
-                        render: (data) => data || 'N/A',
                     },
+                    searchable: false,
+                    orderable: false
+                },
+                {
+                    "className": 'details-control',
+                    orderable: false,
+                    "data": null,
+                    "defaultContent": ''
+                },
+                {
+                    data: "attributes.nik",
+                    orderable: false,
+                },
+                {
+                    data: "attributes.kepala_keluarga",
+                    orderable: false,
+                },
+                {
+                    data: "attributes.jumlah_anggota",
+                    orderable: false,
+                },
+                {
+                    data: "attributes.jns_ansuransi",
+                    render: (data) => data || 'N/A',
+                    orderable: false,
+                },
+                {
+                    data: "attributes.jns_penggunaan_alat_kontrasepsi",
+                    render: (data) => data || 'N/A',
+                    orderable: false,
+                },
 
-                ],
-            })
-            // Add event listener for opening and closing details
-            dtks.on('click', 'td.details-control', function() {
-                let tr = $(this).closest('tr');
-                let row = dtks.row(tr);
-                if (row.child.isShown()) {
-                    // This row is already open - close it
-                    row.child.hide();
-                    tr.removeClass('shown');
-                } else {
-                    // Open this row
-                    row.child(format(row.data())).show();
-                    tr.addClass('shown');
-                }
-            });
+            ],
+        })
+        // Add event listener for opening and closing details
+        dtks.on('click', 'td.details-control', function() {
+            let tr = $(this).closest('tr');
+            let row = dtks.row(tr);
+            if (row.child.isShown()) {
+                // This row is already open - close it
+                row.child.hide();
+                tr.removeClass('shown');
+            } else {
+                // Open this row
+                row.child(format(row.data())).show();
+                tr.addClass('shown');
+            }
+        });
 
-            function format(data) {
-                return `
+        function format(data) {
+            return `
                     <table class="table table-striped">
                         <tr>
                             <td><strong>DTKS:</strong></td>
@@ -217,20 +208,13 @@ function format(data) {
                         </tr>
                     </table>
                 `;
-            }
-            // Event listener for year filter change
-            $('#filter-tahun').on('change', function() {
-                dtks.ajax.reload();
-                data_grafik = [];
-                grafikPie();
-            });
-            
-            $('#cetak').on('click', function() {
-                let baseUrl = "{{ route('data-pokok.data-presisi.cetak') }}";
-                let params = dtks.ajax.params(); // Get DataTables params
-                let queryString = new URLSearchParams(params).toString(); // Convert params to query string
-                window.open(`${baseUrl}?${queryString}`, '_blank'); // Open the URL with appended query
-            });
-        })
-    </script>
-@endsection
+        }
+        // Event listener for year filter change
+        $('#filter-tahun').on('change', function() {
+            dtks.ajax.reload();
+            data_grafik = [];
+            grafikPie();
+        });
+    })
+</script>
+@endsection
\ No newline at end of file
diff --git a/resources/views/data_pokok/infrastruktur/index.blade.php b/resources/views/data_pokok/infrastruktur/index.blade.php
index e5fe7ea0..d1256cfe 100644
--- a/resources/views/data_pokok/infrastruktur/index.blade.php
+++ b/resources/views/data_pokok/infrastruktur/index.blade.php
@@ -45,6 +45,7 @@
                     <div class="col-auto">
                         <x-print-button :print-url="url('data-pokok/infrastruktur/cetak')" table-id="infrastruktur" :filter="[]" />
                     </div>
+                    <x-excel-download-button :download-url="config('app.databaseGabunganUrl') . '/api/v1/infrastruktur/download'" table-id="infrastruktur" filename="data_infrastruktur" />
                 </div>
                 <div class="table-responsive">
                     <table class="table table-striped" id="infrastruktur">
diff --git a/resources/views/data_pokok/pariwisata/index.blade.php b/resources/views/data_pokok/pariwisata/index.blade.php
index 017f221e..f06d568c 100644
--- a/resources/views/data_pokok/pariwisata/index.blade.php
+++ b/resources/views/data_pokok/pariwisata/index.blade.php
@@ -57,6 +57,7 @@
                     <div class="col-auto">
                         <x-print-button :print-url="url('data-pokok/pariwisata/cetak')" table-id="pariwisata" :filter="[]" />
                     </div>
+                    <x-excel-download-button :download-url="config('app.databaseGabunganUrl') . '/api/v1/pariwisata/download'" table-id="pariwisata" filename="data_pariwisata" />
                 </div>
                 <div class="table-responsive">
                     <table class="table table-striped" id="pariwisata">
@@ -118,9 +119,7 @@
                         "filter[kategori]": $('#filter-kategori-wisata').val(),
                         "filter[sarana-wisata]": $('#filter-sarana-wisata').val(),
                         "filter[potensi-wisata]": $('#filter-komoditas-wisata').val(),
-                        "sort": (row.order[0]?.dir === "asc" ? "" : "-") + row.columns[row.order[0]
-                                ?.column]
-                            ?.name,
+                        "sort": "id",
                     };
                 },
                 dataSrc: function(json) {