From 1d6c9524873e868e6eeae5db0207521a7a5f33e6 Mon Sep 17 00:00:00 2001
From: ivan-sim <ivan@sismedika.com>
Date: Thu, 25 Jan 2024 11:41:19 +0700
Subject: [PATCH 1/3] Update Final LOG

---
 .../Controllers/Api/RequestLogController.php  | 17 ++++++++++
 .../views/pdf/final_log_page_1.blade.php      | 32 ++++++++++++++++++-
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
index 760103ed..234a37e9 100644
--- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
+++ b/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();
diff --git a/resources/views/pdf/final_log_page_1.blade.php b/resources/views/pdf/final_log_page_1.blade.php
index 47320b3c..5887f4a7 100644
--- a/resources/views/pdf/final_log_page_1.blade.php
+++ b/resources/views/pdf/final_log_page_1.blade.php
@@ -424,6 +424,36 @@
             </tfoot>
             
         </table>
+        <table class="claim-info-<?php echo now()->timestamp; ?>">
+            <thead>
+                <tr style="background-color: #F4F6F8;">
+                    <td colspan="5" style="width: 5%; text-align: left;"><b>Diagnosis</b></td>
+                </tr>
+            </thead>
+            <tbody>
+                @php
+                    if(count($dataDiagnosis))
+                    {
+                        foreach ($dataDiagnosis as $valDiagnosis) 
+                        {
+                @endphp
+                    <tr>
+                        <td colspan="5" style="width: 5%; text-align: left;">{{ !empty($valDiagnosis->name) ? ' - '.$valDiagnosis->name  : '-'}}</td>
+                    </tr>
+                @php
+                        }
+                    }
+                    else
+                    {
+                @endphp
+                    <tr>
+                        <td colspan="5" style="width: 5%; text-align: left;">-</td>
+                    </tr>  
+                @php
+                    }
+                @endphp
+            </tbody>
+        </table>
         <table class="claim-info-<?php echo now()->timestamp; ?>">
             <thead>
                 <tr style="background-color: #F4F6F8;">
@@ -432,7 +462,7 @@
             </thead>
             <tbody>
                 <tr>
-                    <td colspan="5" style="width: 5%; text-align: left;">{{ !empty($dataRequestLog->catatan) ? $dataRequestLog->catatan  : ''}}</td>
+                    <td colspan="5" style="width: 5%; text-align: left;">{{ !empty($dataRequestLog->catatan) ? $dataRequestLog->catatan  : '-'}}</td>
                 </tr>
             </tbody>
         </table>

From 1c688806ff22079be5b5cdf48dbb0e53c03694be Mon Sep 17 00:00:00 2001
From: ivan-sim <ivan@sismedika.com>
Date: Thu, 25 Jan 2024 11:56:18 +0700
Subject: [PATCH 2/3] Update

---
 .../Http/Controllers/Api/RequestLogController.php               | 2 +-
 resources/views/pdf/final_log_page_1.blade.php                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
index 234a37e9..7360e4ef 100644
--- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
+++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
@@ -740,7 +740,7 @@ class RequestLogController extends Controller
             {
                 $diagnoisis = DB::table('icd')
                 ->where('icd.code', '=', $diagnosisCode)
-                ->select('icd.name')
+                ->select('icd.name', 'icd.code')
                 ->first();
                 array_push($dataDiagnosis, $diagnoisis);
             }
diff --git a/resources/views/pdf/final_log_page_1.blade.php b/resources/views/pdf/final_log_page_1.blade.php
index 5887f4a7..328c2fb3 100644
--- a/resources/views/pdf/final_log_page_1.blade.php
+++ b/resources/views/pdf/final_log_page_1.blade.php
@@ -438,7 +438,7 @@
                         {
                 @endphp
                     <tr>
-                        <td colspan="5" style="width: 5%; text-align: left;">{{ !empty($valDiagnosis->name) ? ' - '.$valDiagnosis->name  : '-'}}</td>
+                        <td colspan="5" style="width: 5%; text-align: left;">{{ !empty($valDiagnosis->name) ? ' - '.$valDiagnosis->code.'-'.$valDiagnosis->name  : '-'}}</td>
                     </tr>
                 @php
                         }

From 82d41265fce0b368b7db7b4dd34fae3faf5ed0e1 Mon Sep 17 00:00:00 2001
From: ivan-sim <ivan@sismedika.com>
Date: Thu, 25 Jan 2024 14:42:11 +0700
Subject: [PATCH 3/3] Update

---
 .../src/sections/dashboard/TableListFinalLog.tsx       | 10 ++++++++++
 .../src/sections/dashboard/TableListReqLog.tsx         |  8 ++++++++
 2 files changed, 18 insertions(+)

diff --git a/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx b/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx
index c79ff891..1fbe673c 100644
--- a/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx
+++ b/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx
@@ -340,6 +340,8 @@ export default function TableListFinalLog() {
       setData(
         response.data.data.map((obj: any) => ({
           ...obj,
+          provider:formatTitleCase(obj.provider),
+          full_name:formatTitleCase(obj.full_name),
           status:
             obj.status === 'requested' ? (
               <Label color='primary'>
@@ -426,6 +428,14 @@ export default function TableListFinalLog() {
   const [currentMember, setCurrentMember] = useState(null);
   const [nameMember, setNameMember] = useState('');
 
+
+  const formatTitleCase = (str:any) => {
+    if (str) {
+      return str.replace(/\w\S*/g, (txt:any) => txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase());
+    }
+    return ''; // Mengembalikan string kosong jika input adalah null atau undefined
+  };
+
   return (
     <>
       <TableComponent
diff --git a/frontend/hospital-portal/src/sections/dashboard/TableListReqLog.tsx b/frontend/hospital-portal/src/sections/dashboard/TableListReqLog.tsx
index 248ac202..f19e0b52 100644
--- a/frontend/hospital-portal/src/sections/dashboard/TableListReqLog.tsx
+++ b/frontend/hospital-portal/src/sections/dashboard/TableListReqLog.tsx
@@ -332,6 +332,8 @@ export default function TableList() {
       setData(
         response.data.data.map((obj: any) => ({
           ...obj,
+          provider:formatTitleCase(obj.provider),
+          full_name:formatTitleCase(obj.full_name),
           status:
             obj.status === 'requested' ? (
               <Label color='primary'>
@@ -422,6 +424,12 @@ export default function TableList() {
   const [setIsRequestFinalLog, isRequestFinalLog] = useState(false);
   const [dataViewFinalDialog, setDataViewFinalDialog] = useState<any>(null);
 
+  const formatTitleCase = (str:any) => {
+    if (str) {
+      return str.replace(/\w\S*/g, (txt:any) => txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase());
+    }
+    return ''; // Mengembalikan string kosong jika input adalah null atau undefined
+  };
   return (
     <>
       <TableComponent