diff --git a/Modules/Client/Http/Controllers/Api/ClaimReportController.php b/Modules/Client/Http/Controllers/Api/ClaimReportController.php
index 560d38a8..40c02e82 100755
--- a/Modules/Client/Http/Controllers/Api/ClaimReportController.php
+++ b/Modules/Client/Http/Controllers/Api/ClaimReportController.php
@@ -149,15 +149,16 @@ class ClaimReportController extends Controller
        $claim_id = Crypt::decrypt($claim_id);
         if ($request->hasFile('fileDiagnosis')) {
             foreach ($request->fileDiagnosis as $file) {
-                $pathFile = File::storeFile('claim-diagnosis', $claim_id, $file);
+                $fileData = File::storeFile('claim-diagnosis', $claim_id, $file);
                 File::updateOrCreate([
                     'fileable_type'=>'App\Models\ClaimRequest',
                     'fileable_id' => $claim_id,
                     'type' => 'claim-diagnosis',
-                    'name' => File::getFileName('claim-diagnosis', $claim_id, $file),
+                    'name' =>  $fileData['name'],
                     'original_name' => $file->getClientOriginalName(),
                     'extension' => $file->getClientOriginalExtension(),
-                    'path' => $pathFile,
+                    'source'        => env('FILESYSTEM_DISK'),
+                    'path' => $fileData['path'],
                     'created_by' => auth()->user()->id,
                     'updated_by' => auth()->user()->id,
                 ]);
@@ -166,15 +167,16 @@ class ClaimReportController extends Controller
 
         if ($request->hasFile('fileKondisis')) {
             foreach ($request->fileKondisis as $file) {
-                $pathFile = File::storeFile('claim-kondisi', $claim_id, $file);
+                $fileData = File::storeFile('claim-kondisi', $claim_id, $file);
                 File::updateOrCreate([
                     'fileable_type'=>'App\Models\ClaimRequest',
                     'fileable_id' => $claim_id,
                     'type' => 'claim-kondisi',
-                    'name' => File::getFileName('claim-kondisi', $claim_id, $file),
+                    'name' => $fileData['name'],
                     'original_name' => $file->getClientOriginalName(),
                     'extension' => $file->getClientOriginalExtension(),
-                    'path' => $pathFile,
+                    'source'        => env('FILESYSTEM_DISK'),
+                    'path' => $fileData['path'],
                     'created_by' => auth()->user()->id,
                     'updated_by' => auth()->user()->id,
                 ]);
@@ -188,10 +190,11 @@ class ClaimReportController extends Controller
                     'fileable_type'=>'App\Models\ClaimRequest',
                     'fileable_id' => $claim_id,
                     'type' => 'claim-result',
-                    'name' => File::getFileName('claim-result', $claim_id, $file),
+                    'name' => $fileData['name'],
                     'original_name' => $file->getClientOriginalName(),
                     'extension' => $file->getClientOriginalExtension(),
-                    'path' => $pathFile,
+                    'source'        => env('FILESYSTEM_DISK'),
+                    'path' => $fileData['path'],
                     'created_by' => auth()->user()->id,
                     'updated_by' => auth()->user()->id,
                 ]);
diff --git a/Modules/HospitalPortal/Http/Controllers/Api/ClaimRequestController.php b/Modules/HospitalPortal/Http/Controllers/Api/ClaimRequestController.php
index 09b93693..32fe5719 100755
--- a/Modules/HospitalPortal/Http/Controllers/Api/ClaimRequestController.php
+++ b/Modules/HospitalPortal/Http/Controllers/Api/ClaimRequestController.php
@@ -133,7 +133,7 @@ class ClaimRequestController extends Controller
     
                     if ($request->hasFile('additional_files')) {
                         foreach ($request->additional_files as $file) {
-                            $pathFile = File::storeFile('additional-files', $request->request_logs_id, $file);
+                            $fileData = File::storeFile('additional-files', $request->request_logs_id, $file);
                             // $newClaimRequest->files()->updateOrCreate([
                             //     'type' => 'additional-files',
                             //     'name' => File::getFileName('additional-files', $newClaimRequest->id, $file),
@@ -147,10 +147,11 @@ class ClaimRequestController extends Controller
                                 'fileable_type' => 'App\Models\RequestLog',
                                 'fileable_id' => $request->request_logs_id,
                                 'type' => 'additional-files',
-                                'name' => File::getFileName('additional-files', $request->request_logs_id, $file),
+                                'name' => $fileData['name'],
                                 'original_name' => $file->getClientOriginalName(),
                                 'extension' => $file->getClientOriginalExtension(),
-                                'path' => $pathFile,
+                                'source'        => env('FILESYSTEM_DISK'),
+                                'path' => $fileData['path'],
                                 'created_by' => auth()->user()->id,
                                 'updated_by' => auth()->user()->id,
                             ]);
@@ -444,15 +445,16 @@ class ClaimRequestController extends Controller
 
         if ($request->hasFile('fileDiagnosis')) {
             foreach ($request->fileDiagnosis as $file) {
-                $pathFile = File::storeFile('claim-diagnosis', $claim_id, $file);
+                $fileData = File::storeFile('claim-diagnosis', $claim_id, $file);
                 File::updateOrCreate([
                     'fileable_type'=>'App\Models\ClaimRequest',
                     'fileable_id' => $claim_id,
                     'type' => 'claim-diagnosis',
-                    'name' => File::getFileName('claim-diagnosis', $claim_id, $file),
+                    'name' => $fileData['name'],
                     'original_name' => $file->getClientOriginalName(),
                     'extension' => $file->getClientOriginalExtension(),
-                    'path' => $pathFile,
+                    'source'        => env('FILESYSTEM_DISK'),
+                    'path' => $fileData['path'],
                     'created_by' => auth()->user()->id,
                     'updated_by' => auth()->user()->id,
                 ]);
@@ -461,12 +463,12 @@ class ClaimRequestController extends Controller
 
         if ($request->hasFile('fileKondisis')) {
             foreach ($request->fileKondisis as $file) {
-                $pathFile = File::storeFile('claim-kondisi', $claim_id, $file);
+                $fileData = File::storeFile('claim-kondisi', $claim_id, $file);
                 File::updateOrCreate([
                     'fileable_type'=>'App\Models\ClaimRequest',
                     'fileable_id' => $claim_id,
                     'type' => 'claim-kondisi',
-                    'name' => File::getFileName('claim-kondisi', $claim_id, $file),
+                    'name' => $fileData['name'],
                     'original_name' => $file->getClientOriginalName(),
                     'extension' => $file->getClientOriginalExtension(),
                     'path' => $pathFile,
@@ -478,15 +480,16 @@ class ClaimRequestController extends Controller
 
         if ($request->hasFile('fileResults')) {
             foreach ($request->fileResults as $file) {
-                $pathFile = File::storeFile('claim-result', $claim_id, $file);
+                $fileData = File::storeFile('claim-result', $claim_id, $file);
                 File::updateOrCreate([
                     'fileable_type'=>'App\Models\ClaimRequest',
                     'fileable_id' => $claim_id,
                     'type' => 'claim-result',
-                    'name' => File::getFileName('claim-result', $claim_id, $file),
+                    'name' => $fileData['name'],
                     'original_name' => $file->getClientOriginalName(),
                     'extension' => $file->getClientOriginalExtension(),
-                    'path' => $pathFile,
+                    'source'        => env('FILESYSTEM_DISK'),
+                    'path' => $fileData['path'],
                     'created_by' => auth()->user()->id,
                     'updated_by' => auth()->user()->id,
                 ]);
diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
index 7dbe787e..7ceceef7 100755
--- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
+++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
@@ -378,15 +378,16 @@ class RequestLogController extends Controller
                 ]);
                 if ($request->hasFile('result_files')) {
                     foreach ($request->result_files as $file) {
-                        $pathFile = File::storeFile('final-log-result', $request->request_logs_id, $file);
+                        $fileData = File::storeFile('final-log-result', $request->request_logs_id, $file);
                         File::updateOrCreate([
                             'fileable_type' => 'App\Models\RequestLog',
                             'fileable_id' => $request->request_logs_id,
                             'type' => 'final-log-result',
-                            'name' => File::getFileName('final-log-result', $request->request_logs_id, $file),
+                            'name' => $fileData['name'],
                             'original_name' => $file->getClientOriginalName(),
                             'extension' => $file->getClientOriginalExtension(),
-                            'path' => $pathFile,
+                            'source'        => env('FILESYSTEM_DISK'),
+                            'path' => $fileData['path'],
                             'created_by' => auth()->user()->id,
                             'updated_by' => auth()->user()->id,
                         ]);
@@ -394,15 +395,16 @@ class RequestLogController extends Controller
                 }
                 if ($request->hasFile('diagnosa_files')) {
                     foreach ($request->diagnosa_files as $file) {
-                        $pathFile = File::storeFile('final-log-diagnosis', $request->request_logs_id, $file);
+                        $fileData = File::storeFile('final-log-diagnosis', $request->request_logs_id, $file);
                         File::updateOrCreate([
                             'fileable_type' => 'App\Models\RequestLog',
                             'fileable_id' => $request->request_logs_id,
                             'type' => 'final-log-diagnosis',
-                            'name' => File::getFileName('final-log-diagnosis', $request->request_logs_id, $file),
+                            'name' => $fileData['name'],
                             'original_name' => $file->getClientOriginalName(),
                             'extension' => $file->getClientOriginalExtension(),
-                            'path' => $pathFile,
+                            'source'        => env('FILESYSTEM_DISK'),
+                            'path' => $fileData['path'],
                             'created_by' => auth()->user()->id,
                             'updated_by' => auth()->user()->id,
                         ]);
@@ -410,7 +412,7 @@ class RequestLogController extends Controller
                 }
                 if ($request->hasFile('kondisi_files')) {
                     foreach ($request->kondisi_files as $file) {
-                        $pathFile = File::storeFile('final-log-kondisi', $request->request_logs_id, $file);
+                        $fileData = File::storeFile('final-log-kondisi', $request->request_logs_id, $file);
                         File::updateOrCreate([
                             'fileable_type' => 'App\Models\RequestLog',
                             'fileable_id' => $request->request_logs_id,
@@ -418,7 +420,8 @@ class RequestLogController extends Controller
                             'name' => File::getFileName('final-log-kondisi', $request->request_logs_id, $file),
                             'original_name' => $file->getClientOriginalName(),
                             'extension' => $file->getClientOriginalExtension(),
-                            'path' => $pathFile,
+                            'source'        => env('FILESYSTEM_DISK'),
+                            'path' => $fileData['path'],
                             'created_by' => auth()->user()->id,
                             'updated_by' => auth()->user()->id,
                         ]);
diff --git a/Modules/Internal/Http/Controllers/Api/ClaimRequestController.php b/Modules/Internal/Http/Controllers/Api/ClaimRequestController.php
index 2f61f0d0..5338e478 100755
--- a/Modules/Internal/Http/Controllers/Api/ClaimRequestController.php
+++ b/Modules/Internal/Http/Controllers/Api/ClaimRequestController.php
@@ -559,15 +559,16 @@ class ClaimRequestController extends Controller
     {
         if ($request->hasFile('invoice_files')) {
             foreach ($request->invoice_files as $file) {
-                $pathFile = File::storeFile('claim-invoice', $claim_id, $file);
+                $fileData = File::storeFile('claim-invoice', $claim_id, $file);
                 File::updateOrCreate([
                     'fileable_type'=>'App\Models\ClaimRequest',
                     'fileable_id' => $claim_id,
                     'type' => 'claim-invoice',
-                    'name' => File::getFileName('claim-invoice', $claim_id, $file),
+                    'name' => $fileData['name'],
                     'original_name' => $file->getClientOriginalName(),
                     'extension' => $file->getClientOriginalExtension(),
-                    'path' => $pathFile,
+                    'source'        => env('FILESYSTEM_DISK'),
+                    'path' => $fileData['path'],
                     'created_by' => auth()->user()->id,
                     'updated_by' => auth()->user()->id,
                 ]);
@@ -680,15 +681,16 @@ class ClaimRequestController extends Controller
 
         if ($request->hasFile('fileDiagnosis')) {
             foreach ($request->fileDiagnosis as $file) {
-                $pathFile = File::storeFile('claim-diagnosis', $claim_id, $file);
+                $fileData = File::storeFile('claim-diagnosis', $claim_id, $file);
                 File::updateOrCreate([
                     'fileable_type'=>'App\Models\ClaimRequest',
                     'fileable_id' => $claim_id,
                     'type' => 'claim-diagnosis',
-                    'name' => File::getFileName('claim-diagnosis', $claim_id, $file),
+                    'name' => $fileData['name'],
                     'original_name' => $file->getClientOriginalName(),
                     'extension' => $file->getClientOriginalExtension(),
-                    'path' => $pathFile,
+                    'source'        => env('FILESYSTEM_DISK'),
+                    'path' => $fileData['path'],
                     'created_by' => auth()->user()->id,
                     'updated_by' => auth()->user()->id,
                 ]);
@@ -697,15 +699,16 @@ class ClaimRequestController extends Controller
 
         if ($request->hasFile('fileKondisis')) {
             foreach ($request->fileKondisis as $file) {
-                $pathFile = File::storeFile('claim-kondisi', $claim_id, $file);
+                $fileData = File::storeFile('claim-kondisi', $claim_id, $file);
                 File::updateOrCreate([
                     'fileable_type'=>'App\Models\ClaimRequest',
                     'fileable_id' => $claim_id,
                     'type' => 'claim-kondisi',
-                    'name' => File::getFileName('claim-kondisi', $claim_id, $file),
+                    'name' => $fileData['name'],
                     'original_name' => $file->getClientOriginalName(),
                     'extension' => $file->getClientOriginalExtension(),
-                    'path' => $pathFile,
+                    'source'        => env('FILESYSTEM_DISK'),
+                    'path' => $fileData['path'],
                     'created_by' => auth()->user()->id,
                     'updated_by' => auth()->user()->id,
                 ]);
@@ -714,15 +717,16 @@ class ClaimRequestController extends Controller
 
         if ($request->hasFile('fileResults')) {
             foreach ($request->fileResults as $file) {
-                $pathFile = File::storeFile('claim-result', $claim_id, $file);
+                $fileData = File::storeFile('claim-result', $claim_id, $file);
                 File::updateOrCreate([
                     'fileable_type'=>'App\Models\ClaimRequest',
                     'fileable_id' => $claim_id,
                     'type' => 'claim-result',
-                    'name' => File::getFileName('claim-result', $claim_id, $file),
+                    'name' => $fileData['name'],
                     'original_name' => $file->getClientOriginalName(),
                     'extension' => $file->getClientOriginalExtension(),
-                    'path' => $pathFile,
+                    'source'        => env('FILESYSTEM_DISK'),
+                    'path' => $fileData['path'],
                     'created_by' => auth()->user()->id,
                     'updated_by' => auth()->user()->id,
                 ]);
diff --git a/Modules/Internal/Http/Controllers/Api/InvoicePaymentController.php b/Modules/Internal/Http/Controllers/Api/InvoicePaymentController.php
index 02f085b8..f614f733 100644
--- a/Modules/Internal/Http/Controllers/Api/InvoicePaymentController.php
+++ b/Modules/Internal/Http/Controllers/Api/InvoicePaymentController.php
@@ -350,15 +350,16 @@ class InvoicePaymentController extends Controller
                         }
                         if (!empty($valuePayments['files']) && is_array($valuePayments['files'])) {
                             foreach ($valuePayments['files'] as $file) {
-                                $pathFile = File::storeFile('files-proof-payment', $lastInsertedId, $file);
+                                $fileData = File::storeFile('files-proof-payment', $lastInsertedId, $file);
                                 File::updateOrCreate([
                                     'fileable_type' => 'App\Models\InvoicePayment',
                                     'fileable_id' => $lastInsertedId,
                                     'type' => 'files-proof-payment',
-                                    'name' => File::getFileName('files-proof-payment', $lastInsertedId, $file),
+                                    'name' => $fileData['name'],
                                     'original_name' => $file->getClientOriginalName(),
                                     'extension' => $file->getClientOriginalExtension(),
-                                    'path' => $pathFile,
+                                    'source'        => env('FILESYSTEM_DISK'),
+                                    'path' => $fileData['path'],
                                     'created_by' => auth()->user()->id,
                                     'updated_by' => auth()->user()->id,
                                 ]);
@@ -444,15 +445,16 @@ class InvoicePaymentController extends Controller
                         //File New
                         if (!empty($valuePayments['files']) && is_array($valuePayments['files'])) {
                             foreach ($valuePayments['files'] as $file) {
-                                $pathFile = File::storeFile('files-proof-payment', $invoicePaymentId, $file);
+                                $fileData = File::storeFile('files-proof-payment', $invoicePaymentId, $file);
                                 File::updateOrCreate([
                                     'fileable_type' => 'App\Models\InvoicePayment',
                                     'fileable_id' => $invoicePaymentId,
                                     'type' => 'files-proof-payment',
-                                    'name' => File::getFileName('files-proof-payment', $invoicePaymentId, $file),
+                                    'name' => $fileData['name'],
                                     'original_name' => $file->getClientOriginalName(),
                                     'extension' => $file->getClientOriginalExtension(),
-                                    'path' => $pathFile,
+                                    'source'        => env('FILESYSTEM_DISK'),
+                                    'path' => $fileData['path'],
                                     'created_by' => auth()->user()->id,
                                     'updated_by' => auth()->user()->id,
                                 ]);
diff --git a/Modules/Internal/Http/Controllers/Api/RequestLogController.php b/Modules/Internal/Http/Controllers/Api/RequestLogController.php
index f309f306..ada297ab 100755
--- a/Modules/Internal/Http/Controllers/Api/RequestLogController.php
+++ b/Modules/Internal/Http/Controllers/Api/RequestLogController.php
@@ -1008,15 +1008,16 @@ class RequestLogController extends Controller
     {
         if ($request->hasFile('invoice_files')) {
             foreach ($request->invoice_files as $file) {
-                $pathFile = File::storeFile('claim-invoice', $claim_id, $file);
+                $fileData = File::storeFile('claim-invoice', $claim_id, $file);
                 File::updateOrCreate([
                     'fileable_type'=>'App\Models\RequestLog',
                     'fileable_id' => $claim_id,
                     'type' => 'claim-invoice',
-                    'name' => File::getFileName('claim-invoice', $claim_id, $file),
+                    'name' => $fileData['name'],
                     'original_name' => $file->getClientOriginalName(),
                     'extension' => $file->getClientOriginalExtension(),
-                    'path' => $pathFile,
+                    'source'        => env('FILESYSTEM_DISK'),
+                    'path' => $fileData['path'],
                     'created_by' => auth()->user()->id,
                     'updated_by' => auth()->user()->id,
                 ]);
diff --git a/Modules/Linksehat/Http/Controllers/Api/ChatController.php b/Modules/Linksehat/Http/Controllers/Api/ChatController.php
index 5fef9e9b..8f102045 100755
--- a/Modules/Linksehat/Http/Controllers/Api/ChatController.php
+++ b/Modules/Linksehat/Http/Controllers/Api/ChatController.php
@@ -128,15 +128,16 @@ class ChatController extends Controller
         $pathFile = null;
         if ($request->hasFile('file_chat')) {
             foreach ($request->file_chat as $file) {
-                $pathFile = File::storeFile('chat', $message->id, $file);
+                $fileData = File::storeFile('chat', $message->id, $file);
                 File::updateOrCreate([
                     'fileable_type'=>'App\Models\Message',
                     'fileable_id' => $message->id,
                     'type' => 'chat',
-                    'name' => File::getFileName('chat', $message->id, $file),
+                    'name' => $fileData['name'],
                     'original_name' => $file->getClientOriginalName(),
                     'extension' => $file->getClientOriginalExtension(),
-                    'path' => $pathFile,
+                    'source'        => env('FILESYSTEM_DISK'),
+                    'path' => $fileData['path'],
                     'created_by' => auth()->user()->id,
                     'updated_by' => auth()->user()->id,
                 ]);