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

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

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
                         }