diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php
index 485ed9e..63904a7 100644
--- a/app/Http/Controllers/LaporanController.php
+++ b/app/Http/Controllers/LaporanController.php
@@ -1268,12 +1268,25 @@ class LaporanController extends Controller
         $sum_keuntungan = ($sum_keun) ? $sum_keun[0]['sum_keun'] : 0;
         $sum_bayaran = ($sum_keun) ? $sum_keun[0]['sum_bayaran'] : 0;
 
-        $total_keuntungan_sebenar =  $sum_keuntungan + $sum_bayaran;
+        $get_norujukan_ansuran = Gadai::on($cawangan['mysql'])
+        ->selectRaw("norujukan,CASE WHEN (YEAR(t_gadai) = YEAR(t_update) and MONTH(t_gadai) = MONTH(t_update)) THEN '1' ELSE '0' END AS result")
+        ->whereNotNull('hargajualan')
+        ->having('result','=',1)
+        ->whereDate('t_gadai','>=',$request->mula)->whereDate('t_gadai','<=',$request->hingga)
+        ->where('sttebus','=','')
+        ->where('tagbaru','=',1)
+        ->pluck('norujukan');
+
+        $summation_ansuran = TransaksiKeuntungan::on('mysql7')
+        ->whereIn('norujukan',$get_norujukan_ansuran)->sum('bayaran_keuntungan');
+
+        $total_keuntungan_sebenar =  $sum_keuntungan + $sum_bayaran + $summation_ansuran;
         /* End Keuntungan Sebenar Calculation */
 
         /* Start Keuntungan Semasa Calculation */
         $get_norujukan = Gadai::on($cawangan['mysql'])
-        ->whereNotNull('hargajualan')->pluck('norujukan');
+        ->selectRaw("norujukan,CASE WHEN (YEAR(t_gadai) = YEAR(t_update) and MONTH(t_gadai) = MONTH(t_update)) THEN '1' ELSE '0' END AS result")
+        ->whereNotNull('hargajualan')->where('tagbaru',0)->having('result','=',0)->pluck('norujukan');
 
         $summation = Transaction::on('mysql7')
         ->selectRaw("SUM(CASE WHEN (transaction.trans_type) <> 'A' THEN (trans.keuntungan_rebet) ELSE 0 END) AS sum_keun,SUM(CASE WHEN (transaction.trans_type) = 'A' THEN (trans.bayaran_keuntungan) ELSE 0 END) AS sum_bayaran")
@@ -1297,7 +1310,9 @@ class LaporanController extends Controller
         $sum_keuntungan = ($summation) ? $summation[0]['sum_keun'] : 0;
         $sum_bayaran = ($summation) ? $summation[0]['sum_bayaran'] : 0;
 
-        $total_keuntungan_semasa = ($sum_keuntungan + $sum_bayaran + $upahlelong) - $total_keuntungan_sebenar;
+        // $total_keuntungan_semasa = ($sum_keuntungan + $sum_bayaran + $upahlelong) - $total_keuntungan_sebenar;
+        $total_keuntungan_semasa = ($sum_keuntungan + $sum_bayaran + $upahlelong);
+
         /* End Keuntungan Semasa Calculation */
 
         $array_keuntungan = ['keuntungan_sebenar' => $total_keuntungan_sebenar, 'keuntungan_semasa' => $total_keuntungan_semasa];
diff --git a/app/Services/Reports/OnePercentService.php b/app/Services/Reports/OnePercentService.php
index f839599..aeb93e3 100644
--- a/app/Services/Reports/OnePercentService.php
+++ b/app/Services/Reports/OnePercentService.php
@@ -84,6 +84,15 @@ class OnePercentService
                 // $keuntungan = $this->calculateTotalProfit($akrual,$start);
                 // $keuntungan = $keuntungan['onepercent'];
 
+                $date = new Carbon($start);
+                $year = $date->year;
+                $month = $date->month;
+
+                $total_akru = AkruNetPecahan::on($this->cawangan['mysql'])
+                ->where('tahun','=',$year)
+                ->where('bulan','<',$month)
+                ->sum('pend_akru_1persen');
+
                 $formData = [
                     'kodcaw' => $this->cawangan['kodcaw'],
                     'tarikh' => $start,
@@ -94,6 +103,7 @@ class OnePercentService
                 $akru = $this->calculateAccruedIncome($request);
 
                 $keuntungan = $akru['accrual_income_onepercent'];
+                $keuntungan += $total_akru;
             }
             return $keuntungan;
 
@@ -136,6 +146,15 @@ class OnePercentService
                 // $keuntungan = $this->calculateTotalProfit($akrual,$start);
                 // $keuntungan = $keuntungan['ujrah'];
 
+                $date = new Carbon($start);
+                $year = $date->year;
+                $month = $date->month;
+
+                $total_akru = AkruNetPecahan::on($this->cawangan['mysql'])
+                ->where('tahun','=',$year)
+                ->where('bulan','<',$month)
+                ->sum('pend_akru_ujrah');
+
                 $formData = [
                     'kodcaw' => $this->cawangan['kodcaw'],
                     'tarikh' => $start,
@@ -146,6 +165,7 @@ class OnePercentService
                 $akru = $this->calculateAccruedIncome($request);
 
                 $keuntungan = $akru['accrual_income_ujrah'];
+                $keuntungan += $total_akru;
             }
             return $keuntungan;