Merge remote-tracking branch 'origin/staging' into origin/production

Modules/Client/Http/Controllers/Api/ClaimController.php

@@ -271,7 +271,6 @@ class ClaimController extends Controller
     {
         $writer = WriterEntityFactory::createXLSXWriter();
         $writer->openToFile(public_path('files/Report-Data-Alarm-Center-'.$start.'-'.$end.'.xlsx'));
-
         $header = [
             'No',
             'Code',
@@ -299,7 +298,8 @@ class ClaimController extends Controller
             'Catatan',
             'Invoice No',
             'Billing No',
-            'Type Of Member'
+            'Type Of Member',
+            'Deskripsi Diagnosis'
         ];
         $style = (new StyleBuilder())
            ->setFontBold()
@@ -477,11 +477,22 @@ class ClaimController extends Controller
                 )
                 ->get();
 
+                // Description Diagnosi
+                $diagnosis =  explode(",", $item->diagnosis);
+                $descriptionDiagnosis = '-';
+                if ($diagnosis){
+                    $datas = DB::table('icd')->whereIn('code',$diagnosis)->get();
+                    $descriptionDiagnosis = "";
+                    foreach($datas as $data){
+                        $descriptionDiagnosis .= $data->name ." ";
+                    }
+                }
                 $check_first_id = 0;
                 if($check_first_id != $item->id)
                 {
                     $no += $item->no;
                 }
+                
                 $total_billing = 0;
                 $lastIndex = count($dataClaimLog) - 1;
                 $firtIndex = 0;
@@ -518,6 +529,7 @@ class ClaimController extends Controller
                             !empty($item->invoice_no) ? $item->invoice_no : '',
                             !empty($item->billing_no) ? $item->billing_no : '',
                             !empty($item->type_of_member) ? $item->type_of_member : '',
+                            $descriptionDiagnosis,
 
                         ];
                         array_push($dataRow,$rowData);
@@ -555,6 +567,7 @@ class ClaimController extends Controller
                         !empty($item->invoice_no) ? $item->invoice_no : '',
                         !empty($item->billing_no) ? $item->billing_no : '',
                         !empty($item->type_of_member) ? $item->type_of_member : '',
+                        $descriptionDiagnosis,
 
                     ];
                     array_push($dataRow,$rowData);

Modules/Internal/Http/Controllers/Api/RequestLogController.php

@@ -490,7 +490,11 @@ class RequestLogController extends Controller
         if (!empty($request->reason)) {
             $requestLog->reason_final = $request->reason;
         }
-
+        
+        if (!empty($request->type_of_member)){
+            $requestLog->type_of_member = $request->type_of_member;
+        }
+        
         $requestLog->final_log = 1;
         $requestLog->approved_final_log_by = auth()->user()->id;
         $requestLog->approved_final_log_at = Carbon::now();