diff --git a/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt b/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt
index 8e55936..db036c0 100644
--- a/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt
+++ b/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt
@@ -709,8 +709,8 @@ open class DashboardService(
                 + " when coalesce(round(sum(i.issueAmount) / (expenditure.cumulativeExpenditure),3),0) >= 1 then 'Positive'"
                 + " when coalesce(round(sum(i.issueAmount) / (expenditure.cumulativeExpenditure),3),0) < 1 then 'Negative'"
                 + " end as cashFlowStatus,"
-                + " coalesce(round(sum(i.issueAmount) / (expenditure.cumulativeExpenditure),3),0) as cpi,"
-                + " coalesce(round(coalesce(pj.totalFee,0) / (expenditure.cumulativeExpenditure),3),0) as projectedCpi,"
+                + " coalesce(format(sum(i.issueAmount) / (expenditure.cumulativeExpenditure),3),0) as cpi,"
+                + " coalesce(format(coalesce(pj.totalFee,0) / (expenditure.cumulativeExpenditure),3),0) as projectedCpi,"
                 + " case"
                 + " when coalesce(round(coalesce(pj.totalFee,0) / (expenditure.cumulativeExpenditure),3),0) >= 1 then 'Positive'"
                 + " when coalesce(round(coalesce(pj.totalFee,0) / (expenditure.cumulativeExpenditure),3),0) < 1 then 'Negative'"
@@ -859,8 +859,8 @@ open class DashboardService(
                 + " when round(sum(i.issueAmount) / (expenditure.cumulativeExpenditure),3) >= 1 then 'Positive'"
                 + " when round(sum(i.issueAmount) / (expenditure.cumulativeExpenditure),3) < 1 then 'Negative'"
                 + " end as cashFlowStatus,"
-                + " round(sum(i.issueAmount) / (expenditure.cumulativeExpenditure),3) as cpi,"
-                + " round(sum(p.expectedTotalFee) / (expenditure.cumulativeExpenditure),3) as projectedCpi,"
+                + " format(sum(i.issueAmount) / (expenditure.cumulativeExpenditure),3) as cpi,"
+                + " format(sum(p.expectedTotalFee) / (expenditure.cumulativeExpenditure),3) as projectedCpi,"
                 + " case"
                 + " when round(sum(p.expectedTotalFee) / (expenditure.cumulativeExpenditure),3) >= 1 then 'Positive'"
                 + " when round(sum(p.expectedTotalFee) / (expenditure.cumulativeExpenditure),3) < 1 then 'Negative'"