diff --git a/Modules/Internal/Transformers/ClaimRequestShowResource.php b/Modules/Internal/Transformers/ClaimRequestShowResource.php
index d56bbd75..eaba898f 100644
--- a/Modules/Internal/Transformers/ClaimRequestShowResource.php
+++ b/Modules/Internal/Transformers/ClaimRequestShowResource.php
@@ -7,6 +7,7 @@ use Illuminate\Support\Str;
 use App\Models\Service;
 use App\Models\MemberPlan;
 use App\Models\Plan;
+use App\Models\Icd;
 use App\Models\CorporateBenefit;
 use App\Models\RequestLogBenefit;
 use App\Models\CorporatePolicy;
@@ -82,6 +83,15 @@ class ClaimRequestShowResource extends JsonResource
             $isReversal = true;
         }
 
+        $icd = [];
+        if($data['request_log']['diagnosis']){
+            $diagnosis = explode(',', $data['request_log']['diagnosis']);
+            $icd = Icd::query()
+                    ->whereIn('code', $diagnosis)
+                    ->select('code', 'name')
+                    ->get();
+        } 
+
         
         $response = [
             'id' => $data['id'],
@@ -111,6 +121,7 @@ class ClaimRequestShowResource extends JsonResource
             'claim_method' =>  $data['request_log']['payment_type'],
             'files' => $data['request_log']['files'],
             'reason_decline' => $data['reason_decline'],
+            'diagnosis' => $icd,
             // 'benefit_data' => $benefitDetailLog,
             'is_reversal' => $isReversal, // untuk penjagaan, jika true tidak bisa di edit/hapus lagi
         ];
diff --git a/frontend/dashboard/src/pages/ClaimRequests/Detail.tsx b/frontend/dashboard/src/pages/ClaimRequests/Detail.tsx
index 647f632c..3058f81c 100644
--- a/frontend/dashboard/src/pages/ClaimRequests/Detail.tsx
+++ b/frontend/dashboard/src/pages/ClaimRequests/Detail.tsx
@@ -191,14 +191,15 @@ export default function Detail() {
                         <Stack direction='row' spacing={2} sx={marginBottom1}>
                             <Typography variant='subtitle2' sx={style3} gutterBottom>Diagnosis</Typography>
                             <Typography variant='subtitle2' sx={style2} gutterBottom>
-                                {claimRequests?.diagnosis?.length > 0 ? (
+                                {claimRequests?.diagnosis ? claimRequests?.diagnosis.length > 0 ? (
                                     <ul>
                                         {claimRequests?.diagnosis.map((diagnosisItem, index) => (
                                             <li key={index}>{diagnosisItem.code} - {diagnosisItem.name}</li>
                                             // Replace 'name' with the property you want to display
                                         ))}
                                     </ul>
-                                ) : (
+                                ) : null 
+                                : (
                                     <p>No diagnosis available.</p>
                                 )}
                             </Typography>
diff --git a/frontend/dashboard/src/pages/ClaimRequests/Model/Types.tsx b/frontend/dashboard/src/pages/ClaimRequests/Model/Types.tsx
index 782bc315..04ad0290 100644
--- a/frontend/dashboard/src/pages/ClaimRequests/Model/Types.tsx
+++ b/frontend/dashboard/src/pages/ClaimRequests/Model/Types.tsx
@@ -49,7 +49,7 @@ export type DetailClaimRequest = {
     reason              : string,
     files               : file[],
     benefit_data        : BenefitData[],
-    diagnosis           : Diagnosis[],
+    diagnosis           : Diagnosis[] | undefined,
     request_log         : RequestLogType | undefined,
     reason_decline      : string,
 }