diff --git a/src/components/Pages/Gangguan/Rekap/RGangguan_JenisGangguan.vue b/src/components/Pages/Gangguan/Rekap/RGangguan_JenisGangguan.vue
index d3c1107..9bd879e 100755
--- a/src/components/Pages/Gangguan/Rekap/RGangguan_JenisGangguan.vue
+++ b/src/components/Pages/Gangguan/Rekap/RGangguan_JenisGangguan.vue
@@ -63,8 +63,8 @@
       <DxColumn
         :width="120"
         alignment="center"
-        data-field="kode"
-        caption="Kode"
+        data-field="sub_kelompok"
+        caption="Kelompok"
         css-class="custom-table-column"
         group-index="0"
       />
@@ -398,6 +398,7 @@ const GET_REKAP_JENIS_GANGGUAN = gql`
       idUid: $idUid
       idUp3: $idUp3
     ) {
+      sub_kelompok
       avg_durasi_recovery
       avg_durasi_response
       max_durasi_recovery
@@ -486,6 +487,7 @@ const filterData = (params: any) => {
           ...dataReal.value,
           {
             no: ++no,
+            sub_kelompok: item.sub_kelompok,
             kode: item.kode,
             jenisGangguan: item.tipe_permasalahan,
             laporan: {
diff --git a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerFungsiBidang.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerFungsiBidang.vue
index 3db4235..16ca675 100755
--- a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerFungsiBidang.vue
+++ b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerFungsiBidang.vue
@@ -109,7 +109,7 @@
           <DxColumn
             :width="150"
             alignment="center"
-            data-field="total"
+            data-field="total_durasi_response"
             data-type="number"
             caption="Total"
             css-class="custom-table-column"
@@ -129,6 +129,7 @@
             data-type="number"
             caption="Max"
             css-class="custom-table-column"
+            cell-template="data-waktu"
           />
           <DxColumn
             :width="150"
@@ -137,6 +138,7 @@
             data-type="number"
             caption="Min"
             css-class="custom-table-column"
+            cell-template="data-waktu"
           />
         </DxColumn>
         <DxColumn alignment="center" caption="Laporan" css-class="custom-table-column">
@@ -163,7 +165,7 @@
           <DxColumn
             :width="150"
             alignment="center"
-            data-field="total"
+            data-field="total_durasi_recovery"
             data-type="number"
             caption="Total"
             css-class="custom-table-column"
@@ -183,6 +185,7 @@
             data-type="number"
             caption="Max"
             css-class="custom-table-column"
+            cell-template="data-waktu"
           />
           <DxColumn
             :width="150"
@@ -191,6 +194,7 @@
             data-type="number"
             caption="Min"
             css-class="custom-table-column"
+            cell-template="data-waktu"
           />
         </DxColumn>
         <DxColumn alignment="center" caption="Laporan" css-class="custom-table-column">
@@ -212,6 +216,12 @@
           />
         </DxColumn>
       </DxColumn>
+
+      <template #data-waktu="{ data }">
+        <p>
+          {{ parseInt(data.text) ? formatWaktu(data.text) : '-' }}
+        </p>
+      </template>
     </DxDataGrid>
   </div>
 </template>
@@ -219,6 +229,7 @@
 <script setup lang="ts">
 import Filters from '@/components/Form/Filters.vue'
 import Type13 from '@/components/Form/FiltersType/Type13.vue'
+import { formatWaktu } from '@/components/Form/FiltersType/reference'
 import { ref } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import {
@@ -295,6 +306,8 @@ const GET_DATA = gql`
     ) {
       fungsi_bidang
       total
+      total_durasi_response
+      total_durasi_recovery
       total_selesai
       persen_selesai
       total_inproses
diff --git a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerTanggal.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerTanggal.vue
index 496dc5b..2426e3d 100755
--- a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerTanggal.vue
+++ b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerTanggal.vue
@@ -54,7 +54,7 @@
       <DxColumn
         :width="170"
         alignment="center"
-        data-field="tanggal"
+        data-field="tanggal_lapor"
         caption="Tanggal Lapor"
         css-class="custom-table-column"
       />
@@ -306,9 +306,7 @@ const GET_DATA = gql`
     ) {
       id_uid
       nama_uid
-      id_ulp
-      nama_ulp
-      tanggal
+      tanggal_lapor
       total
       total_durasi_response
       total_durasi_recovery