diff --git a/Modules/Client/Http/Controllers/Api/ClaimController.php b/Modules/Client/Http/Controllers/Api/ClaimController.php index de731700..c08e7689 100644 --- a/Modules/Client/Http/Controllers/Api/ClaimController.php +++ b/Modules/Client/Http/Controllers/Api/ClaimController.php @@ -274,6 +274,8 @@ class ClaimController extends Controller $header = [ 'No', 'Code', + 'Date Submission', + 'Date Discharge', 'Provider', 'Member ID (BN)', 'Member Name', @@ -312,6 +314,8 @@ class ClaimController extends Controller }) ->select( DB::raw('1 AS no'), + 'request_logs.submission_date', + 'request_logs.discharge_date', 'request_logs.organization_id', 'request_logs.id', 'request_logs.member_id', @@ -319,6 +323,7 @@ class ClaimController extends Controller 'request_logs.code', 'request_logs.diagnosis' ) + ->orderBy('request_logs.submission_date') ->get(); if (isset($data) && count($data) > 0) @@ -436,6 +441,8 @@ class ClaimController extends Controller $rowData = [ $check_first_id != $item->id ? $no : '', !empty($item->code) ? $item->code : '', + !empty($item->submission_date) ? $item->submission_date : '', + !empty($item->discharge_date) ? $item->discharge_date : '', !empty($dataRumahSakit->nama_rumahsakit) ? $dataRumahSakit->nama_rumahsakit : '', !empty($dataMember->member_id) ? $dataMember->member_id : '', !empty($dataMember->name) ? $dataMember->name : '', @@ -463,6 +470,8 @@ class ClaimController extends Controller $rowData = [ $check_first_id != $item->id ? $no : '', !empty($item->code) ? $item->code : '', + !empty($item->submission_date) ? $item->submission_date : '', + !empty($item->discharge_date) ? $item->discharge_date : '', !empty($dataRumahSakit->nama_rumahsakit) ? $dataRumahSakit->nama_rumahsakit : '', !empty($dataMember->member_id) ? $dataMember->member_id : '', !empty($dataMember->name) ? $dataMember->name : '', diff --git a/Modules/Internal/Services/RequestLogService.php b/Modules/Internal/Services/RequestLogService.php index d6f5ab3e..52fa864e 100644 --- a/Modules/Internal/Services/RequestLogService.php +++ b/Modules/Internal/Services/RequestLogService.php @@ -326,7 +326,7 @@ class RequestLogService // Pastikan $next_number adalah integer positif $next_number = max(1, (int) $next_number); // Menghasilkan kode dengan format yang diinginkan - return self::$code_prefix . $sparator. $data['source'] . $sparator. $data['provideCode'] . $sparator. $data['date'] . $sparator . $data['policy'] . $sparator. $data['member_code'] . $sparator. str_pad($next_number, 5, '0', STR_PAD_LEFT); + return self::$code_prefix . $sparator. $data['source'] . $sparator. $data['provideCode'] . $sparator. $data['date'] . $sparator . $data['policy'] . $sparator. $data['member_code'] . $sparator. str_pad($next_number, 6, '0', STR_PAD_LEFT); } } diff --git a/frontend/hospital-portal/index.html b/frontend/hospital-portal/index.html index 0128c552..7c476007 100644 --- a/frontend/hospital-portal/index.html +++ b/frontend/hospital-portal/index.html @@ -34,6 +34,6 @@
- + diff --git a/frontend/hospital-portal/src/App.tsx b/frontend/hospital-portal/src/App.tsx index 33c51771..7c48164c 100644 --- a/frontend/hospital-portal/src/App.tsx +++ b/frontend/hospital-portal/src/App.tsx @@ -12,7 +12,7 @@ import MotionLazyContainer from './components/animate/MotionLazyContainer'; import { SnackbarProvider } from 'notistack'; // ---------------------------------------------------------------------- - +export const u = 12 export default function App() { return ( diff --git a/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx b/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx index 8226a0d7..4792858f 100644 --- a/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx +++ b/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx @@ -309,7 +309,8 @@ export default function TableListFinalLog() { : Object.fromEntries([...searchParams.entries(), ['order', order], ['orderBy', orderBy]]); const response = await axios.get(`/get-final-log`, { - params: { ...parameters, type: 'final-log' }, + params: { ...parameters, order: order, + orderBy: orderBy, type: 'final-log' }, }); setData( response.data.data.map((obj: any) => ({ diff --git a/resources/views/pdf/final_log_page_1.blade.php b/resources/views/pdf/final_log_page_1.blade.php index 70ed505b..f374c5d1 100644 --- a/resources/views/pdf/final_log_page_1.blade.php +++ b/resources/views/pdf/final_log_page_1.blade.php @@ -98,6 +98,17 @@ line-height: 1; /* Atur nilai line-height menjadi 1 atau 100% */ } + .claim-info-benefit-timestamp; ?> { + font-size: {{ $$dynamicVariableName }}px; + /* color: #008C8C; */ + text-align: justify; + margin: 0; + padding: 0; + text-align: right; + margin-top: 10px; + line-height: 1; /* Atur nilai line-height menjadi 1 atau 100% */ + } + table { width: 100%; @@ -395,9 +406,9 @@ {{ $No++ }} {{ $claimLog->code . '-' . $claimLog->benfit }} - {{ number_format($claimLog->amount_incurred, 2, ',', '.') }} - {{ number_format($claimLog->amount_approved, 2, ',', '.') }} - {{ number_format($claimLog->excess_paid, 2, ',', '.') }} + {{ number_format($claimLog->amount_incurred, 2, ',', '.') }} + {{ number_format($claimLog->amount_approved, 2, ',', '.') }} + {{ number_format($claimLog->excess_paid, 2, ',', '.') }} {{ $claimLog->keterangan}} @endforeach @@ -405,9 +416,9 @@ Total - {{ number_format($total_claim, 2, ',', '.') }} - {{ number_format($total_disetujui, 2, ',', '.') }} - {{ number_format($total_selisih, 2, ',', '.') }} + {{ number_format($total_claim, 2, ',', '.') }} + {{ number_format($total_disetujui, 2, ',', '.') }} + {{ number_format($total_selisih, 2, ',', '.') }}