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

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

@@ -185,6 +185,9 @@ class RequestLogController extends Controller
                                 WHEN request_logs.status = "reviewed" THEN "reviewed"
                                 ELSE "" 
                             END AS status
+                        '),
+                        DB::raw('
+                            (SELECT organizations.name FROM organizations WHERE organizations.id = request_logs.organization_id LIMIT 1) AS provider
                         '), 
                         'request_logs.submission_date')
                     ->paginate($limit);
@@ -265,6 +268,9 @@ class RequestLogController extends Controller
                                 ELSE "" 
                             END AS service_type
                         '),
+                        DB::raw('
+                            (SELECT organizations.name FROM organizations WHERE organizations.id = request_logs.organization_id LIMIT 1) AS provider
+                        '), 
                         DB::raw('
                             (Select request_log_id FROM claim_requests WHERE claim_requests.request_log_id = request_logs.id LIMIT 1) AS check_claim
                         ')
@@ -360,6 +366,7 @@ class RequestLogController extends Controller
         $dataRequestLog = DB::table('request_logs')
         ->where('request_logs.id', '=', $request_log_id)
         ->first();
+        $data['dataRequestLog'] = $dataRequestLog;
         $dataMember = DB::table('members')
         ->where('members.id', '=', $dataRequestLog->member_id)
         ->select(
@@ -480,6 +487,7 @@ class RequestLogController extends Controller
         $dataRequestLog = DB::table('request_logs')
         ->where('request_logs.id', '=', $request_log_id)
         ->first();
+        $data['dataRequestLog'] = $dataRequestLog;
         $dataMember = DB::table('members')
         ->where('members.id', '=', $dataRequestLog->member_id)
         ->select(

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

@@ -234,6 +234,12 @@ function handleChangeTab(event: React.SyntheticEvent, newValue: string) {
       label: localeData.txtRequestCode,
       isSort: true,
     },
+    {
+      id: 'provider',
+      align: 'left',
+      label: localeData.txtProvider,
+      isSort: true,
+    },
     {
       id: 'full_name',
       align: 'left',

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

@@ -221,6 +221,12 @@ export default function TableListFinalLog() {
       label: localeData.txtRequestCode,
       isSort: true,
     },
+    {
+      id: 'provider',
+      align: 'left',
+      label: localeData.txtProvider,
+      isSort: true,
+    },
     {
       id: 'full_name',
       align: 'left',

resources/views/pdf/final_log_page_1.blade.php

@@ -296,7 +296,7 @@
             <tr>
                 <td>Hak Kamar Pasien</td>
                 <td>:</td>
-                <td></td>
+                <td>{{ !empty($dataRequestLog->hak_kamar_pasien) ? $dataRequestLog->hak_kamar_pasien  : ''}}</td>
                 <td>Mata Uang</td>
                 <td>:</td>
                 <td>{{ $dataMember->mata_uang }}</td>
@@ -304,7 +304,7 @@
             <tr>
                 <td>Penempatan Kamar</td>
                 <td>:</td>
-                <td></td>
+                <td>{{ !empty($dataRequestLog->penempatan_kamar) ? $dataRequestLog->penempatan_kamar  : ''}}</td>
                 <td>Alamat Provider</td>
                 <td>:</td>
                 <td>{{ !empty($rumahSakit->alamat_rumahsakit) ? $rumahSakit->alamat_rumahsakit : '' }}</td>
@@ -377,6 +377,11 @@
                     <td colspan="5" style="width: 5%; text-align: left;"><b>CATATAN</b></td>
                 </tr>
             </thead>
+            <tbody>
+                <tr>
+                    <td colspan="5" style="width: 5%; text-align: left;">{{ !empty($dataRequestLog->catatan) ? $dataRequestLog->catatan  : ''}}</td>
+                </tr>
+            </tbody>
         </table>
         <div class="corner-text-<?php echo now()->timestamp; ?> bottom-left-<?php echo now()->timestamp; ?>">
         @php

resources/views/pdf/req_log_page_1.blade.php

@@ -303,7 +303,7 @@
             <tr>
                 <td>Hak Kamar Pasien</td>
                 <td>:</td>
-                <td></td>
+                <td>{{ !empty($dataRequestLog->hak_kamar_pasien) ? $dataRequestLog->hak_kamar_pasien  : ''}}</td>
                 <td>Mata Uang</td>
                 <td>:</td>
                 <td>{{ $dataMember->mata_uang }}</td>
@@ -311,7 +311,7 @@
             <tr>
                 <td>Penempatan Kamar</td>
                 <td>:</td>
-                <td></td>
+                <td>{{ !empty($dataRequestLog->penempatan_kamar) ? $dataRequestLog->penempatan_kamar  : ''}}</td>
                 <td>Alamat Provider</td>
                 <td>:</td>
                 <td>{{ !empty($rumahSakit->alamat_rumahsakit) ? $rumahSakit->alamat_rumahsakit : '' }}</td>
@@ -334,7 +334,7 @@
             </tr>
         </table>
         <div class="txt-pernyataan-<?php echo now()->timestamp; ?>">
-           <b>Keterangan:</b>
+           <b>Keterangan: {{ !empty($dataRequestLog->keterangan) ? $dataRequestLog->keterangan  : ''}}</b>
         </div>
         <div class="txt-pernyataan-<?php echo now()->timestamp; ?>">
             Mohon konfirmasi ke LinkSehat (Alarm Center Makassar) jika ada rujukan pasien ke spesialis lain.<br/>