update dashboard

src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt

@@ -1686,8 +1686,9 @@ open class DashboardService(
                 + " coalesce (sum(i.paidAmount),0) as totalReceived,"
                 + " coalesce (sum(i.issueAmount) - sum(i.paidAmount),0) as receivable,"
                 + " coalesce (round((sum(p.expectedTotalFee) - sum(ifnull(p.subContractFee, 0)))*0.8,2),0) as totalBudget,"
-                + " coalesce (expenditure.expenditure + sum(pc.expense), 0) as totalExpenditure,"
-                + " (sum(p.expectedTotalFee) - sum(ifnull(p.subContractFee, 0)))*0.8 - coalesce(sum(pc.expense), 0) as expenditureReceivable,"
+                + " coalesce(expenditure.expenditure, 0) +  + sum(coalesce(pc.expense, 0)) as totalExpenditure,"
+                + " coalesce(round((sum(p.expectedTotalFee) - sum(ifnull(p.subContractFee, 0)))*0.8,2),0) - (coalesce(expenditure.expenditure, 0) +  + sum(coalesce(pc.expense, 0))) as expenditureReceivable,"
+//                + " (sum(p.expectedTotalFee) - sum(ifnull(p.subContractFee, 0)))*0.8 - coalesce(sum(pc.expense), 0) as expenditureReceivable,"
 //                + " coalesce ((sum(p.expectedTotalFee) - sum(ifnull(p.subContractFee, 0)))*0.8 - expenditure.expenditure,0) as expenditureReceivable,"
                 + " sum(p.expectedTotalFee) as totalProjectFee,"
                 + " coalesce (round(sum(i.issueAmount)/sum(p.expectedTotalFee)*100,0),0) as invoicedPercentage"