diff --git a/src/components/Pages/Gangguan/Rekap/RGangguan_PerTanggal.vue b/src/components/Pages/Gangguan/Rekap/RGangguan_PerTanggal.vue
index cbc1d45..33e8a52 100755
--- a/src/components/Pages/Gangguan/Rekap/RGangguan_PerTanggal.vue
+++ b/src/components/Pages/Gangguan/Rekap/RGangguan_PerTanggal.vue
@@ -871,21 +871,69 @@ const setAgreementDialog = (status: boolean, progress: number) => {
 const getDetail = async () => {
   const dateValue = filters.value?.periode.split(' s/d ')
   const ref = dataSelected.value
+  const { posko, uid, up3 } = filters.value
 
-  const query = {
+  var query = {
     dateFrom: ref?.tanggal ? reformatDate(ref?.tanggal, 'yyyy/MM/dd', 'yyyy-MM-dd') : '',
     dateTo: ref?.tanggal ? reformatDate(ref?.tanggal, 'yyyy/MM/dd', 'yyyy-MM-dd') : '',
-    posko: progressSelected.value == 0 ? 0 : ref?.id_posko ? ref?.id_posko : 0,
-    idUid: progressSelected.value == 0 ? 0 : ref?.id_uid ? ref?.id_uid : 0,
-    idUp3: progressSelected.value == 0 ? 0 : ref?.id_up3 ? ref?.id_up3 : 0,
-    idRegu: ref?.id_regu ? ref?.id_regu : 0,
-    idUlp: progressSelected.value == 0 ? 0 : ref?.id_ulp ? ref?.id_ulp : 0,
+    posko: 0,
+    idUid: 0,
+    idUp3: 0,
+    idUlp: 0,
+    idRegu: 0,
+    idUlp: 0,
     namaRegional: ref?.nama_regional ? ref?.nama_regional : '',
     media: ref?.media ? ref?.media : '',
     isSelesai: progressSelected.value,
     tanggal: ref?.tanggal ? reformatDate(ref?.tanggal, 'yyyy/MM/dd', 'yyyy-MM-dd') : ''
   }
 
+  if (isGroupBy.value) {
+    query = {
+      ...query,
+      idUid: ref?.id_uid
+    }
+    if (uid.id != 0) {
+      query = {
+        ...query,
+        idUp3: ref?.id_up3
+      }
+
+      if (up3.id != 0) {
+        query = {
+          ...query,
+          posko: ref?.id_posko
+        }
+
+        if (posko.id != 0) {
+          query = {
+            ...query,
+            idUlp: ref?.id_ulp
+          }
+        }
+      }
+    }
+  } else {
+    if (uid.id != 0) {
+      query = {
+        ...query,
+        idUid: uid.id
+      }
+      if (up3.id != 0) {
+        query = {
+          ...query,
+          idUp3: up3.id
+        }
+        if (posko.id != 0) {
+          query = {
+            ...query,
+            posko: posko.id
+          }
+        }
+      }
+    }
+  }
+
   loadingSubData.value = true
   await requestGraphQl(queries.gangguan.rekap.gangguanAllDetail, query)
     .then((result) => {
diff --git a/src/components/Pages/Monalisa/Laporan/Bulanan/MonalisaLB_AgingComplaint.vue b/src/components/Pages/Monalisa/Laporan/Bulanan/MonalisaLB_AgingComplaint.vue
index 5758cfa..c9b82a3 100755
--- a/src/components/Pages/Monalisa/Laporan/Bulanan/MonalisaLB_AgingComplaint.vue
+++ b/src/components/Pages/Monalisa/Laporan/Bulanan/MonalisaLB_AgingComplaint.vue
@@ -876,8 +876,8 @@ const getDetail = async () => {
   loadingSubData.value = true
   await requestGraphQl(
     parameterRequest.value.type == 'gangguan'
-      ? queries.keluhan.rekap.rekapKeluhanAllDetail
-      : queries.keluhan.rekap.rekapKeluhanAllDetail,
+      ? queries.monalisa.laporan.bulanan.agingComplaintBulananDetail
+      : queries.monalisa.laporan.bulanan.agingComplaintBulananDetail,
     query
   )
     .then((result) => {
diff --git a/src/utils/api/api.graphql.ts b/src/utils/api/api.graphql.ts
index 2970094..c34e990 100755
--- a/src/utils/api/api.graphql.ts
+++ b/src/utils/api/api.graphql.ts
@@ -3396,6 +3396,44 @@ export const queries = {
             }
           }
         `,
+        agingComplaintBulananDetail: gql`
+          query detailAgingComplaintBulanan(
+            $bulan: Int!
+            $tahun: Int!
+            $namaRegional: String!
+            $idUlp: Int!
+            $idUid: Int!
+            $idUp3: Int!
+          ) {
+            detailAgingComplaintBulanan(
+              bulan: $bulan
+              tahun: $tahun
+              namaRegional: $namaRegional
+              idUlp: $idUlp
+              idUid: $idUid
+              idUp3: $idUp3
+            ) {
+              id
+              nama_regional
+              id_uid
+              nama_uid
+              id_up3
+              nama_up3
+              id_ulp
+              nama_ulp
+              no_laporan
+              alamat_pelapor
+              no_telp_pelapor
+              keterangan_pelapor
+              penyebab
+              kode_gangguan
+              jenis_gangguan
+              durasi_response_time
+              durasi_recovery_time
+              waktu_lapor
+            }
+          }
+        `,
         agingComplaintBulanan: gql`
           query agingComplaintBulanan(
             $namaRegional: String