diff --git a/Entities/Account.php b/Entities/Account.php
index 2b395ac..9d77b0d 100644
--- a/Entities/Account.php
+++ b/Entities/Account.php
@@ -50,7 +50,8 @@ class Account extends Model
             ->where('COMPANY_NAME', 'like', "%" .$uppercaseKodeCabang."%")
            // ->where('ARR_A', null)
             ->where('AC.BATCH_DATE', $startDate)
-            ->whereIn(DB::raw("LEFT(CATEGORY, 3)"), ['100','600','660','101','324'])
+           // ->whereIn(DB::raw("LEFT(CATEGORY, 3)"), ['100','600','660','101'])
+            ->whereIn(DB::raw("LEFT(CATEGORY, 2)"), ['10','60','66','30','31','32','33'])
            // ->orWhere(DB::raw("LEFT(CATEGORY, 2)"),'32')
             ->groupBy('CUSTOMER_NO','ACCOUNT_NUMBER','AC.BATCH_DATE','WORKING_BALANCE','COMPANY_NAME','CURRENCY','SHORT_NAME')
             ->limit(100);
@@ -106,6 +107,7 @@ class Account extends Model
 
     public function getAA($cust, $acc, $dataCore)
     {
+     //   dd($cust, $acc, $dataCore);
         //$uppercaseKodeCabang = Str::upper($kodecabang);
        $dateString = $dataCore->format('m/d/Y');
        // dd($dateString);
@@ -118,7 +120,7 @@ class Account extends Model
           ->join('STG_DB.AA_ACCOUNT_DETAILS AS AD', 'ARR.ID', '=', 'AD.ID')
           ->join('STG_DB.AA_ARR_INTEREST AS AI', DB::raw("LEFT(ARR.ID,12)"), '=', 'AD.ID')
           ->where('ARR.CUSTOMER', $cust)
-          ->whereYear('ARR.BATCH_DATE', $Year)
+          ->where('ARR.BATCH_DATE',  $dateString)
           ->where('ARR.LINKED_APPL_ID', $acc)
           ->groupBy('ARR.ID', 'ARR.LINKED_APPL_ID', 'ARR.CUSTOMER', 'ARR.PRODUCT_LINE','ARR.BATCH_DATE','AD.MATURITY_DATE','AI.FIXED_RATE','ARR.BATCH_DATE')
         //  ->orderBy('ARR.BATCH_DATE', 'DESC')
@@ -344,4 +346,4 @@ class Account extends Model
 
 
 
-}
\ No newline at end of file
+}