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

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 : '',

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);
     }
 
 }

frontend/hospital-portal/index.html

@@ -34,6 +34,6 @@
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
 
-    <script type="module" src="/src/index.tsx"></script>
+    <script type="module" src="/src/index.tsx?version=1"></script>
   </body>
 </html>

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 (
       <ThemeProvider>

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) => ({

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-<?php echo now()->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 @@
                     <tr>
                         <td>{{ $No++ }}</td>
                         <td>{{ $claimLog->code . '-' . $claimLog->benfit }}</td>
-                        <td>{{ number_format($claimLog->amount_incurred, 2, ',', '.') }}</td>
+                        <td class="claim-info-benefit-<?php echo now()->timestamp; ?>">{{ number_format($claimLog->amount_incurred, 2, ',', '.') }}</td>
-                        <td>{{ number_format($claimLog->amount_approved, 2, ',', '.') }}</td>
+                        <td class="claim-info-benefit-<?php echo now()->timestamp; ?>">{{ number_format($claimLog->amount_approved, 2, ',', '.') }}</td>
-                        <td>{{ number_format($claimLog->excess_paid, 2, ',', '.') }}</td>
+                        <td class="claim-info-benefit-<?php echo now()->timestamp; ?>">{{ number_format($claimLog->excess_paid, 2, ',', '.') }}</td>
                         <td>{{ $claimLog->keterangan}}</td>
                     </tr>
                 @endforeach
@@ -405,9 +416,9 @@
             <tfoot>
                 <tr>
                     <td colspan="2"><b>Total</b></td>
-                    <td><b>{{ number_format($total_claim, 2, ',', '.') }}</b></td>
+                    <td class="claim-info-benefit-<?php echo now()->timestamp; ?>"><b>{{ number_format($total_claim, 2, ',', '.') }}</b></td>
-                    <td><b>{{ number_format($total_disetujui, 2, ',', '.') }}</b></td>
+                    <td class="claim-info-benefit-<?php echo now()->timestamp; ?>"><b>{{ number_format($total_disetujui, 2, ',', '.') }}</b></td>
-                    <td><b>{{ number_format($total_selisih, 2, ',', '.') }}</b></td>
+                    <td class="claim-info-benefit-<?php echo now()->timestamp; ?>"><b>{{ number_format($total_selisih, 2, ',', '.') }}</b></td>
                     <td></td>
                 </tr>
             </tfoot>