update listing dan edit claim management

Modules/Internal/Http/Controllers/Api/ClaimController.php

@@ -12,9 +12,13 @@ use App\Services\ClaimService;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
+use Modules\HospitalPortal\Helpers\ApiResponse;
+use Illuminate\Support\Facades\Validator;
 use Modules\Internal\Transformers\ClaimShowResource;
+use Modules\Internal\Transformers\ClaimEditResource;
 use Box\Spout\Reader\Common\Creator\ReaderEntityFactory;
 use Box\Spout\Writer\Common\Creator\WriterEntityFactory;
+
 use PDF;
 
 class ClaimController extends Controller
@@ -23,22 +27,35 @@ class ClaimController extends Controller
      * Display a listing of the resource.
      * @return Renderable
      */
-    public function index()
+    public function index(Request $request)
     {
         $claims = Claim::with([
-                            'member',
+            'member',
-                            'diagnoses' => function ($diagnosis) {
+            'member.currentCorporate',
-                                return $diagnosis->where('type', 'primary');
+            'member.currentCorporate.currentPolicy',
-                            },
+            'member.currentPlan',
-                            'diagnoses.icd',
+            'diagnoses' => function ($diagnosis) {
-                            'plan', 
+                $diagnosis->where('type', 'primary');
-                            'benefit',
+            },
-                            'claimRequest',
+            'diagnoses.icd',
-                            'claimRequest.service'
+            'benefit',
-                        ])
+            'claimRequest',
-                        ->where('status', '!=', 'requested') // penjagaan agar approve baru masuk ke claim management
+            'claimRequest.service',
-                        ->latest()
+        ])
-                        ->paginate(10);
+        ->when($request->search, function ($q, $search) {
+            $q->where(function ($subQuery) use ($search) {
+                $subQuery->whereHas('claimRequest', function ($claimRequest) use ($search) {
+                    $claimRequest->where('code', 'LIKE', "%" . $search . "%");
+                })
+                ->orWhereHas('member', function ($member) use ($search) {
+                    $member->where('name', 'LIKE', "%" . $search . "%");
+                });
+            });
+        })
+        ->where('status', '!=', 'requested') // Penjagaan agar approve baru masuk ke claim management
+        ->latest()
+        ->paginate(10);
+        
 
         return response()->json($claims);
     }
@@ -129,7 +146,32 @@ class ClaimController extends Controller
      */
     public function edit($id)
     {
-        return view('internal::edit');
+        $claim = Claim::query()
+                ->with([
+                    'member', 
+                    'plan',
+                    'member.currentPlan', 
+                    'member.currentPlan.benefits',
+                    'member.currentCorporate',
+                    'member.currentPolicy',
+                    // 'diagnosis',
+                    'diagnoses',
+                    'diagnoses.icd',
+                    'benefit',
+                    'files',
+                    'claimRequest',
+                    'claimRequest.files',
+                    'items',
+                    'items.claim_itemable',
+                    'encounters',
+                    'encounters.doctors',
+                    'encounters.primaryDiagnoses',
+                    'encounters.primaryDiagnoses.diagnosis',
+                    'encounters.healthcare'
+                    ])
+                ->findOrFail($id);
+
+        return Helper::responseJson(ClaimEditResource::make($claim));
     }
 
     /**
@@ -140,7 +182,42 @@ class ClaimController extends Controller
      */
     public function update(Request $request, $id)
     {
-        //
+        $customMessages = [
+            'required' => 'Kolom :attribute wajib diisi.',
+            'numeric' => 'Kolom :attribute harus berupa angka.',
+        ];
+
+        $data = [
+            'benefit_desc' => $request->benefit_desc,
+            'amount_incurred' => $request->amount_incurred,
+            'amount_approved' => $request->amount_approved,
+            'amount_not_approved' => $request->amount_not_approved,
+            'excess_paid' => $request->excess_paid,
+        ];
+        
+        $validator = Validator::make($request->all(), [
+            'benefit_desc' => 'required',
+            'amount_incurred' => 'required|numeric',
+            'amount_approved' => 'required|numeric',
+            'amount_not_approved' => 'required|numeric',
+            'excess_paid' => 'required|numeric',
+        ], $customMessages);
+        
+        if ($validator->fails()) {
+            return ApiResponse::apiResponse('Bad Request', $data, $validator->errors(), 400);
+        }
+        
+        // Validasi berhasil, lanjutkan dengan pembaruan data
+        $claim = Claim::findOrFail($id);
+        $claim->fill([
+            'benefit_desc' => $request->benefit_desc,
+            'amount_incurred' => $request->amount_incurred,
+            'amount_approved' => $request->amount_approved,
+            'amount_not_approved' => $request->amount_not_approved,
+            'excess_paid' => $request->excess_paid,
+        ])->save();
+        
+        return $claim;    
     }
 
     /**

Modules/Internal/Http/Controllers/Api/ClaimRequestController.php

@@ -15,6 +15,8 @@ use Modules\Internal\Transformers\ClaimRequestShowResource;
 use Illuminate\Support\Facades\Storage;
 use App\Services\ClaimRequestService;
 use App\Exceptions\ImportRowException;
+use App\Events\ClaimRequested;
+
 
 use App\Models\File;
 use App\Models\FilesMcu;
@@ -85,7 +87,7 @@ class ClaimRequestController extends Controller
             'files',
             'member',
             'claim',
-            'claim.organization',
+            'organization',
         ]);
 
         return Helper::responseJson(data: ClaimRequestShowResource::make($claimRequest));
@@ -109,30 +111,38 @@ class ClaimRequestController extends Controller
      */
     public function update(Request $request, $id)
     {
-        $claim_id = ClaimRequest::find($id)->claim_id;
+        $claimRequest = ClaimRequest::findOrFail($id);
-        $organization_id = Organization::where('code', $request->provider_code)->first();
+        $claimRequest->load([
-        if (!$organization_id) {
+            'histories' => function ($history) {
+                $history->latest();
+            },
+            'files',
+            'member',
+            'claim',
+            'organization',
+        ]);
+        $organization = Organization::where('code', $request->provider_code)->first();
+        if (!$organization) {
             return response()->json(['error' => true, 'message' => 'Data tidak ditemukan'], 404);
         }
 
-        $newClaimRequest = ClaimRequestService::updateClaimRequest(code: $code, member: $member, paymentType: 'reimbursement', serviceCode: $request->service_code);
+        $updateClaimRequest = ClaimRequestService::updateClaimRequest(organization_id: $organization->id, claim_request_id: $id);
-
+     
-        ClaimRequested::dispatch($newClaimRequest);
+        ClaimRequested::dispatch($updateClaimRequest);
-
         // Log History
-        $newClaimRequest->histories()->create([
+        $updateClaimRequest->histories()->create([
             'title' => 'Update Claim Requested',
-            'description' => "Update Claim Requested for Member : {$member->member_id} - ({$member->full_name})",
+            'description' => "Update Claim Requested for Member : {$claimRequest->member->member_id} - ({$claimRequest->member->full_name})",
-            'type' => 'info',
+            'type' => 'update',
-            'system_origin' => 'hospital-portal'
+            'system_origin' => 'prime-center'
         ]);
 
         if ($request->hasFile('result_files')) {
             foreach ($request->result_files as $file) {
-                $pathFile = File::storeFile('claim-result', $newClaimRequest->id, $file);
+                $pathFile = File::storeFile('claim-result', $id, $file);
-                $newClaimRequest->files()->updateOrCreate([
+                $updateClaimRequest->files()->updateOrCreate([
                     'type' => 'claim-result',
-                    'name' => File::getFileName('claim-result', $newClaimRequest->id, $file),
+                    'name' => File::getFileName('claim-result', $id, $file),
                     'original_name' => $file->getClientOriginalName(),
                     'extension' => $file->getClientOriginalExtension(),
                     'path' => $pathFile,
@@ -144,10 +154,10 @@ class ClaimRequestController extends Controller
 
         if ($request->hasFile('diagnosa_files')) {
             foreach ($request->diagnosa_files as $file) {
-                $pathFile = File::storeFile('claim-diagnosis', $newClaimRequest->id, $file);
+                $pathFile = File::storeFile('claim-diagnosis', $id, $file);
-                $newClaimRequest->files()->updateOrCreate([
+                $updateClaimRequest->files()->updateOrCreate([
                     'type' => 'claim-diagnosis',
-                    'name' => File::getFileName('claim-diagnosis', $newClaimRequest->id, $file),
+                    'name' => File::getFileName('claim-diagnosis', $id, $file),
                     'original_name' => $file->getClientOriginalName(),
                     'extension' => $file->getClientOriginalExtension(),
                     'path' => $pathFile,
@@ -159,10 +169,10 @@ class ClaimRequestController extends Controller
 
         if ($request->hasFile('kondisi_files')) {
             foreach ($request->kondisi_files as $file) {
-                $pathFile = File::storeFile('claim-kondisi', $newClaimRequest->id, $file);
+                $pathFile = File::storeFile('claim-kondisi', $id, $file);
-                $newClaimRequest->files()->updateOrCreate([
+                $updateClaimRequest->files()->updateOrCreate([
                     'type' => 'claim-kondisi',
-                    'name' => File::getFileName('claim-kondisi', $newClaimRequest->id, $file),
+                    'name' => File::getFileName('claim-kondisi', $id, $file),
                     'original_name' => $file->getClientOriginalName(),
                     'extension' => $file->getClientOriginalExtension(),
                     'path' => $pathFile,
@@ -171,6 +181,13 @@ class ClaimRequestController extends Controller
                 ]);
             }
         }
+
+        return response()->json([
+            'error' => false, 
+            'message' => 'Update succses', 
+            'data' =>  $updateClaimRequest], 
+        200);
+
     }
 
     /**
@@ -308,17 +325,18 @@ class ClaimRequestController extends Controller
                             'Ingest Code' => $e->getCode(),
                             'Ingest Note' => $e->getMessage(),
                         ]), $sheet->getName());
-                    } catch (\Exception $e) {
+                    } 
-                        // throw new \Exception($e);
+                    // catch (\Exception $e) {
-                        // Write Server Error to File
+                    //     // throw new \Exception($e);
-                        // $import->read($fileRead);
+                    //     // Write Server Error to File
-                        // $import->write($fileWrite, 'xsls');
+                    //     // $import->read($fileRead);
-                        dd($e);
+                    //     // $import->write($fileWrite, 'xsls');
-                        $import->addArrayToRow(array_merge($row_data, [
+                    //     dd( $e->getMessage());
-                            'Ingest Code' => 500,
+                    //     $import->addArrayToRow(array_merge($row_data, [
-                            'Ingest Note' => env('APP_DEBUG') ? $e->getMessage() : 'Server Error',
+                    //         'Ingest Code' => 500,
-                        ]), $sheet->getName());
+                    //         'Ingest Note' => env('APP_DEBUG') ? $e->getMessage() : 'Server Error',
-                    }
+                    //     ]), $sheet->getName());
+                    // }
                 }
             }
         }

Modules/Internal/Routes/api.php

@@ -129,7 +129,7 @@ Route::prefix('internal')->group(function () {
 
         Route::get('corporates/{corporate_id}/formulariums', [CorporateFormulariumController::class, 'index']);
         Route::get('corporates/{corporate_id}/formulariums/{formularium_id}', [CorporateFormulariumController::class, 'show']);
-        Route::get('corporates/{corporate_id}/formulariums/create', [CorporateFormulariumController::class, 'create']);
+        Route::get('corporates/{corporate_id}/formulariums-create', [CorporateFormulariumController::class, 'create']);
         Route::post('corporates/{corporate_id}/formulariums', [CorporateFormulariumController::class, 'store']);
         Route::get('corporates/{corporate_id}/formulariums/list', [CorporateFormulariumController::class, 'generateFormulariumList']);
         Route::post('corporates/{corporate_id}/formulariums/import', [CorporateFormulariumController::class, 'import']);
@@ -193,6 +193,8 @@ Route::prefix('internal')->group(function () {
         Route::post('claims/{id}/re-open', [ClaimController::class, 'reOpen'])->name('claim.re-open');
         Route::post('claims', [ClaimController::class, 'store']);
         Route::get('claims/{id}', [ClaimController::class, 'show']);
+        Route::put('claims/{id}', [ClaimController::class, 'update']);
+        Route::get('claims/{id}/edit', [ClaimController::class, 'edit']);
         Route::post('check-limit', [ClaimController::class, 'checkLimit']);
         Route::get('claims/1/data-claim', [ClaimController::class, 'dataClaimReport']);
 

Modules/Internal/Transformers/ClaimEditResource.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Modules\Internal\Transformers;
+
+use App\Models\Benefit;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ClaimEditResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        $value = parent::toArray($request);
+        $data['id'] = $value['id'];
+        $data['plan_id'] = $value['plan'] ? $value['plan']['code'] : '-';
+        $data['payor_id'] = $value['member'] ? $value['member']['current_corporate']['payor_id'] : '-';
+        $data['corporate_id'] = $value['member'] ? $value['member']['current_corporate']['code'] : '-';
+        $data['policy_number'] = $value['member'] ? $value['member']['current_policy']['code'] : '-';
+        $data['member_id'] = $value['member'] ? $value['member']['member_id'] : '-';
+        // $data['benefit_code'] = $value['benefit'] ? $value['benefit']['code'] : '-';
+        // $data['benefit_desc'] = $value['benefit'] ? $value['benefit']['description'] : '-';
+        $data['benefit_code'] = $value['benefit_code'];
+        $data['benefit_desc'] = $value['benefit_desc'];
+        $data['amount_incurred'] = $value['amount_incurred'];
+        $data['amount_approved'] = $value['amount_approved'];
+        $data['amount_not_approved'] = $value['amount_not_approved'];
+        $data['excess_paid'] = $value['excess_paid'];
+
+        return $data;
+    }
+}

app/Models/Claim.php

@@ -31,7 +31,13 @@ class Claim extends Model
         'benefit_id',
         'organization_id',
         'status',
-        'service_code'
+        'service_code',
+        'benefit_code',
+        'benefit_desc',
+        'amount_incurred',
+        'amount_approved',
+        'amount_not_approved',
+        'excess_paid',
     ];
 
     protected $hidden = [

app/Models/ClaimRequest.php

@@ -26,6 +26,7 @@ class ClaimRequest extends Model
         'policy_id',
         'status',
         'claim_id',
+        'organization_id',
         'code'
     ];
 
@@ -45,6 +46,8 @@ class ClaimRequest extends Model
         "MEMBER ID"                     => "member_id",
         "MEMBER NAME"                   => "member_name",
         "RECORD TYPE (P/D)"             => "record_type",
+        "BENEFIT CODE"                  => "benefit_code",
+        "BENEFIT DESC"                  => "benefit_desc",
         "CLAIM TYPE"                    => "claim_type",
         "CLAIM PROCESS STATUS"          => "status",
         "CLIENT CLAIM ID"               => "client_claim_id",
@@ -63,7 +66,7 @@ class ClaimRequest extends Model
         "TOT AMT NOT APPROVED"          => "tot_amt_not_approved",
         "TOT EXCESS PAID"               => "tot_excess_paid",
         "REMARKS"                       => "remarks",
-        "SECONDARY DIAGNOSIS CODE"      => "secondary_diagnosis_code",
+        "SECONDARY DIAGNOSIS CODE"      => "secondary_diagnosis",
         "APPROVED DATE"                 => "approved_date",
         "APPROVED BY"                   => "approved_by",
         "DATE RECEIVED"                 => "data_received",
@@ -233,6 +236,11 @@ class ClaimRequest extends Model
         return $this->morphMany(ClaimHistory::class, 'historiable');
     }
 
+    public function organization()
+    {
+        return $this->belongsTo(Organization::class, 'organization_id');
+    }
+
     public function member()
     {
         return $this->belongsTo(Member::class, 'member_id', 'id');

app/Models/Organization.php

@@ -103,4 +103,8 @@ class Organization extends Model
     {
         return $this->hasMany(Claim::class, 'organization_id', 'id');
     }
+    public function claim_request()
+    {
+        return $this->hasMany(ClaimRequest::class, 'organization_id', 'id');
+    }
 }

app/Services/ClaimRequestService.php

@@ -11,7 +11,6 @@ use App\Helpers\Helper;
 use App\Models\Icd;
 use App\Models\Member;
 use Carbon\Carbon;
-
 use App\Exceptions\ImportRowException;
 use Box\Spout\Writer\Common\Creator\WriterEntityFactory;
 
@@ -21,9 +20,20 @@ use Str;
 
 class ClaimRequestService{
 
-    public static function storeClaimRequest($code, $member, $paymentType, $serviceCode, $submissionDate = null, $status = 'requested')
+    public static function storeClaimRequest($row, $code, $member, $paymentType, $serviceCode, $submissionDate = null, $status = 'requested', $organization_code = null)
     {
-        try {
+        // try {
+
+            if($organization_code){
+                $organization = Organization::where('code', $organization_code)->first();
+                if (!$organization){
+                    throw new ImportRowException(__('Code Provider Tidak ditemukan', [
+                        'attribute' => 'provider_code',
+                        'code' => $row['provider_code']
+                    ]), 403, null, $row);
+                }
+            };
+
             DB::beginTransaction();
 
             $claimRequestData = [
@@ -34,6 +44,7 @@ class ClaimRequestService{
                 'payment_type' => $paymentType,
                 'service_code' => $serviceCode,
                 'policy_id' => $member->currentPolicy->id ?? null,
+                'organization_id' => $organization ? $organization->id : 0,
             ];
 
             $claimRequest = ClaimRequest::create($claimRequestData);
@@ -41,11 +52,11 @@ class ClaimRequestService{
             DB::commit();
 
             return $claimRequest;
-        } catch (\Exception $error) {
+        // } catch (\Exception $error) {
-            DB::rollBack();
+        //     DB::rollBack();
 
-            throw new \Exception($error);
+        //     throw new \Exception($error);
-        }
+        // }
     }
 
     public static function storeClaimManagement($row, $member, $claim_request_id){
@@ -66,6 +77,12 @@ class ClaimRequestService{
                 'currency' => 'IDR',
                 'plan_id' => $member->currentPlan->id,
                 'total_claim' => $row['tot_amt_insurred'],
+                'benefit_code' => $row['benefit_code'],
+                'benefit_desc' => $row['benefit_desc'],
+                'amount_incurred' => $row['tot_amt_insurred'],
+                'amount_approved' => $row['tot_amt_approved'],
+                'amount_not_approved' => $row['tot_amt_not_approved'],
+                'excess_paid' => $row['tot_excess_paid'],
                 'claim_request_id' => $claim_request_id,
                 'organization_id' => $organization ? $organization->id : NULL,
                 'status' => 'requested'
@@ -90,17 +107,14 @@ class ClaimRequestService{
         }
     }
 
-    public static function updateClaimRequest(){
+    public static function updateClaimRequest($organization_id, $claim_request_id){
         try {
             $data = [
-                'member_id' => $member->id,
+                'organization_id' => $organization_id
-                'currency' => 'IDR',
-                'plan_id' => $member->currentPlan->id,
-                'total_claim' => $row['tot_amt_insurred'],
-                'claim_request_id' => $claim_request_id,
-                'organization_id' => $organization ? $organization->id : NULL,
-                'status' => 'requested'
             ];
+            DB::commit();
+            $update = ClaimRequest::where('id', $claim_request_id)->update($data);
+            return ClaimRequest::find($claim_request_id);
 
         } catch (\Exception $error) {
             DB::rollBack();
@@ -124,12 +138,22 @@ class ClaimRequestService{
                 throw new ImportRowException(__('Member Tidak ditemukan'), 0, null, $row);
             };
             $code = $row['client_claim_id'];
+            $organization_id = $row['provider_code'];
             $submissionDate = Helper::formatDateDB($row['admission_date']);
             $paymentType = $row['claim_type'];
             $status = $row['status'];
             $serviceCode = $row['coverage_type'];
             
-            $newClaimRequest = $this->storeClaimRequest(code: $code, member: $member, paymentType: $paymentType, serviceCode: $serviceCode, submissionDate: $submissionDate, status: $status);
+            $newClaimRequest = $this->storeClaimRequest(
+                row: $row,
+                code: $code,
+                member: $member, 
+                paymentType: $paymentType, 
+                serviceCode: $serviceCode, 
+                submissionDate: $submissionDate, 
+                status: $status, 
+                organization_code: $organization_id
+            );
             
             $newlyCreatedID = $newClaimRequest->id;
 
@@ -145,6 +169,7 @@ class ClaimRequestService{
 
             $claim_request_data = $row;
 
+            dd($row);
             // dd($claim_request_data['admission_date']);
 
             $this->validatePlanRow($claim_request_data);

database/migrations/2023_10_25_095323_add_column_organizations_to_claim_request.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('claim_requests', function (Blueprint $table) {
+            $table->integer('organization_id')->after('claim_id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('claim_request', function (Blueprint $table) {
+            $table->dropColumn('organization_id');
+        });
+    }
+};

database/migrations/2023_10_25_150556_add_column_to_claims.php

@@ -0,0 +1,42 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('claims', function (Blueprint $table) {
+            $table->string('benefit_code')->after('organization_id');
+            $table->string('benefit_desc')->after('benefit_code');
+            $table->integer('amount_incurred')->after('benefit_desc');
+            $table->integer('amount_approved')->after('amount_incurred');
+            $table->integer('amount_not_approved')->after('amount_approved');
+            $table->integer('excess_paid')->after('amount_not_approved');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('claims', function (Blueprint $table) {
+            $table->dropColumn('benefit_code');
+            $table->dropColumn('benefit_desc');
+            $table->dropColumn('amount_incurred');
+            $table->dropColumn('amount_approved');
+            $table->dropColumn('amount_not_approved');
+            $table->dropColumn('excess_paid');
+        });
+    }
+};

frontend/dashboard/src/@types/claims.ts

@@ -1,3 +1,4 @@
+import { Benefit } from "./corporates";
 import { Member } from "./member";
 
 export type ClaimRequest = {
@@ -17,12 +18,45 @@ export type ClaimRequest = {
     }
   };
 
+export type Claims = {
+    id: number;
+    code: string;
+    plan: Plan;
+    payor_id: string;
+    corporate_id: string;
+    policy_number: string;
+    member: Member;
+    benefit: Benefit | boolean;
+    status: string;
+    claim_request: ClaimRequest;
+};
+
+export type ClaimsEdit = {
+  id: number;
+  plan_id: string;
+  payor_id: string;
+  corporate_id: string;
+  policy_number: string;
+  member_id: string;
+  benefit_code: string;
+  benefit_desc: string;
+  amount_incurred: number;
+  amount_approved: number;
+  amount_not_approved: number;
+  excess_paid: number;
+}
+
 export type Files = {
     name: string;
     url: string;
     path: string;
 }
 
+export type Plan = {
+  code: string;
+}
+
+
 export type Organizations = {
   id: number;
   code: string;
@@ -46,4 +80,11 @@ export type Organizations = {
   merchant_key: string;
   image_url: string;
   region_groups: string;
-};
+};
+
+export type Import = {
+  result_file: {
+    url: string,
+    name: string,
+  }
+}

frontend/dashboard/src/pages/ClaimRequests/Form.tsx

@@ -6,6 +6,8 @@ import { Controller, useForm } from 'react-hook-form';
 import React, { useRef, useEffect, useMemo, useState } from 'react';
 import axios from '../../utils/axios';
 import { FormProvider, RHFTextField } from '../../components/hook-form';
+
+import { makeFormData } from '@/utils/jsonToFormData';
 import {
   Autocomplete,
   Button,
@@ -55,7 +57,7 @@ export default function ClaimForm({ isEdit, currentClaim }: Props) {
   const { enqueueSnackbar } = useSnackbar();
 
   const EditClaimSchema = Yup.object().shape({
-    organization_id: Yup.string().required('Name is required'),
+    organization_id: Yup.string().required('Code Provider is required'),
   });
 
   const defaultValues = useMemo(
@@ -66,19 +68,21 @@ export default function ClaimForm({ isEdit, currentClaim }: Props) {
       date: currentClaim?.submission_date ? fDateTimesecond(currentClaim?.submission_date) : '-',
       claim_method: currentClaim?.payment_type || '-',
       service_type: currentClaim?.service_code || '-',
-      organization_id: currentClaim?.claim?.organization?.code || '-',
+      organization_id: currentClaim?.organization?.code || '-',
     }),
     [currentClaim]
   );
 
   useEffect(() => {
-    console.log(currentClaim, 'er')
     if (isEdit && currentClaim) {
       reset(defaultValues);
     }
     if (!isEdit) {
       reset(defaultValues);
     }
+    // setFileKondisis(currentClaim?.files_by_type?.claim_diagnosis);
+    // setFileDiagnosas(currentClaim?.files_by_type?.claim_diagnosis);
+    setFileHasilPenunjangCurrent(currentClaim?.files_by_type?.claim_result);
   }, [isEdit, currentClaim]);
 
 
@@ -150,6 +154,7 @@ export default function ClaimForm({ isEdit, currentClaim }: Props) {
   // Files Result Hasil Penunjang
   const fileHasilPenunjangInput = useRef<HTMLInputElement>(null);
   const [fileHasilPenunjangs, setFileHasilPenunjangs] = useState([]);
+  const [fileHasilPenunjangsCurrent, setFileHasilPenunjangCurrent] = useState([]);
 
   const handleResultInputChange = (event) => {
     if (event.target.files[0]) {
@@ -169,12 +174,19 @@ export default function ClaimForm({ isEdit, currentClaim }: Props) {
 
   const onSubmit = async (data: FormValuesProps) => {
     try {
-      const formData = new FormData();
+      // const formData = new FormData();
-      formData.append('result_files', fileHasilPenunjangs);
+      // formData.append('result_files', fileHasilPenunjangs);
-      formData.append('diagnosa_files', fileDiagnosaInput);
+      // formData.append('diagnosa_files', fileDiagnosaInput);
-      formData.append('kondisi_files', fileKondisiInput);
+      // formData.append('kondisi_files', fileKondisiInput);
-      formData.append('provider_code', data.organization_id);
+      // formData.append('provider_code', data.organization_id);
-      formData.append('_method', 'PUT');
+      // formData.append('_method', 'PUT');
+      const formData = makeFormData({
+        result_files: fileHasilPenunjangs,
+        diagnosa_files: fileDiagnosas,
+        kondisi_files: fileKondisis,
+        provider_code: data.organization_id,
+        _method: 'PUT'
+      });
 
       const response = await axios.post(`/claim-requests/${data.id}`, formData);
       

frontend/dashboard/src/pages/ClaimRequests/List.tsx

@@ -47,12 +47,13 @@ import { fDateTimesecond } from '@/utils/formatTime';
 import { capitalizeFirstLetter } from '@/utils/formatString';
 import Label from '@/components/Label';
 import TableMoreMenu from '@/components/table/TableMoreMenu';
+import { Import } from '@/@types/claims';
 // import LoadingButton from '@/theme/overrides/LoadingButton';
 
 export default function List() {
   const { themeColorPresets } = useSettings();
   const [searchParams, setSearchParams] = useSearchParams();
-  const [importResult, setImportResult] = useState(null);
+  const [importResult, setImportResult] = useState<Import>(null);
 
   const navigate = useNavigate()
 
@@ -213,7 +214,7 @@ export default function List() {
                 }}
               >
                 <MenuItem onClick={handleImportButton}>Import</MenuItem>
-                <MenuItem onClick={() => {handleGetTemplate('claim-request')}}>Download Template test</MenuItem>
+                <MenuItem onClick={() => {handleGetTemplate('claim-request')}}>Download Template</MenuItem>
                 <MenuItem onClick={() => {handleGetData('data-plan-benefit')}}>Download Claim Request</MenuItem>
               </Menu>
             <Button
@@ -257,6 +258,16 @@ export default function List() {
             </LoadingButton>
           </Stack>
         )}
+         {importResult && (
+          <Stack direction={'row'} sx={{ px: 2, pb: 2 }}>
+            <Box sx={{ color: 'text.secondary' }}>
+              Last Import Result Report :{' '}
+              <a href={importResult.result_file?.url ?? '#'}>
+                {importResult.result_file?.name ?? '-'}
+              </a>
+            </Box>
+          </Stack>
+        )}
       </div>
     );
   }

frontend/dashboard/src/pages/Claims/CreateUpdate.tsx

@@ -28,31 +28,26 @@ export default function ClaimsCreateUpdate() {
 
   useEffect(() => {
     if (isEdit) {
-      axios.get('/claims/' + id).then((res) => {
+      axios.get(`/claims/${id}/edit`).then((res) => {
-        // console.log('Yeet', res.data);
+        console.log('Yeet', res.data.data);
-        setCurrentClaim(res.data);
+        setCurrentClaim(res.data.data);
-      });
+      });;
+
     }
   }, [id]);
 
   
   return (
-    <Page title={isEdit ? `Edit Claim : ${currentClaim?.id}` : "Create New Claim"}>
+    <Page title={'Edit Claim Management'}>
       <Container maxWidth={themeStretch ? false : 'xl'}>
         <Stack direction="row" alignItems="center">
           <HeaderBreadcrumbs
-            heading={
+            heading={`Edit Claim Management`}
-              !isEdit
-                ? 'Create New Claim'
-                : `Edit Claim : ${currentClaim?.code}`
-            }
             links={[
               { name: 'Dashboard', href: '/dashboard' },
               {
-                name: 'Claim',
+                name: 'Claim Management',
-                href: '/claims',
               },
-              { name: !isEdit ? 'Create' : currentClaim?.id ?? '' },
             ]}
           />
         </Stack>

frontend/dashboard/src/pages/Claims/Form.tsx

@@ -24,16 +24,18 @@ import {
   ListItemAvatar,
   Avatar,
   ListItemText,
+  Card,
 } from '@mui/material';
 import Iconify from '../../components/Iconify';
 import { LoadingButton } from '@mui/lab';
 import { fCurrency } from '../../utils/formatNumber';
 import MemberSelectDialog from '../../components/dialogs/MemberSelectDialog';
 import { Add, DeleteOutline } from '@mui/icons-material';
+import { ClaimsEdit } from '@/@types/claims';
 
 type Props = {
   isEdit: boolean;
-  currentClaim?: any;
+  currentClaim?: ClaimsEdit;
 };
 
 export default function ClaimForm({ isEdit, currentClaim }: Props) {
@@ -42,18 +44,27 @@ export default function ClaimForm({ isEdit, currentClaim }: Props) {
   const { enqueueSnackbar } = useSnackbar();
 
   const NewCorporateSchema = Yup.object().shape({
-    name: Yup.string().required('Name is required'),
+    benefit_desc: Yup.string().required('Benefit Desc is required'),
-    code: Yup.string().required('Corporate Code is required'),
+    amount_incurred: Yup.string().required('Amount Incurred is required'),
-    active: Yup.boolean().required('Corporate Status is required'),
+    amount_approved: Yup.number().required('Amount Approved is required'),
+    amount_not_approved: Yup.number().required('Amount Not Approved is required'),
+    excess_paid: Yup.number().required('Excess Paid is required'),
     // file: Yup.boolean().required('Corporate Status is required'),
   });
 
   const defaultValues = useMemo(
     () => ({
-      member: currentClaim?.member || {},
+      plan_id: currentClaim?.plan_id || null,
+      payor_id: currentClaim?.payor_id || null,
+      corporate_id: currentClaim?.corporate_id || null,
+      policy_number: currentClaim?.policy_number || null,
       member_id: currentClaim?.member_id || null,
-      diagnosis_id: currentClaim?.diagnosis_id || null,
+      benefit_code: currentClaim?.benefit_code || '-',
-      total_claim: currentClaim?.total_claim || 0,
+      benefit_desc: currentClaim?.benefit_desc || '-',
+      amount_incurred: currentClaim?.amount_incurred || 0,
+      amount_approved: currentClaim?.amount_approved || 0,
+      amount_not_approved: currentClaim?.amount_not_approved || 0,
+      excess_paid: currentClaim?.excess_paid || 0,
     }),
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [currentClaim]
@@ -88,11 +99,11 @@ export default function ClaimForm({ isEdit, currentClaim }: Props) {
     console.log('defaultValues', defaultValues);
     if (isEdit && currentClaim) {
       reset(defaultValues);
-      setMember(defaultValues.member)
+      // setMember(defaultValues.member)
     }
     if (!isEdit) {
       reset(defaultValues);
-      setMember(defaultValues.member)
+      // setMember(defaultValues.member)
     }
   }, [isEdit, currentClaim]);
 
@@ -105,13 +116,13 @@ export default function ClaimForm({ isEdit, currentClaim }: Props) {
     console.log('currentFiles', getValues('uploaded_files'));
   };
 
-  const memberSelected = (member) => {
+  // const memberSelected = (member) => {
-    setMember(member)
+  //   setMember(member)
-  };
+  // };
 
-  const checkLimit = async () => {
+  // const checkLimit = async () => {
-    console.log('CHECKING LIMIT');
+  //   console.log('CHECKING LIMIT');
-  };
+  // };
 
   const onSubmit = async (data: any) => {
     try {
@@ -122,7 +133,7 @@ export default function ClaimForm({ isEdit, currentClaim }: Props) {
       }
       reset();
       enqueueSnackbar(
-        !isEdit ? 'Organizations Created Successfully!' : 'Organizations Udpated Successfully!',
+        !isEdit ? 'Organizations Created Successfully!' : 'Claim Udpated Successfully!',
         { variant: 'success' }
       );
       navigate('/claims');
@@ -154,443 +165,86 @@ export default function ClaimForm({ isEdit, currentClaim }: Props) {
   const headStyle = {};
   return (
     <FormProvider methods={methods} onSubmit={handleSubmit(onSubmit)}>
-      <Stack spacing={3}>
+        <Card sx={{paddingX:2, paddingY:3}}>
-        <Typography variant="h6">Member</Typography>
+          <Grid container spacing={2}>
-
+            {/* Baris ke 1 */}
-        <Stack spacing={2} direction="row">
+            <Grid item xs={3}>
-          <Grid item xs={12}>
+              <Typography marginBottom={2} variant="subtitle1">Plan ID*</Typography>
-            <RHFTextField
+              <RHFTextField name="plan_id" disabled />
-              name="member_id"
+            </Grid>
-              label="Member"
+            <Grid item xs={3}>
-              variant="outlined"
+              <Typography marginBottom={2} variant="subtitle1">Payor ID*</Typography>
-              fullWidth
+              <RHFTextField name="payor_id" disabled />
-              value={member?.name || ''}
+            </Grid>
-              InputProps={{
+            <Grid item xs={3}>
-                readOnly: true,
+              <Typography marginBottom={2} variant="subtitle1">Corporate ID*</Typography>
-              }}
+              <RHFTextField name="corporate_id"disabled />
-              onClick={() => {
+            </Grid>
-                if (!isEdit) setIsMemberDialogOpen(true);
+            <Grid item xs={3}>
-                if (isEdit) enqueueSnackbar('Cannot Change Member', { variant: 'error' });
+              <Typography marginBottom={2} variant="subtitle1">Policy Number*</Typography>
-              }}
+              <RHFTextField name="policy_number" disabled />
-            />
-          </Grid>
-          {/* <Grid item xs={2}>
-                    <Button variant="outlined" fullWidth sx={{ p: 1.8 }} onClick={() => {
-                      setIsMemberDialogOpen(true)
-                    }}>
-                      {member ? 'Change' : 'Search'}
-                    </Button>
-                  </Grid> */}
-        </Stack>
-
-        {member?.id && (
-          <Stack>
-            <Grid container spacing={2}>
-              <Grid item xs={12} md={6}>
-                <Table border="light-700">
-                  <TableBody>
-                    <TableRow>
-                      <TableCell style={headStyle} align="left">
-                        Name
-                      </TableCell>
-                      <TableCell align="left">{member?.full_name}</TableCell>
-                    </TableRow>
-                    <TableRow>
-                      <TableCell style={headStyle} align="left">
-                        DOB
-                      </TableCell>
-                      <TableCell align="left">
-                        {member?.birth_date} ({member?.age + ' years'})
-                      </TableCell>
-                    </TableRow>
-                    <TableRow>
-                      <TableCell style={headStyle} align="left">
-                        Marital Status
-                      </TableCell>
-                      <TableCell align="left">{member?.marital_status}</TableCell>
-                    </TableRow>
-                    <TableRow>
-                      <TableCell style={headStyle} align="left">
-                        Record Type
-                      </TableCell>
-                      <TableCell align="left">{member?.record_type}</TableCell>
-                    </TableRow>
-                    <TableRow>
-                      <TableCell style={headStyle} align="left">
-                        Principal ID
-                      </TableCell>
-                      <TableCell align="left">
-                        {member?.principal_id} (
-                        {member?.relation_with_principal})
-                      </TableCell>
-                    </TableRow>
-                  </TableBody>
-                </Table>
-              </Grid>
-              <Grid item xs={12} md={6}>
-                <Table border="light-700">
-                  <TableBody>
-                    <TableRow>
-                      <TableCell style={headStyle} align="left">
-                        Plan
-                      </TableCell>
-                      <TableCell align="left">{member?.current_plan?.code}</TableCell>
-                    </TableRow>
-                    <TableRow>
-                      <TableCell style={headStyle} align="left">
-                        Active
-                      </TableCell>
-                      <TableCell align="left">
-                        {member?.current_plan?.start} -{' '}
-                        {member?.current_plan?.end} (Active)
-                      </TableCell>
-                    </TableRow>
-                    <TableRow>
-                      <TableCell style={headStyle} align="left">
-                        Corporate Limit
-                      </TableCell>
-                      <TableCell align="left">
-                        {fCurrency(0)} / {fCurrency(member?.current_plan?.limit_rules)}
-                      </TableCell>
-                    </TableRow>
-                    <TableRow>
-                      <TableCell style={headStyle} align="left">
-                        Plan Usage
-                      </TableCell>
-                      <TableCell align="left">
-                        {fCurrency(0)} / {fCurrency(member?.current_plan?.limit_rules)}
-                      </TableCell>
-                    </TableRow>
-                  </TableBody>
-                </Table>
-              </Grid>
             </Grid>
-          </Stack>
-        )}
 
-        <Controller
+            {/* Baris ke 2 */}
-          name="benefit"
+            <Grid item xs={3}>
-          control={control}
+              <Typography marginBottom={2} variant="subtitle1">Memeber ID*</Typography>
-          render={({ field: { onChange, value } }) => (
+              <RHFTextField name="member_id" disabled />
-            <Autocomplete
+            </Grid>
-              options={memberBenefits}
+            <Grid item xs={3}>
-              getOptionLabel={(option) =>
+              <Typography marginBottom={2} variant="subtitle1">Benefit Code*</Typography>
-                option ? `#${option.id} (${option.code}) ${option.description}` : ''
+              <RHFTextField name="benefit_code" disabled />
-              }
+            </Grid>
-              value={value || ''}
+            <Grid item xs={6}>
-              onChange={(event: any, newValue: any) => {
+              <Typography marginBottom={2} variant="subtitle1">Benefit Desc*</Typography>
-                setValue('benefit_id', newValue?.id);
+              <RHFTextField name="benefit_desc" label="Benefit Desc" />
-                onChange(newValue);
+            </Grid>
-              }}
-              renderInput={(params) => (
-                <TextField
-                  name="benefit"
-                  {...params}
-                  label="Benefit"
-                  variant="outlined"
-                  fullWidth
-                  // onKeyPress={(event) => {
-                  //   if (event.key === 'Enter')
-                  //     searchDiagnosis(event.target.value)
-                  // }}
-                />
-              )}
-            />
-          )}
-        />
 
-        <Controller
+            {/* Baris ke 3 */}
-          name="diagnosis"
+            <Grid item xs={3}>
-          control={control}
+              <Typography marginBottom={2} variant="subtitle1">Amount Incurred*</Typography>
-          render={({ field: { onChange, value } }) => (
+              <RHFTextField name="amount_incurred" label="Amount Incurred" type="number" />
-            <Autocomplete
+            </Grid>
-              options={diagnosisOption}
+            <Grid item xs={3}>
-              getOptionLabel={(option) => (option ? `(${option.code}) ${option.name}` : '')}
+              <Typography marginBottom={2} variant="subtitle1">Amount Approved*</Typography>
-              value={value || ''}
+              <RHFTextField name="amount_approved" label="Amount Approved" type="number" />
-              onChange={(event: any, newValue: any) => {
+            </Grid>
-                setValue('diagnosis_id', newValue?.id);
+            <Grid item xs={3}>
-                // setValue('diagnosis', newValue)
+              <Typography marginBottom={2} variant="subtitle1">Amount Not Approved*</Typography>
-                onChange(newValue);
+              <RHFTextField name="amount_not_approved" label="Amount Not Approved" type="number" />
-              }}
+            </Grid>
-              renderInput={(params) => (
+            <Grid item xs={3}>
-                <TextField
+              <Typography marginBottom={2} variant="subtitle1">Excess Paid*</Typography>
-                  name="diagnosis"
+              <RHFTextField name="excess_paid" label="Excess Paid*" type="number" />
-                  {...params}
+            </Grid>
-                  label="Diagnosis"
+          </Grid>
-                  variant="outlined"
+        </Card>
-                  fullWidth
+        <Grid container marginTop={2}>
-                  onKeyPress={(event) => {
+          <Grid item xs={12} md={12} >
-                    if (event.key === 'Enter') searchDiagnosis(event.target.value);
+          <Stack direction="row" alignItems="center" justifyContent="flex-end">
-                  }}
+              <Button
-                />
+                sx={{
-              )}
+                  margin: 1
-            />
-          )}
-        />
-
-        {isCheckingLimit && (
-          <Stack
-            sx={{
-              backgroundColor: 'gray',
-              paddingY: 1,
-              paddingX: 1.5,
-              mb: 2,
-              borderRadius: '3-xl',
-            }}
-          >
-            {/* Checking */}
-            <Typography sx={{ typography: 'caption', display: 'flex', alignItems: 'center' }}>
-              <Iconify
-                icon="bxs:info-circle"
-                width={12}
-                height={13}
-                sx={{ color: '#424242', marginRight: '6px' }}
-              />
-              <Typography variant="caption" component="span">
-                Please Wait, Checking Eligibilty
-              </Typography>
-            </Typography>
-          </Stack>
-        )}
-        {false && isCheckingLimit == false && isEligible == null && (
-          <Stack
-            sx={{
-              backgroundColor: 'gray',
-              paddingY: 1,
-              paddingX: 1.5,
-              mb: 2,
-              borderRadius: '3-xl',
-            }}
-          >
-            {/* No Data Selected */}
-            <Typography sx={{ typography: 'caption', display: 'flex', alignItems: 'center' }}>
-              <Iconify
-                icon="bxs:info-circle"
-                width={12}
-                height={13}
-                sx={{ color: '#424242', marginRight: '6px' }}
-              />
-              <Typography variant="caption" component="span">
-                Please Select Diagnosis !
-              </Typography>
-            </Typography>
-          </Stack>
-        )}
-        {!isCheckingLimit && isEligible !== null && isEligible && (
-          <Stack
-            sx={{
-              backgroundColor: '#B2E8E8',
-              paddingY: 1,
-              paddingX: 1.5,
-              mb: 2,
-              borderRadius: '3-xl',
-            }}
-          >
-            {/* Eligible */}
-            <Typography sx={{ typography: 'caption', display: 'flex', alignItems: 'center' }}>
-              <Iconify
-                icon="bxs:lock-alt"
-                width={12}
-                height={13}
-                sx={{ color: '#424242', marginRight: '6px' }}
-              />
-              <Typography variant="caption" component="span">
-                Diagnosis is Eligible
-              </Typography>
-            </Typography>
-            <Typography sx={{ typography: 'caption', color: '#637381' }}>
-              125.000.000 / 125.000.000
-            </Typography>
-          </Stack>
-        )}
-        {!isCheckingLimit && isEligible !== null && !isEligible && (
-          <Stack
-            sx={{
-              backgroundColor: '#B2E8E8',
-              paddingY: 1,
-              paddingX: 1.5,
-              mb: 2,
-              borderRadius: '3-xl',
-            }}
-          >
-            {/* Not Eligible */}
-            {/* <Typography sx={{ typography: 'caption', display: 'flex', alignItems: 'center' }}>
-              <Iconify
-                icon="bxs:lock-alt"
-                width={12}
-                height={13}
-                sx={{ color: '#424242', marginRight: '6px' }}
-              />
-              <Typography variant="caption" component="span">
-                Not Eligible
-              </Typography>
-            </Typography>
-            <Typography sx={{ typography: 'caption', color: '#637381' }}>
-              125.000.000 / 125.000.000
-            </Typography> */}
-          </Stack>
-        )}
-
-        <RHFTextField type="number" name="total_claim" label="Total Claim" />
-
-        {isEdit && (
-          <React.Fragment>
-            <Typography variant="h6">Documents</Typography>
-
-            <List>
-              {(getValues('uploaded_files.invoice') && getValues('uploaded_files.invoice').length
-                ? getValues('uploaded_files.invoice')
-                : []
-              ).map((file, index) => (
-                <ListItem
-                  secondaryAction={
-                    <IconButton edge="end" aria-label="delete">
-                      <DeleteOutline />
-                    </IconButton>
-                  }
-                >
-                  <ListItemAvatar>
-                    <Avatar>
-                      {/* <FileIcon /> */}
-                      I
-                    </Avatar>
-                  </ListItemAvatar>
-                  <ListItemText primary={file.name} secondary={file.type} />
-                </ListItem>
-              ))}
-            </List>
-            <Button
-              variant="outlined"
-              startIcon={<Add />}
-              component="label"
-              sx={{ paddingY: 2, width: '100%', ':hover': { border: 'none' } }}
-            >
-              Invoice
-              <input
-                name="invoice"
-                hidden
-                accept="image/*,application/pdf"
-                multiple
-                type="file"
-                onChange={(event) => {
-                  fileSelected(event, 'invoice');
                 }}
-              />
+                type="submit"
-            </Button>
+                variant="contained"
-            <List>
+                size="large"
-              {(getValues('uploaded_files.prescription') && getValues('uploaded_files.prescription').length
+                color='inherit'
-                ? getValues('uploaded_files.prescription')
+                onClick={() => navigate(`/claims`)}
-                : []
+              >
-              ).map((file, index) => (
+                Cancel
-                <ListItem
+              </Button>
-                  secondaryAction={
+              <LoadingButton
-                    <IconButton edge="end" aria-label="delete">
+                type="submit"
-                      <DeleteOutline />
+                variant="contained"
-                    </IconButton>
+                size="large"
-                  }
+                // fullWidth={true}
-                >
+                loading={isSubmitting}
-                  <ListItemAvatar>
+              >
-                    <Avatar>
+                Save
-                      {/* <FileIcon /> */}
+              </LoadingButton>
-                      P
+          </Stack>
-                    </Avatar>
+          </Grid>
-                  </ListItemAvatar>
+        </Grid>
-                  <ListItemText primary={file.name} secondary={file.type} />
+      </FormProvider>
-                </ListItem>
-              ))}
-            </List>
-            <Button
-              variant="outlined"
-              startIcon={<Add />}
-              component="label"
-              sx={{ paddingY: 2, width: '100%', ':hover': { border: 'none' } }}
-            >
-              Prescription
-              <input
-                name="prescription"
-                hidden
-                accept="image/*,application/pdf"
-                multiple
-                type="file"
-                onChange={(event) => {
-                  fileSelected(event, 'prescription');
-                }}
-              />
-            </Button>
-
-            <List>
-              {(getValues('uploaded_files.diagnosis') && getValues('uploaded_files.diagnosis').length
-                ? getValues('uploaded_files.diagnosis')
-                : []
-              ).map((file, index) => (
-                <ListItem
-                  secondaryAction={
-                    <IconButton edge="end" aria-label="delete">
-                      <DeleteOutline />
-                    </IconButton>
-                  }
-                >
-                  <ListItemAvatar>
-                    <Avatar>
-                      {/* <FileIcon /> */}
-                      DR
-                    </Avatar>
-                  </ListItemAvatar>
-                  <ListItemText primary={file.name} secondary={file.type} />
-                </ListItem>
-              ))}
-            </List>
-            <Button
-              variant="outlined"
-              startIcon={<Add />}
-              component="label"
-              sx={{ paddingY: 2, width: '100%', ':hover': { border: 'none' } }}
-            >
-              Doctor Result
-              <input
-                name="invoice"
-                hidden
-                accept="image/*,application/pdf"
-                multiple
-                type="file"
-                onChange={(event) => {
-                  fileSelected(event, 'diagnosis');
-                }}
-              />
-            </Button>
-          </React.Fragment>
-        )}
-
-        {isEligible === true ? (
-          <LoadingButton
-            onClick={handleSubmit(onSubmit)}
-            variant="contained"
-            color="success"
-            style={{ color: '#ffffff' }}
-            size="large"
-            fullWidth={true}
-            loading={isCheckingLimit}
-          >
-            Create Claim
-          </LoadingButton>
-        ) : (
-          <LoadingButton
-            onClick={checkLimit}
-            variant="outlined"
-            size="large"
-            fullWidth={true}
-            loading={isCheckingLimit}
-          >
-            Check Limit
-          </LoadingButton>
-        )}
-      </Stack>
-
-      <MemberSelectDialog
-        openDialog={isMemberDialogOpen}
-        setOpenDialog={setIsMemberDialogOpen}
-        onSelect={memberSelected}
-      ></MemberSelectDialog>
-    </FormProvider>
   );
 }

frontend/dashboard/src/pages/Claims/List.tsx

@@ -16,13 +16,10 @@ import {
   Menu,
   ButtonGroup,
   Tooltip,
+  TableHead,
 } from '@mui/material';
-import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown';
+import FindInPageOutlinedIcon from '@mui/icons-material/FindInPageOutlined';
-import KeyboardArrowRightIcon from '@mui/icons-material/KeyboardArrowRight';
-import AddIcon from '@mui/icons-material/Add';
 import AssessmentIcon from '@mui/icons-material/Assessment';
-import UploadIcon from '@mui/icons-material/Upload';
-import CancelIcon from '@mui/icons-material/Cancel';
 // hooks
 import React, { ChangeEvent, useEffect, useRef, useState } from 'react';
 import { Link, Navigate, useNavigate, useSearchParams } from 'react-router-dom';
@@ -36,6 +33,12 @@ import { Chip } from '@mui/material';
 import Iconify from '@/components/Iconify';
 import { enqueueSnackbar } from 'notistack';
 import { fDate } from '../../utils/formatTime';
+import { Claims } from '@/@types/claims';
+import Label from '@/components/Label';
+import { capitalizeFirstLetter } from '@/utils/formatString';
+import TableMoreMenu from '@/components/table/TableMoreMenu';
+import Edit from '@mui/icons-material/Edit';
+import { Download } from '@mui/icons-material';
 
 export default function List() {
   const [searchParams, setSearchParams] = useSearchParams();
@@ -84,10 +87,16 @@ export default function List() {
             fullWidth
             onChange={handleSearchChange}
             value={searchText}
+            placeholder='Search Code or Member ID...'
           />
-        <Tooltip title="Benefit Usage Report">
+           <Button
-            <Button variant="outlined" startIcon={<AssessmentIcon />}  sx={{ p: 1.8 }}  onClick={handleGetData}/>
+              variant="contained"
-        </Tooltip>
+              startIcon={<Download />}
+              sx={{ p: 1.8 }}
+              onClick={handleGetData}
+            >
+              Export
+            </Button>
         </Stack>
       </form>
     );
@@ -153,7 +162,7 @@ export default function List() {
   };
 
   // Called on every row to map the data to the columns
-  function createData(data: any): any {
+  function createData(data: Claims): Claims  {
     return {
       ...data,
     };
@@ -176,36 +185,37 @@ export default function List() {
           </TableCell> */}
           <TableCell align="left">{row.claim_request?.code}</TableCell>
           {/* <TableCell align="left">{row.code}</TableCell> */}
-          <TableCell align="left">{fDate(row.created_at)}</TableCell>
+          <TableCell align="left">{row.member?.current_plan?.code}</TableCell>
-          <TableCell align="left">{row.member?.full_name}</TableCell>
+          <TableCell align="left">{row.member?.current_corporate?.payor_id}</TableCell>
-          <TableCell align="left">{row.plan?.code}</TableCell>
+          <TableCell align="left">{row.member?.current_corporate?.code}</TableCell>
-          <TableCell align="left">{row.claim_request?.service?.name}</TableCell>
+          <TableCell align="left">{row.member?.current_corporate?.current_policy?.code}</TableCell>
-          <TableCell align="left">
+          <TableCell align="left">{row.member?.member_id}</TableCell>
-            ({row.diagnoses[0]?.icd?.code}) {row.diagnoses[0]?.icd?.name}
+          <TableCell align="left">{row.benefit ? row.benefit?.description : '-'}</TableCell>
-          </TableCell>
+         
-          <TableCell align="left">{fCurrency(row.total_claim)}</TableCell>
           <TableCell align="center">
-            {row.status == 'draft' && (<Chip label='Draft' color="default" variant="outlined" />)}
+            {row.status == 'draft' && (<Label color='secondary' variant='ghost'>{capitalizeFirstLetter(row.status)}</Label>)}
-            {row.status == 'requested' && (<Chip label='Requested' color="primary" />)}
+            {row.status == 'requested' && (<Label color='primary' variant='ghost'>{capitalizeFirstLetter(row.status)}</Label>)}
-            {row.status == 'received' && (<Chip label='Received' color="success" variant='outlined' />)}
+            {row.status == 'received' && (<Label color='secondary' variant='ghost'>{capitalizeFirstLetter(row.status)}</Label>)}
-            {row.status == 'approved' && (<Chip label='Approved' color="success" />)}
+            {row.status == 'approved' && (<Label color='success' variant='ghost'>{capitalizeFirstLetter(row.status)}</Label>)}
-            {row.status == 'postpone' && (<Chip label='Postpone' color="primary" variant="outlined" />)}
+            {row.status == 'postpone' && (<Label color='secondary' variant='ghost'>{capitalizeFirstLetter(row.status)}</Label>)}
-            {row.status == 'paid' && (<Chip label='Paid' color="warning" />)}
+            {row.status == 'paid' && (<Label color='secondary' variant='ghost'>{capitalizeFirstLetter(row.status)}</Label>)}
-            {row.status == 'declined' && (<Chip label='Declined' color="error" />)}
+            {row.status == 'declined' && (<Label color='error' variant='ghost'>{capitalizeFirstLetter(row.status)}</Label>)}
           </TableCell>
 
-          <TableCell align="right">
+          <TableMoreMenu actions={
-            {['approved', 'paid'].includes(row.status) && (
+              <>
-            <Iconify icon="eva:eye-fill" onClick={(e) => {
+              <MenuItem onClick={() =>navigate(`/claims/edit/${row.id}`) }>
-                navigate('/claims/' + row.id);
+                <Edit />
-              }}></Iconify>
+                Edit
-            )}
+              </MenuItem>
-            {!['approved', 'paid'].includes(row.status) && (
+              <MenuItem onClick={() => setOpen(!open) }>
-            <Iconify icon="eva:edit-outline" onClick={(e) => {
+                  <FindInPageOutlinedIcon />
-                navigate('/claims/' + row.id);
+                  Detail
-              }}></Iconify>
+              </MenuItem>
-            )}
+              </>
-          </TableCell>
+            } />
+
+          
         </TableRow>
         {/* COLLAPSIBLE ROW */}
         <TableRow>
@@ -230,41 +240,38 @@ export default function List() {
     return (
       <Table aria-label="collapsible table">
         {/* ------------------ TABLE HEADER ------------------ */}
-        <TableBody>
+        <TableHead>
           <TableRow>
             {/* <TableCell style={headStyle} align="left" /> */}
             <TableCell style={headStyle} align="left">
-              Code Request
+              Code
             </TableCell>
             <TableCell style={headStyle} align="left">
-              Date
+              Plan ID
-            </TableCell>
-            {/* <TableCell style={headStyle} align="left">
-              Code Claim
-            </TableCell> */}
-            <TableCell style={headStyle} align="left">
-              Member Name
             </TableCell>
             <TableCell style={headStyle} align="left">
-              Plan
+              Payor ID
             </TableCell>
             <TableCell style={headStyle} align="left">
-              Benefit
+              Corporate ID
             </TableCell>
             <TableCell style={headStyle} align="left">
-              Diagnosis
+              Policy Number
             </TableCell>
             <TableCell style={headStyle} align="left">
-              Total Claim
+              Member ID
+            </TableCell>
+            <TableCell style={headStyle} align="left">
+              Benefit Desc
             </TableCell>
             <TableCell style={headStyle} align="left">
               Status
             </TableCell>
-            <TableCell style={headStyle} align="right">
+            <TableCell style={headStyle} align="left">
-              Action
+              
             </TableCell>
           </TableRow>
-        </TableBody>
+        </TableHead>
         {/* ------------------ END TABLE HEADER ------------------ */}
 
         {/* ------------------ TABLE ROW ------------------ */}

frontend/dashboard/src/pages/Corporates/CorporateTabNavigations.tsx

@@ -70,6 +70,7 @@ export default function CorporateTabNavigations({ position }: Props) {
     // },
   ];
   useEffect(() => {
+    console.log(position);
     let currentIndex = mainTabItems.findIndex((item) => item.path === position);
     setCurrentTab(currentIndex);
   }, []);

frontend/dashboard/src/pages/Corporates/Formularium/Index.tsx

@@ -44,7 +44,7 @@ export default function CorporateFormularium() {
       />
 
       <Card>
-        <CorporateTabNavigations position={'formularium'} />
+        <CorporateTabNavigations position={'formulariums'} />
         <List />
       </Card>
     </Page>

frontend/dashboard/src/pages/Corporates/Formularium/New/CategoryDetail.tsx

@@ -82,7 +82,6 @@ export default function CategoryDetail({props, formularium} : ParamsDetail) {
     } else {
       active = "1"
     }
-    console.log(corporate_id, id , active)
     axios
       .put(`/corporates/${corporate_id}/formulariums-update-status/${id}`, {
         active: active,

frontend/dashboard/src/pages/Corporates/Formularium/New/Form.tsx

@@ -60,7 +60,7 @@ export default function CorporateFormulariumCreateForm() {
   const [dataDropdownData, setDataDropdownData] = React.useState<DetailCorpFormularium[] | null>(null)
   const loadDataDropdown = async () => {
     setDataDropdownLoading(true);
-    const resp = await axios.get(`corporates/${corporate_id}/formulariums/create`);
+    const resp = await axios.get(`corporates/${corporate_id}/formulariums-create`);
     console.log(resp.data);
     setDataDropdownLoading(false);