Merge branch 'staging' of https://dev.sismedika.online/febio/aso into staging

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

@@ -199,19 +199,19 @@ class ClaimController extends Controller
                 ['value' => 'Amt Not Approved', 'cell' => 'J1', 'mergeCell' => false, 'mergeToCell' => ''],
                 ['value' => 'Excess Paid', 'cell' => 'K1', 'mergeCell' => false, 'mergeToCell' => ''],
                 ['value' => 'Diagnosis', 'cell' => 'L1', 'mergeCell' => false, 'mergeToCell' => 'J2'],
-                
+
             ];
-    
+
             $spreadsheet = new Spreadsheet();
             $sheet = $spreadsheet->getActiveSheet();
 
             foreach ($headers as $header) {
                 $sheet->setCellValue($header['cell'], $header['value']);
-    
+
                 if ($header['mergeCell'] === true) {
                     $sheet->mergeCells($header['cell'] . ':' . $header['mergeToCell']);
                 }
-    
+
                 $sheet->getStyle($header['cell'])->getFont()->setBold(true);
                 $sheet->getStyle($header['cell'])->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER)->setVertical(\PhpOffice\PhpSpreadsheet\Style\Alignment::VERTICAL_CENTER);
             }
@@ -231,7 +231,7 @@ class ClaimController extends Controller
                 $sheet->setCellValue('J' . $startFrom, $d['amount_not_approved'] ?? '-');
                 $sheet->setCellValue('K' . $startFrom, $d['excess_paid'] ?? '-');
                 $sheet->setCellValue('L' . $startFrom, $d['diganosis'] ?? '-');
-                
+
                 $startFrom++;
             }
 
@@ -249,18 +249,18 @@ class ClaimController extends Controller
 
             $sheet->getDefaultRowDimension()->setRowHeight(-1);
             $sheet->setTitle('Alarm Center Report');
-    
+
             $writer = new Xlsx($spreadsheet);
             ob_start();
             $writer->save('php://output');
             $content = ob_get_contents();
             ob_end_clean();
-    
+
             $fileName = 'result-' . now()->getPreciseTimestamp(3) . '-alarm-center-report.xlsx';
             Storage::disk('public')->put('temp/' . $fileName, $content);
-    
+
             $fileUrl = url('storage/temp/' . $fileName);
-    
+
             return Helper::responseJson([
                 "file_url" => $fileUrl
             ]);
@@ -271,7 +271,7 @@ class ClaimController extends Controller
     {
         $writer = WriterEntityFactory::createXLSXWriter();
         $writer->openToFile(public_path('files/Report-Data-Alarm-Center-'.$start.'-'.$end.'.xlsx'));
-        
+
         $header = [
             'No',
             'Code',
@@ -283,6 +283,7 @@ class ClaimController extends Controller
             'Member Name',
             'Member Name Principal',
             'Plan Code',
+            'Service',
             'Payor ID',
             'Corporate name',
             'Policy Number',
@@ -308,7 +309,7 @@ class ClaimController extends Controller
 
         $headerRow = WriterEntityFactory::createRowFromArray($header, $style);
         $writer->addRow($headerRow);
-        
+
         $data = DB::table('request_logs')
         ->leftJoin('members', 'members.id', '=', 'request_logs.member_id')
         ->leftJoin('corporate_employees','corporate_employees.member_id','=','members.id')
@@ -318,7 +319,7 @@ class ClaimController extends Controller
         ->when($start != 'all' && $end != 'all', function ($query) use ($start, $end) {
             $query->where('request_logs.submission_date', '>=',Carbon::parse($start)->subDay())
                 ->where('request_logs.submission_date', '<=',Carbon::parse($end)->addDay());
-        })       
+        })
         ->select(
             DB::raw('1 AS no'),
             'request_logs.submission_date',
@@ -334,7 +335,7 @@ class ClaimController extends Controller
             'request_logs.catatan',
             DB::raw('
                 (Select SUM(request_log_benefits.amount_approved) as tot_bill FROM request_log_benefits
-                    WHERE request_log_benefits.request_log_id = request_logs.id LIMIT 1) AS tot_bill
+                    WHERE request_log_benefits.request_log_id = request_logs.id AND request_log_benefits.deleted_at IS NULL LIMIT 1) AS tot_bill
             ')
         )
         ->groupBy(
@@ -354,7 +355,7 @@ class ClaimController extends Controller
         ->orderBy('request_logs.submission_date', 'desc')
         ->get();
 
-        if (isset($data) && count($data) > 0) 
+        if (isset($data) && count($data) > 0)
         {
             $dataRow = array();
             $no = 0;
@@ -401,7 +402,7 @@ class ClaimController extends Controller
                     '),
                     DB::raw('
                         (Select services.name FROM services
-                            WHERE services.code = "'.$item->service_code.'" LIMIT 1) AS jenis_perwatan
+                            WHERE services.code = "'.$item->service_code.'" LIMIT 1) AS jenis_perawatan
                     '),
                     DB::raw('
                         (Select member_policies.policy_id FROM member_policies WHERE member_policies.member_id = members.member_id LIMIT 1) AS no_polis
@@ -478,7 +479,7 @@ class ClaimController extends Controller
                 $total_billing = 0;
                 $lastIndex = count($dataClaimLog) - 1;
                 $firtIndex = 0;
-                if (isset($dataClaimLog) && count($dataClaimLog) > 0) 
+                if (isset($dataClaimLog) && count($dataClaimLog) > 0)
                 {
                     foreach ($dataClaimLog as $index => $item_benefit)
                     {
@@ -494,6 +495,7 @@ class ClaimController extends Controller
                             !empty($dataMember->name) ? $dataMember->name : '',
                             $data['namaKaryawan'],
                             ($firtIndex == $index ? (!empty($dataMember->code_plan) ? $dataMember->code_plan : '') : ''),
+                            !empty($dataMember->jenis_perawatan) ? $dataMember->jenis_perawatan : '',
                             $penjamin,
                             !empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '',
                             !empty($dataMember->no_polis) ? $dataMember->no_polis : '',
@@ -507,12 +509,12 @@ class ClaimController extends Controller
                             !empty($item->diagnosis) ? $item->diagnosis : '',
                             !empty($item->keterangan) ? $item->keterangan : '',
                             !empty($item->catatan) ? $item->catatan : '',
-        
+
                         ];
                         array_push($dataRow,$rowData);
-                        
+
                         $check_first_id = $item->id;
-                    } 
+                    }
                 }
                 else
                 {
@@ -527,6 +529,7 @@ class ClaimController extends Controller
                         !empty($dataMember->name) ? $dataMember->name : '',
                         $data['namaKaryawan'],
                         !empty($dataMember->code_plan) ? $dataMember->code_plan : '',
+                        !empty($dataMember->jenis_perawatan) ? $dataMember->jenis_perawatan : '',
                         $penjamin,
                         !empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '',
                         !empty($dataMember->no_polis) ? $dataMember->no_polis : '',
@@ -540,11 +543,11 @@ class ClaimController extends Controller
                         '',
                         '',
                         '',
-    
-                    ];
-                    array_push($dataRow,$rowData);  
 
-                }     
+                    ];
+                    array_push($dataRow,$rowData);
+
+                }
             }
             $style = (new StyleBuilder())
             //->setFontBold()
@@ -578,6 +581,7 @@ class ClaimController extends Controller
                 '',
                 '',
                 '',
+                '',
                 $grand_total_billing,
                 '',
                 '',
@@ -597,7 +601,7 @@ class ClaimController extends Controller
                ->setCellAlignment(CellAlignment::LEFT)
             //    ->setBackgroundColor(Color::YELLOW)
                ->build();
-    
+
             $footerRow = WriterEntityFactory::createRowFromArray($footer, $style);
             $writer->addRow($footerRow);
         }

frontend/hospital-portal/public/lang/en-US.json

@@ -13,8 +13,8 @@
   "txtDialogMember2" : "Request LOG",
   "txtDialogMember3" : "Detail",
   "txtDialogMember4" : "Please select services",
-  "txtDialogMember5" : "Submission Date",
+  "txtDialogMember5" : "Admission Date",
-  "txtDialogMember6" : "Please select submission date",  
+  "txtDialogMember6" : "Please select admission date",  
   "txtWarningDischargeDate" : "Please select discharge date",
   "txtCreateAt" : "Create at",
   "txtDateBirth" : "Date of Birth",
@@ -30,7 +30,7 @@
   "txtStatus" : "Status",
   "txtSearch" : "Search Name or Member ID...",
   "txtAll" : "All",
-  "txtSubmissionDate" : "Submission Date",
+  "txtSubmissionDate" : "Admission Date",
   "txtDataNotFound" : "Data Not Found",
   "txtConditionDocument" : "Condition Document",
   "txtDiagnosisDokument" : "Diagnosis Dokument",

frontend/hospital-portal/public/lang/id-ID.json

@@ -13,8 +13,8 @@
   "txtDialogMember2" : "Request LOG",
   "txtDialogMember3" : "Detail",
   "txtDialogMember4" : "Mohon pilih layanan",
-  "txtDialogMember5" : "Tanggal Pengajuan",
+  "txtDialogMember5" : "Tanggal Masuk",
-  "txtDialogMember6" : "Mohon pilih tanggal pengajuan",
+  "txtDialogMember6" : "Mohon pilih tanggal masuk",
   "txtWarningDischargeDate" : "Mohon pilih tanggal keluar",
   "txtCreateAt" : "Tanggal Buat",
   "txtDateBirth" : "Tanggal Lahir",
@@ -30,7 +30,7 @@
   "txtStatus" : "Status",
   "txtSearch" : "Cari Nama atau ID Anggota...",
   "txtAll" : "Semua",
-  "txtSubmissionDate" : "Tanggal Pengajuan",
+  "txtSubmissionDate" : "Tanggal Masuk",
   "txtDataNotFound" : "Data Tidak Ditemukan",
   "txtConditionDocument" : "Dokumen Kondisi",
   "txtDiagnosisDokument" : "Dokumen Diagnosis",

frontend/hospital-portal/src/sections/dashboard/CardSearchMember.tsx

@@ -50,8 +50,8 @@ export default function CardSearchMember(handleSubmitSuccess:()=> void) {
   const { localeData }: any = useContext(LanguageContext);
   const {enqueueSnackbar} = useSnackbar();
 
-  const [noPolis, setNoPolis] = useState('AW001-01');
+  const [noPolis, setNoPolis] = useState('');
-  const [birthDate, setBirthDate] = useState('1991-01-10');
+  const [birthDate, setBirthDate] = useState(null);
   const [loadingBenefit, setLoadingBenefit] = useState(false);
   const [loadingClaim, setLoadingClaim] = useState(false);
   const [openDialogBenefit, setOpenDialogBenefit] = useState(false);

frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx

@@ -421,7 +421,7 @@ export default function TableListFinalLog() {
       setData(
           response.data.data.map((obj: any) => ({
             ...obj,
-          provider:formatTitleCase(obj.provider),
+          provider:obj.provider,
           full_name:formatTitleCase(obj.full_name),
           check_status: obj.status,
           check_claim: obj.check_claim,

frontend/hospital-portal/src/sections/dashboard/TableListReqLog.tsx

@@ -384,7 +384,7 @@ export default function TableList() {
       setData(
         response.data.data.map((obj: any) => ({
           ...obj,
-          provider:formatTitleCase(obj.provider),
+          provider:obj.provider,
           full_name:formatTitleCase(obj.full_name),
           status:
             obj.status === 'requested' ? (