diff --git a/Modules/Internal/Http/Controllers/Api/RequestLogController.php b/Modules/Internal/Http/Controllers/Api/RequestLogController.php index ebb70b89..4f69837d 100755 --- a/Modules/Internal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/Internal/Http/Controllers/Api/RequestLogController.php @@ -70,6 +70,23 @@ class RequestLogController extends Controller $q->orderBy($orderBy, $request->order); } }) + ->when($request->file, function ($q, $search) { + if ($search == 'kondisi') { + $q->whereHas('files', function ($subQuery) { + $subQuery->where('type', 'final-log-kondisi'); + }); + } elseif ($search == 'diagnosa') { + $q->whereHas('files', function ($subQuery) { + $subQuery->where('type', 'final-log-diagnosis'); + }); + } elseif ($search == 'result') { + $q->whereHas('files', function ($subQuery) { + $subQuery->where('type', 'final-log-result'); + }); + } elseif ($search == 'none') { + $q->doesntHave('files'); + } + }) ->when(empty($request->orderBy), function ($q) { $q->orderBy('submission_date', 'desc'); }) diff --git a/frontend/dashboard/src/pages/CustomerService/FinalLog/Components/DialogUploadFileFinalLog.tsx b/frontend/dashboard/src/pages/CustomerService/FinalLog/Components/DialogUploadFileFinalLog.tsx index af4d1728..d755d0fc 100755 --- a/frontend/dashboard/src/pages/CustomerService/FinalLog/Components/DialogUploadFileFinalLog.tsx +++ b/frontend/dashboard/src/pages/CustomerService/FinalLog/Components/DialogUploadFileFinalLog.tsx @@ -123,7 +123,7 @@ export default function DialogUploadFileFinalLog({ id, openDialog, setOpenDialog {/* -------------------------------Upload Dokumen Kondisi------------------------------- */} - File Kondisi + File Billing {/* Hasil Lab, */} - File Hasil Penunjang + File Hasil Penunjang Medis {/* Hasil Lab, */} (null); @@ -229,30 +239,64 @@ export default function List() { /> {!currentImportFileName && ( - - - + + + + + + File + + + + + + Import + + + {handleImportButton('claim')}}>Import + {handleGetTemplate('claim-request')}}>Download Template + {handleGetData('data-plan-benefit')}}>Download Claim Request + {handleImportButton('invoice')}}>Import Invoice + {handleGetTemplate('final-log-invoice')}}>Download Template Invoice + + {/*