diff --git a/src/components/Pages/Anomali/Gangguan/Anomali_LAPPGP_LPP.vue b/src/components/Pages/Anomali/Gangguan/Anomali_LAPPGP_LPP.vue
index 06b1fa8..9094ba9 100755
--- a/src/components/Pages/Anomali/Gangguan/Anomali_LAPPGP_LPP.vue
+++ b/src/components/Pages/Anomali/Gangguan/Anomali_LAPPGP_LPP.vue
@@ -214,7 +214,7 @@
         class="text-right cursor-pointer"
         @click="
           setParameterRequest({
-            media: 1
+            media: 'PLN Mobile'
           })
         "
       >
@@ -233,7 +233,7 @@
         class="text-right cursor-pointer"
         @click="
           setParameterRequest({
-            media: 2
+            media: 'Call PLN 123'
           })
         "
       >
@@ -252,7 +252,7 @@
         class="text-right cursor-pointer"
         @click="
           setParameterRequest({
-            media: 0
+            media: ''
           })
         "
       >
@@ -903,9 +903,16 @@ const resetData = () => {
 const getDetail = async () => {
   resetData()
   const { jenisLaporan } = filters.value
+  const dateValue = filters.value.periode.split(' s/d ')
 
   const selected = dataSelected.value
   const query = {
+    dateFrom: dateValue[0]
+      ? dateValue[0].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    dateTo: dateValue[1]
+      ? dateValue[1].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
     idUlp: selected?.id_ulp ? selected?.id_ulp : 0,
     idUid: selected?.id_uid ? selected?.id_uid : 0,
     idUp3: selected?.id_up3 ? selected?.id_up3 : 0,
diff --git a/src/components/Pages/Cico/LaporanCICO.vue b/src/components/Pages/Cico/LaporanCICO.vue
index a996c30..76a7145 100755
--- a/src/components/Pages/Cico/LaporanCICO.vue
+++ b/src/components/Pages/Cico/LaporanCICO.vue
@@ -182,7 +182,7 @@
 
   <DetailDialog
     :open="dialogDetail"
-    title="Daftar Detail Penugasan Khusus"
+    title="Daftar Detail Check in & Check Out"
     @on-close="closedialogDetail"
     :full-width="true"
   >
@@ -859,13 +859,12 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, ref, watch } from 'vue'
+import { onMounted, ref } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import {
   DxColumn,
   DxColumnFixing,
   DxExport,
-  DxLoadPanel,
   DxPager,
   DxPaging,
   DxScrolling,
diff --git a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerFungsiBidang.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerFungsiBidang.vue
index c58626c..ae3a494 100755
--- a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerFungsiBidang.vue
+++ b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerFungsiBidang.vue
@@ -1092,16 +1092,12 @@ const calculateCustomSummary = (options: any) => {
     }
   }
 
-  if (options.name === 'persen_selesai') {
+  if (options.name == 'persen_selesai') {
     if (options.summaryProcess === 'start') {
       total = 0
       total_selesai = 0
     } else if (options.summaryProcess === 'finalize') {
-      options.totalValue = isFinite(total_selesai / total)
-        ? 0
-        : total_selesai == 0
-          ? 0
-          : (total_selesai / total) * 100
+      options.totalValue = total == 0 ? 0 : (total_selesai / total) * 100
     }
   }
 
@@ -1110,11 +1106,7 @@ const calculateCustomSummary = (options: any) => {
       total = 0
       total_inproses = 0
     } else if (options.summaryProcess === 'finalize') {
-      options.totalValue = isFinite(total_inproses / total)
-        ? 0
-        : total_inproses == 0
-          ? 0
-          : (total_inproses / total) * 100
+      options.totalValue = total == 0 ? 0 : (total_inproses / total) * 100
     }
   }
 
@@ -1139,11 +1131,7 @@ const calculateCustomSummary = (options: any) => {
       total_durasi_response = 0
       count_durasi_response = 0
     } else if (options.summaryProcess === 'finalize') {
-      options.totalValue = isFinite(count_durasi_response / total_durasi_response)
-        ? 0
-        : count_durasi_response == 0
-          ? 0
-          : count_durasi_response / total_durasi_response
+      options.totalValue = count_durasi_response / total_durasi_response
     }
   }
 
@@ -1168,11 +1156,7 @@ const calculateCustomSummary = (options: any) => {
       count_durasi_recovery = 0
       total_durasi_recovery = 0
     } else if (options.summaryProcess === 'finalize') {
-      options.totalValue = isFinite(count_durasi_recovery / total_durasi_recovery)
-        ? 0
-        : count_durasi_recovery == 0
-          ? 0
-          : count_durasi_recovery / total_durasi_recovery
+      options.totalValue = count_durasi_recovery / total_durasi_recovery
     }
   }
 }
@@ -1321,20 +1305,42 @@ const getDetail = async () => {
   const dateValue = filters.value.periode.split(' s/d ')
   const selected = dataSelected.value
 
-  const query = {
+  var query = {
     dateFrom: dateValue[0]
       ? dateValue[0].split('-').reverse().join('-')
       : new Date().toISOString().slice(0, 10),
     dateTo: dateValue[1]
       ? dateValue[1].split('-').reverse().join('-')
       : new Date().toISOString().slice(0, 10),
-    idUlp: selected?.id_ulp ? selected?.id_ulp : 0,
-    idUid: selected?.id_uid ? selected?.id_uid : 0,
-    idUp3: selected?.id_up3 ? selected?.id_up3 : 0,
+    idUlp: 0,
+    idUid: 0,
+    idUp3: 0,
     isSelesai: progressSelected.value,
     namaFungsiBidang: selected?.fungsi_bidang ? selected?.fungsi_bidang : ''
   }
 
+  if (isGroupBy.value && grouping.value.length > 0) {
+    if (grouping.value[0].data == 'nama_uid') {
+      query = {
+        ...query,
+        idUid: selected?.id_uid ? selected?.id_uid : 0
+      }
+    } else if (grouping.value[0].data == 'nama_up3') {
+      query = {
+        ...query,
+        idUid: selected?.id_uid ? selected?.id_uid : 0,
+        idUp3: selected?.id_up3 ? selected?.id_up3 : 0
+      }
+    } else if (grouping.value[0].data == 'nama_ulp') {
+      query = {
+        ...query,
+        idUid: selected?.id_uid ? selected?.id_uid : 0,
+        idUp3: selected?.id_up3 ? selected?.id_up3 : 0,
+        idUlp: selected?.id_ulp ? selected?.id_ulp : 0
+      }
+    }
+  }
+
   loadingSubData.value = true
   await requestGraphQl(queries.keluhan.rekap.keluhanPenyelesaianPerFungsiBidangDetail, query)
     .then((result) => {
diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanPerJenisGangguan.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanPerJenisGangguan.vue
index fc84b15..c52400d 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanPerJenisGangguan.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanPerJenisGangguan.vue
@@ -69,7 +69,6 @@
         cell-template="formatNumber"
       />
       <DxColumn
-        :width="70"
         alignment="center"
         data-field="persen"
         caption="%"
@@ -109,8 +108,15 @@
         <DxTotalItem
           column="jumlah"
           summary-type="sum"
-          display-format="19.169.174,65"
+          display-format="-"
+          css-class="text-transparent !text-right"
+        />
+        <DxTotalItem
+          column="ens"
+          show-in-column="persen"
+          summary-type="sum"
           css-class="text-white !text-right"
+          :customize-text="(e: any) => formatNumber(e.value)"
         />
       </DxSummary>
 
@@ -139,13 +145,12 @@
 <script setup lang="ts">
 import Filters from '@/components/Form/Filters.vue'
 import Type2 from '@/components/Form/FiltersType/Type2.vue'
-import { onMounted, ref, watch } from 'vue'
+import { onMounted, ref } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import {
   DxColumn,
   DxColumnFixing,
   DxExport,
-  DxLoadPanel,
   DxPaging,
   DxScrolling,
   DxSearchPanel,
@@ -242,8 +247,7 @@ const onExporting = (e: any) => {
   } else if (e.format === 'xlsx') {
     exportToXLSX(reportMeta.value, e)
   } else {
-  exportToDOCX(reportMeta.value, data.value)
-
+    exportToDOCX(reportMeta.value, data.value)
   }
 }
 const getDetail = async () => {
diff --git a/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_KeluhanBelumSelesai.vue b/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_KeluhanBelumSelesai.vue
index 7b99902..e589cd6 100755
--- a/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_KeluhanBelumSelesai.vue
+++ b/src/components/Pages/Monalisa/Keluhan/Rekap/MonalisaKR_KeluhanBelumSelesai.vue
@@ -113,7 +113,7 @@
           summary-type="sum"
           display-format="{0}"
           css-class="text-white !text-right"
-          :customize-text="(e: any) => formatPercentage(e.value)"
+          :customize-text="(e: any) => formatNumber(e.value)"
         />
 
         <DxGroupItem
diff --git a/src/utils/api/api.graphql.ts b/src/utils/api/api.graphql.ts
index ea3839f..4faa5f9 100755
--- a/src/utils/api/api.graphql.ts
+++ b/src/utils/api/api.graphql.ts
@@ -1713,6 +1713,8 @@ export const queries = {
       `,
       gangguanKoreksiTransaksiIndividualDetail: gql`
         query detailGangguanKoreksiTransaksiIndividu(
+          $bulan: Int!
+          $tahun: Int!
           $dateFrom: Date!
           $dateTo: Date!
           $posko: Int!
@@ -1724,6 +1726,8 @@ export const queries = {
           $is_koreksi_gangguan_dan_anev: Int!
         ) {
           detailGangguanKoreksiTransaksiIndividu(
+            bulan: $bulan
+            tahun: $tahun
             dateFrom: $dateFrom
             dateTo: $dateTo
             posko: $posko
@@ -2873,6 +2877,7 @@ export const queries = {
               nama_jenis_gangguan
               jumlah
               persen
+              ens
             }
           }
         `,
@@ -2893,6 +2898,7 @@ export const queries = {
               bulan: $bulan
               tahun: $tahun
             ) {
+              nama_regional
               id_uid
               nama_uid
               id_up3
@@ -4195,6 +4201,8 @@ export const queries = {
       `,
       petugasBerulangDetailSub: gql`
         query subDetailAnomaliPenangananPengaduanGangguanPetugasBerulang(
+          $dateFrom: Date!
+          $dateTo: Date!
           $namaRegional: String!
           $idUlp: Int!
           $idUid: Int!
@@ -4204,6 +4212,8 @@ export const queries = {
           $idPetugas: Int!
         ) {
           subDetailAnomaliPenangananPengaduanGangguanPetugasBerulang(
+            dateFrom: $dateFrom
+            dateTo: $dateTo
             namaRegional: $namaRegional
             idUlp: $idUlp
             idUid: $idUid