diff --git a/adapter/dashboardadapter.js b/adapter/dashboardadapter.js
index 2641d18..5e350ad 100644
--- a/adapter/dashboardadapter.js
+++ b/adapter/dashboardadapter.js
@@ -247,32 +247,86 @@ class DashboardAdapter extends Adapter {
 			let po = new Array(12).fill(0);
 			let bast = new Array(12).fill(0);
 
-			let qry = `
+			// JUSTIFICATION
+			let qryJustification = `
+        SELECT MONTH(idt) as month, COUNT(*) total
+        FROM tbl_justification
+        WHERE isdeleted=0
+        AND idt>=? AND idt<?
+        GROUP BY MONTH(idt)
+        `;
+
+			db.query(qryJustification, [start, end], function (err, result) {
+				if (result) {
+					result.forEach((r) => {
+						justification[r.month - 1] = r.total;
+					});
+				}
+
+				// PR
+				let qryPR = `
+            SELECT MONTH(idt) as month, COUNT(*) total
+            FROM tbl_pr
+            WHERE isdeleted=0
+            AND idt>=? AND idt<?
+            GROUP BY MONTH(idt)
+            `;
+
+				db.query(qryPR, [start, end], function (err, result) {
+					if (result) {
+						result.forEach((r) => {
+							pr[r.month - 1] = r.total;
+						});
+					}
+
+					// PO
+					let qryPO = `
                 SELECT MONTH(idt) as month, COUNT(*) total
-                FROM tbl_justification
+                FROM tbl_po
                 WHERE isdeleted=0
                 AND idt>=? AND idt<?
                 GROUP BY MONTH(idt)
-            `;
+                `;
 
-			db.query(qry, [start, end], function (err, result) {
-				result.forEach((r) => {
-					justification[r.month - 1] = r.total;
+					db.query(qryPO, [start, end], function (err, result) {
+						if (result) {
+							result.forEach((r) => {
+								po[r.month - 1] = r.total;
+							});
+						}
+
+						// BAST
+						let qryBAST = `
+                    SELECT MONTH(idt) as month, COUNT(*) total
+                    FROM tbl_bast
+                    WHERE isdeleted=0
+                    AND idt>=? AND idt<?
+                    GROUP BY MONTH(idt)
+                    `;
+
+						db.query(qryBAST, [start, end], function (err, result) {
+							if (result) {
+								result.forEach((r) => {
+									bast[r.month - 1] = r.total;
+								});
+							}
+
+							apires.success = true;
+							apires.data = {
+								year: year,
+								months: months,
+								series: [
+									{name: "Justification", data: justification},
+									{name: "PR", data: pr},
+									{name: "PO", data: po},
+									{name: "BAST", data: bast},
+								],
+							};
+
+							callback(null, apires);
+						});
+					});
 				});
-
-				apires.success = true;
-				apires.data = {
-					year: year,
-					months: months,
-					series: [
-						{name: "Justification", data: justification},
-						{name: "PR", data: pr},
-						{name: "PO", data: po},
-						{name: "BAST", data: bast},
-					],
-				};
-
-				callback(null, apires);
 			});
 		} catch (err) {
 			apires.meta.code = 500;