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

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

@@ -732,6 +732,23 @@ class RequestLogController extends Controller
 
         $data['signatureAd'] = $signatureAd;
 
+        $dataDiagnosis = [];
+        if($dataRequestLog->diagnosis)
+        {
+            $dataDiagnosiCodes = explode(',', $dataRequestLog->diagnosis);  
+            foreach ($dataDiagnosiCodes as $diagnosisCode)
+            {
+                $diagnoisis = DB::table('icd')
+                ->where('icd.code', '=', $diagnosisCode)
+                ->select('icd.name')
+                ->first();
+                array_push($dataDiagnosis, $diagnoisis);
+            }
+        }
+
+        $data['dataDiagnosis'] = $dataDiagnosis; 
+        
+
         $pdf = new Dompdf();
 
         $options = new Options();

Modules/Internal/Services/RequestLogService.php

@@ -25,7 +25,8 @@ class RequestLogService
         "Date Addmission" => "submission_date",
         "Date Discharge" => "discharge_date",
         "Member ID Peserta" => "member_id",
-        "Type of patient" => "service",
+        "Service" => "service",
+        "Type of Member" => "type_of_member",
         "Provider Code" => "organization_id",
         "End Of Claim Numbers" => "code",
         "Diagnosis" => "diagnosis",
@@ -34,8 +35,9 @@ class RequestLogService
         "Benefit Item" => "benefit_id",
         "Amount Approval" => "amount_approval",
         "Amount Not Approval" => "amount_not_approval",
-        "Final Billing" => "final_billing",
-        "Remarks" => "keterangan",
+        "Total COB" => "total_cob",
+        "Keterangan IGL" => "keterangan",
+        "Catatan FGL" => "catatan",
         "QC 1" => "status_final_log",
         "Ingestion Code" => "ingestion_code", // TODO I think this should not be here because if user uploading result then ingestion code and status will be filled
         "Ingestion Status" => "ingestion_status",
@@ -47,7 +49,8 @@ class RequestLogService
         "submission_date" => "Date Addmission",
         "discharge_date" => "Date Discharge",
         "member_id" => "Member ID Peserta",
-        "service" => "Type of patient",
+        "service" => "Service",
+        "type_of_member" => "Type of Member",
         "organization_id" => "Provider Code",
         "code" => "End Of Claim Numbers",
         "diagnosis" => "Diagnosis",
@@ -56,8 +59,9 @@ class RequestLogService
         "benefit_id" => "Benefit Item",
         "amount_approval" => "Amount Approval",
         "amount_not_approval" => "Amount Not Approval",
-        "keterangan" => "Remarks",
-        "final_billing" => "Final Billing",
+        "total_cob" => "Total COB",
+        "keterangan" => "Keterangan IGL",
+        "catatan" => "Catatan FGL",
         "status_final_log" => "QC 1"  ,
         "ingestion_code" => "Ingestion Code",
         "ingestion_status" => "Ingestion Status",
@@ -68,7 +72,8 @@ class RequestLogService
         "Date Addmission",
         "Date Discharge",
         "Member ID Peserta",
-        "Type of patient",
+        "Service",
+        "Type of Member",
         "Provider Code",
         "End Of Claim Numbers",
         "Diagnosis",
@@ -77,8 +82,9 @@ class RequestLogService
         "Benefit Item",
         "Amount Approval",
         "Amount Not Approval",
-        "Final Billing",
-        "Remarks",
+        "Total COB",
+        "Keterangan IGL",
+        "Catatan FGL",
         "QC 1",
         "Ingestion Code",
         "Ingestion Status",
@@ -89,7 +95,8 @@ class RequestLogService
         "Date Addmission",
         "Date Discharge",
         "Member ID Peserta",
-        "Type of patient",
+        "Service",
+        "Type of Member",
         "Provider Code",
         "End Of Claim Numbers",
         "Diagnosis",
@@ -98,8 +105,9 @@ class RequestLogService
         "Benefit Item",
         "Amount Approval",
         "Amount Not Approval",
-        "Final Billing",
-        "Remarks",
+        "Total COB",
+        "Keterangan IGL",
+        "Catatan FGL",
         "QC 1",
         "Ingestion Code",
         "Ingestion Status",
@@ -232,7 +240,9 @@ class RequestLogService
                     'status_final_log' => $statusFinalLog,
                     'final_log' =>$final_log,
                     'import_system' =>TRUE,
-                    // 'catatan' => $row['catatan'],
+                    'catatan' => $row['catatan'],
+                    'type_of_member' => $row['type_of_member'],
+                    'total_cob' => $row['total_cob'],
                     'keterangan' => $row['keterangan'],
                     'policy_id' => $member->currentPolicy->id ?? null,
                     'organization_id' => $organization_id,
@@ -251,6 +261,9 @@ class RequestLogService
                     'status_final_log' => $statusFinalLog,
                     'final_log' =>$final_log,
                     'import_system' =>TRUE,
+                    'catatan' => $row['catatan'],
+                    'type_of_member' => $row['type_of_member'],
+                    'total_cob' => $row['total_cob'],
                     'diagnosis' => $row['diagnosis'],
                     'keterangan' => $row['keterangan'],
                     'policy_id' => $member->currentPolicy->id ?? null,