From 5bf5a056988b47caa96e0278c3731f079df5a906 Mon Sep 17 00:00:00 2001 From: R Date: Wed, 1 Apr 2026 02:06:09 +0700 Subject: [PATCH 01/23] Hotfix --- .../2024_01_03_143801_add_column_to_notifications.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2024_01_03_143801_add_column_to_notifications.php b/database/migrations/2024_01_03_143801_add_column_to_notifications.php index c98d6a3d..602759e2 100644 --- a/database/migrations/2024_01_03_143801_add_column_to_notifications.php +++ b/database/migrations/2024_01_03_143801_add_column_to_notifications.php @@ -14,7 +14,7 @@ return new class extends Migration public function up() { Schema::table('notifications', function (Blueprint $table) { - $table->text('data')->after('notifiable_id')->nullable(); + $table->text('data')->nullable(); }); } From 31b0a7811bf629cb30d6196c443e9a0cddf68104 Mon Sep 17 00:00:00 2001 From: R Date: Wed, 1 Apr 2026 02:07:07 +0700 Subject: [PATCH 02/23] Hotfix --- .../migrations/2024_08_21_114955_add_unit_to_drugs_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2024_08_21_114955_add_unit_to_drugs_table.php b/database/migrations/2024_08_21_114955_add_unit_to_drugs_table.php index 344e5cdf..f15f37e8 100644 --- a/database/migrations/2024_08_21_114955_add_unit_to_drugs_table.php +++ b/database/migrations/2024_08_21_114955_add_unit_to_drugs_table.php @@ -14,7 +14,7 @@ return new class extends Migration public function up() { Schema::table('drugs', function (Blueprint $table) { - $table->string('unit')->nullable()->after('generic_name'); + // $table->string('unit')->nullable()->after('generic_name'); }); } From e62d0b2181822770d834156a10f7a82382591e30 Mon Sep 17 00:00:00 2001 From: R Date: Thu, 2 Apr 2026 16:51:07 +0700 Subject: [PATCH 03/23] Fix Makassar --- resources/views/pdf/req_log_page_1_primayan.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/pdf/req_log_page_1_primayan.blade.php b/resources/views/pdf/req_log_page_1_primayan.blade.php index a50cb7f3..e7bb838f 100644 --- a/resources/views/pdf/req_log_page_1_primayan.blade.php +++ b/resources/views/pdf/req_log_page_1_primayan.blade.php @@ -390,7 +390,7 @@ Keterangan: {{ !empty($dataRequestLog->keterangan) ? $dataRequestLog->keterangan : ''}}
- Mohon konfirmasi ke LinkSehat (Alarm Center Makassar) jika ada rujukan pasien ke spesialis lain.
+ Mohon konfirmasi ke Primayan Medicare jika ada rujukan pasien ke spesialis lain.
Surat Jaminan ini dinyatakan berlaku apabila disertai surat jaminan akhir dengan nominal yang tertera pada akhir perawatan.
From f98c3c836ca47acbe607416bf3ead14ea7824797 Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Tue, 7 Apr 2026 20:45:28 +0700 Subject: [PATCH 04/23] add approved_at request log awal --- Modules/Primaya/Http/Controllers/Api/RequestLogController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Modules/Primaya/Http/Controllers/Api/RequestLogController.php b/Modules/Primaya/Http/Controllers/Api/RequestLogController.php index 1f4d5069..cd2850b0 100644 --- a/Modules/Primaya/Http/Controllers/Api/RequestLogController.php +++ b/Modules/Primaya/Http/Controllers/Api/RequestLogController.php @@ -367,7 +367,8 @@ class RequestLogController extends Controller 'organization_id' => $request->organization_id ?? 0, 'source' => $request->source, 'specialities_id' => $request->specialities_id, - 'dppj' => $request->dppj + 'dppj' => $request->dppj, + 'approved_at' => $request->approved_at ?? now(), ]; // SIMPAN LOG From daddb3ba74b3f9ced30d09fe6ca0d78f486dcf2e Mon Sep 17 00:00:00 2001 From: Server D3 Linksehat Date: Tue, 7 Apr 2026 21:21:22 +0700 Subject: [PATCH 05/23] Ketinggalan konflik --- .../pages/CustomerService/FinalLog/Detail.tsx | 94 ------------------- 1 file changed, 94 deletions(-) diff --git a/frontend/dashboard/src/pages/CustomerService/FinalLog/Detail.tsx b/frontend/dashboard/src/pages/CustomerService/FinalLog/Detail.tsx index 821e9c3d..7f5f5582 100644 --- a/frontend/dashboard/src/pages/CustomerService/FinalLog/Detail.tsx +++ b/frontend/dashboard/src/pages/CustomerService/FinalLog/Detail.tsx @@ -85,7 +85,6 @@ import { format } from 'date-fns'; // ---------------------------------------------------------------------- export default function Detail() { - //dari hospital portal const [dischargeDate, setDischargeDate] = useState(format(new Date(), "yyyy MMM d HH:mm:ss")); const [serviceOptions, setServiceOptions] = useState([ @@ -199,100 +198,7 @@ function submitRequestFinalLog() { setSubmitLoading(false); }); } - useEffect(() => { - if (!requestLog?.id_member) return - axios.get('service-member/'+ (requestLog?.id_member ?? null)) - .then((response) => { - setServiceOptions(response.data); - }).catch((error) => { - console.error('Error fetching ICD options:', error); - }); - axios.get('specialis') - .then((response) => { - setSpecialisOptions(response.data); - }).catch((error) => { - console.error('Error fetching ICD options:', error); - }); - - }, [requestLog?.id_member]); - //dari hospital portal - const [dischargeDate, setDischargeDate] = useState(format(new Date(), "yyyy MMM d HH:mm:ss")); - const [serviceOptions, setServiceOptions] = useState([ - { value: '-', label: '-' } -]); -const [specialisOptions, setSpecialisOptions] = useState([ - { value: '-', label: '-' } -]); - - const [serviceCode, setServiceCode] = useState('') - const [idSpecialities, setIdSpecialities] = useState(null) - const [inputDppj, setInputDppj] = useState('') - useEffect(() => { - if (!requestLog) return - setServiceCode(requestLog.service_code ?? '') - setIdSpecialities(requestLog.specialitiesID ?? null) - setInputDppj(requestLog.dppj ?? '') - }, [requestLog]) - const selectedService = useMemo( - () => - serviceOptions.find( - (o) => String(o.value) === String(serviceCode) - ) || null, - [serviceOptions, serviceCode] - ) - - const selectedSpecialis = useMemo( - () => - specialisOptions.find( - (o) => Number(o.value) === Number(idSpecialities) - ) || null, - [specialisOptions, idSpecialities] - ) -function submitRequestFinalLog() { - if(dischargeDate == '') - { - enqueueSnackbar('Tanggal Keluar', { variant: 'warning' }); - return false; - } - //cek spesialis - if(!idSpecialities) - { - enqueueSnackbar('Spesialis', { variant: 'warning' }); - return false; - } - //cek dpjp - if(!inputDppj) - { - enqueueSnackbar('DPPJ', { variant: 'warning' }); - return false; - } - setSubmitLoading(true); - const formData = makeFormData({ - // request_logs_id: member.id, - // result_files: fileHasilPenunjangs, - // diagnosa_files: fileDiagnosas, - // kondisi_files: fileKondisis, - discharge_date: fPostFormat(dischargeDate, 'yyyy-MM-dd HH:mm:ss'), - service_code: serviceCode, - spescialis_id: idSpecialities, - dppj: inputDppj, - }); - axios - .post('/request-final-log', formData) - .then((response) => { - enqueueSnackbar(response.data.meta.message ?? 'Berhasil membuat data', { variant: 'success' }); - // handleSubmitSuccess(); - // onClose({ someData: 'example data' }, getData); - }) - .catch(({ response }) => { - enqueueSnackbar(response.data.meta.message ?? 'Something Went Wrong', { variant: 'error' }); - }) - .then(() => { - setSubmitLoading(false); - }); - } -//end dari hospital portal const updateApproval = async () => { setSubmitLoading(true); axios From 492bdf6cc6b97d2d338cee807afde2c5e8a7e3a5 Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Wed, 8 Apr 2026 10:31:23 +0700 Subject: [PATCH 06/23] Update Serice member bug --- .../src/sections/dashboard/DetailRequestFinalLog.tsx | 2 +- .../hospital-portal/src/sections/dashboard/Model/Types.ts | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/hospital-portal/src/sections/dashboard/DetailRequestFinalLog.tsx b/frontend/hospital-portal/src/sections/dashboard/DetailRequestFinalLog.tsx index 4149596b..98ee7903 100644 --- a/frontend/hospital-portal/src/sections/dashboard/DetailRequestFinalLog.tsx +++ b/frontend/hospital-portal/src/sections/dashboard/DetailRequestFinalLog.tsx @@ -299,7 +299,7 @@ export default function DetailRequestFinalLog() { if (!requestLog?.id && !Log_id) return axios - .get('service-member/' + (requestLog?.id ?? Log_id)) + .get('service-member/' + requestLog?.id_member) .then((res) => setServiceOptions(res.data)) .catch(console.error) diff --git a/frontend/hospital-portal/src/sections/dashboard/Model/Types.ts b/frontend/hospital-portal/src/sections/dashboard/Model/Types.ts index cb9081c1..15af824a 100644 --- a/frontend/hospital-portal/src/sections/dashboard/Model/Types.ts +++ b/frontend/hospital-portal/src/sections/dashboard/Model/Types.ts @@ -35,6 +35,10 @@ export type DetailFinalLogType = { id : number, code : string, member_id : string, + id_member : string, + service_code : string, + specialitiesID : any, + dppj : any, invoice_no : string, billing_no : string, provider : string, From 5725178c1f94746b536ba3bfb75fd55757c2690b Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Wed, 8 Apr 2026 10:46:45 +0700 Subject: [PATCH 07/23] ketinggalan konflik --- .../pages/CustomerService/FinalLog/Detail.tsx | 34 ++++++++++--------- .../CustomerService/FinalLog/Model/Types.tsx | 4 +++ .../dashboard/DetailRequestFinalLog.tsx | 6 ++-- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/frontend/dashboard/src/pages/CustomerService/FinalLog/Detail.tsx b/frontend/dashboard/src/pages/CustomerService/FinalLog/Detail.tsx index 7f5f5582..1ae4c1b8 100644 --- a/frontend/dashboard/src/pages/CustomerService/FinalLog/Detail.tsx +++ b/frontend/dashboard/src/pages/CustomerService/FinalLog/Detail.tsx @@ -93,22 +93,6 @@ export default function Detail() { const [specialisOptions, setSpecialisOptions] = useState([ { value: '-', label: '-' } ]); -useEffect(() => { - axios.get('service-member/'+1) - .then((response) => { - setServiceOptions(response.data); - }).catch((error) => { - console.error('Error fetching ICD options:', error); - }); - - axios.get('specialis') - .then((response) => { - setSpecialisOptions(response.data); - }).catch((error) => { - console.error('Error fetching ICD options:', error); - }); - - }, []); const [serviceCode, setServiceCode] = useState(""); const [idSpecialities, setIdSpecialities] = useState(""); const [inputDppj, setInputDppj] = useState(""); @@ -199,6 +183,24 @@ function submitRequestFinalLog() { }); } + useEffect(() => { + if (!requestLog?.id_member) return + axios.get('service-member/'+ (requestLog?.id_member ?? null)) + .then((response) => { + setServiceOptions(response.data); + }).catch((error) => { + console.error('Error fetching ICD options:', error); + }); + + axios.get('specialis') + .then((response) => { + setSpecialisOptions(response.data); + }).catch((error) => { + console.error('Error fetching ICD options:', error); + }); + + }, [requestLog?.id_member]); + const updateApproval = async () => { setSubmitLoading(true); axios diff --git a/frontend/dashboard/src/pages/CustomerService/FinalLog/Model/Types.tsx b/frontend/dashboard/src/pages/CustomerService/FinalLog/Model/Types.tsx index cb9081c1..15af824a 100644 --- a/frontend/dashboard/src/pages/CustomerService/FinalLog/Model/Types.tsx +++ b/frontend/dashboard/src/pages/CustomerService/FinalLog/Model/Types.tsx @@ -35,6 +35,10 @@ export type DetailFinalLogType = { id : number, code : string, member_id : string, + id_member : string, + service_code : string, + specialitiesID : any, + dppj : any, invoice_no : string, billing_no : string, provider : string, diff --git a/frontend/hospital-portal/src/sections/dashboard/DetailRequestFinalLog.tsx b/frontend/hospital-portal/src/sections/dashboard/DetailRequestFinalLog.tsx index 98ee7903..1d4d1a28 100644 --- a/frontend/hospital-portal/src/sections/dashboard/DetailRequestFinalLog.tsx +++ b/frontend/hospital-portal/src/sections/dashboard/DetailRequestFinalLog.tsx @@ -296,10 +296,10 @@ export default function DetailRequestFinalLog() { >([]) useEffect(() => { - if (!requestLog?.id && !Log_id) return + if (!requestLog?.id_member) return axios - .get('service-member/' + requestLog?.id_member) + .get('service-member/' + (requestLog?.id_member ?? null)) .then((res) => setServiceOptions(res.data)) .catch(console.error) @@ -307,7 +307,7 @@ export default function DetailRequestFinalLog() { .get('specialis') .then((res) => setSpecialisOptions(res.data)) .catch(console.error) - }, [requestLog?.id, Log_id]) + }, [requestLog?.id_member]) const [serviceCode, setServiceCode] = useState('') From e4a6a58e1731f355cd4cadec05cbee398c4e117c Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Wed, 8 Apr 2026 16:42:10 +0700 Subject: [PATCH 08/23] update member --- Modules/Primaya/Http/Controllers/Api/MemberController.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Modules/Primaya/Http/Controllers/Api/MemberController.php b/Modules/Primaya/Http/Controllers/Api/MemberController.php index 6cef0400..798a0aa0 100644 --- a/Modules/Primaya/Http/Controllers/Api/MemberController.php +++ b/Modules/Primaya/Http/Controllers/Api/MemberController.php @@ -48,6 +48,10 @@ class MemberController extends Controller ->select( 'members.id', 'members.name', + 'persons.phone', + 'persons.email as email2', + 'persons.gender as gender2', + 'persons.marital_status', 'members.member_id', 'member_policies.policy_id', 'persons.nik', From 63de17a98fd83e82c66c1f3702fc57c02a80b94c Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Thu, 9 Apr 2026 14:20:29 +0700 Subject: [PATCH 09/23] Edit Final LOG --- Modules/HospitalPortal/Routes/api.php | 3 ++ .../Controllers/Api/RequestLogController.php | 20 +++++---- .../Transformers/RequestLogShowResource.php | 1 + .../Components/DialogEditFinalLOG.tsx | 42 +++++++++++++++++++ .../dashboard/DetailRequestFinalLog.tsx | 7 ++-- .../sections/dashboard/TableListFinalLog.tsx | 35 ++++++++++++---- 6 files changed, 89 insertions(+), 19 deletions(-) diff --git a/Modules/HospitalPortal/Routes/api.php b/Modules/HospitalPortal/Routes/api.php index 9f18de88..f1cd4b58 100755 --- a/Modules/HospitalPortal/Routes/api.php +++ b/Modules/HospitalPortal/Routes/api.php @@ -16,6 +16,7 @@ use Modules\HospitalPortal\Http\Middleware\Authentication; use Modules\HospitalPortal\Http\Middleware\Authorization; use Modules\Internal\Http\Controllers\Api\NavigationController; use Modules\Linksehat\Http\Controllers\Api\AutocompleteController; +use Modules\Primaya\Http\Controllers\Api\MasterController; /* |-------------------------------------------------------------------------- @@ -128,6 +129,8 @@ Route::prefix('v1')->group(function() { Route::get('get-claim-requests', [ClaimRequestController::class, 'get_claim_requests'])->name('claim-requests.get_claim_requests'); Route::get('detail-claim-requests/{id}', [ClaimRequestController::class, 'detail_claim_requests'])->name('claim-requests.detail_claim_requests'); Route::post('claim-requests/{id}/request-files', [ClaimRequestController::class, 'requestFiles']); + + Route::get('organizations', [MasterController::class, 'organizations']); }); diff --git a/Modules/Internal/Http/Controllers/Api/RequestLogController.php b/Modules/Internal/Http/Controllers/Api/RequestLogController.php index d66b3255..8c924a14 100755 --- a/Modules/Internal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/Internal/Http/Controllers/Api/RequestLogController.php @@ -129,7 +129,7 @@ class RequestLogController extends Controller if ($request->member_id){ try { $code = !empty($this->getNextCode($request)) ? $this->getNextCode($request) : null; - + $member = Member::find($request->member_id); $memberValid = false; if ($member){ @@ -349,7 +349,7 @@ class RequestLogController extends Controller if ($request->status_approval){ $requestLog->status_approval = $request->status_approval; $requestLog->approval_nominal_by = auth()->user()->id; - } + } $requestLog->save(); @@ -529,6 +529,10 @@ class RequestLogController extends Controller $requestLog->type_of_member = $request->type_of_member; } + if (!empty($request->organization_id)){ + $requestLog->organization_id = $request->organization_id; + } + $requestLog->final_log = 1; $requestLog->approved_final_log_by = auth()->user()->id; $requestLog->approved_final_log_at = Carbon::now(); @@ -1138,8 +1142,8 @@ class RequestLogController extends Controller $organization = Organization::where(['id' => $request->organization_id, 'type' => 'hospital'])->first('code'); $provideCode = $organization ? $organization->code : ''; $member = Member::with(['currentCorporate','currentPolicy' ])->where(['id' => $request->member_id])->first(); - - + + $data = [ 'source' => $source, 'provideCode' => $provideCode, @@ -1148,7 +1152,7 @@ class RequestLogController extends Controller 'member_code' => $member->member_id, ]; - + $last_numeric_code = RequestLog::select(DB::raw('MAX(CAST(SUBSTRING_INDEX(code, ".", -1) AS SIGNED)) as max_numeric_code')) ->whereRaw('SUBSTRING_INDEX(code, ".", -1) REGEXP "^[0-9]+$"') @@ -1307,7 +1311,7 @@ class RequestLogController extends Controller { // Ambil data file dari database $file = File::where('path', $request->path)->first(); - + // Tentukan disk berdasarkan source $disk = $file->source === 's3' ? 's3' : 'local'; @@ -1317,7 +1321,7 @@ class RequestLogController extends Controller // Hapus file dari storage (cek dulu ada atau tidak) if (Storage::disk($disk)->exists($path)) { Storage::disk($disk)->delete($path); - + // Update status file di DB (soft delete + reason) $file->update([ 'deleted_at' => Carbon::now(), @@ -1355,5 +1359,5 @@ class RequestLogController extends Controller phpinfo(); } - + } diff --git a/Modules/Internal/Transformers/RequestLogShowResource.php b/Modules/Internal/Transformers/RequestLogShowResource.php index 0627386a..1a6fac3e 100755 --- a/Modules/Internal/Transformers/RequestLogShowResource.php +++ b/Modules/Internal/Transformers/RequestLogShowResource.php @@ -174,6 +174,7 @@ class RequestLogShowResource extends JsonResource 'medicine' => $medicineData, 'files' => $requestLog['files'], 'provider' => $providerName, + 'organization_id' => $requestLog['organization_id'], 'no_identitas' => $requestLog['member']['nric'], 'keterangan' => $requestLog['keterangan'], 'hak_kamar_pasien' => $requestLog['hak_kamar_pasien'], diff --git a/frontend/hospital-portal/src/sections/dashboard/Components/DialogEditFinalLOG.tsx b/frontend/hospital-portal/src/sections/dashboard/Components/DialogEditFinalLOG.tsx index 3dfb0898..363109a1 100644 --- a/frontend/hospital-portal/src/sections/dashboard/Components/DialogEditFinalLOG.tsx +++ b/frontend/hospital-portal/src/sections/dashboard/Components/DialogEditFinalLOG.tsx @@ -29,6 +29,7 @@ export default function DialogEditFinalLOG({requestLog, setOpenDialog, openDialo icdCodes: requestLog?.diagnosis, reason: requestLog?.reason, type_of_member: requestLog?.type_of_member, + organization_id: requestLog?.organization_id || 0, status: 'requested', }); @@ -62,8 +63,10 @@ export default function DialogEditFinalLOG({requestLog, setOpenDialog, openDialo icdCodes: requestLog?.diagnosis|| [], reason: requestLog?.reason|| '', type_of_member: requestLog?.type_of_member|| '', + organization_id: requestLog?.organization_id || 0, status: 'requested', }); + setIdProvider(requestLog?.organization_id || 0); // ✅ sekalian sync UI }, [requestLog]); @@ -144,6 +147,7 @@ export default function DialogEditFinalLOG({requestLog, setOpenDialog, openDialo icdCodes: requestLog?.diagnosis ?? [], reason: requestLog?.reason ?? '', type_of_member: requestLog?.type_of_member ?? '', + organization_id: requestLog?.organization_id || 0, status: 'requested' }); }; @@ -162,6 +166,24 @@ export default function DialogEditFinalLOG({requestLog, setOpenDialog, openDialo // Add more options as needed ]; + const [providers, setProviders] = useState([]); + const [idProvider, setIdProvider] = useState(0); + + useEffect(() => { + axios + .get('/organizations') + .then((res) => { + setProviders(res.data.data || []); + }) + .catch((err) => console.error(err)); + }, []); + + useEffect(() => { + if (requestLog?.organization_id) { + setIdProvider(requestLog.organization_id); + } + }, [requestLog]); + // console.log(formData.type_of_member) const getContent = () => ( @@ -196,6 +218,26 @@ export default function DialogEditFinalLOG({requestLog, setOpenDialog, openDialo + + + Provider + + + option.name?.trim() || '-'} + value={providers.find((item) => item.id == idProvider) || null} + onChange={(event, newValue) => { + const id = newValue?.id || 0; + setIdProvider(id); + handleChange('organization_id', id); + }} + renderInput={(params) => ( + + )} + fullWidth + /> + Invoice Provider - {requestLog?.status_final_log != 'requested' ? ( + {requestLog?.status_final_log != 'approved' ? ( - Request Final LOG + {requestLog?.status_final_log == 'requested' ? 'Edit' : ''} Request Final LOG
@@ -1330,7 +1330,6 @@ export default function DetailRequestFinalLog() { ) : null} - diff --git a/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx b/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx index 91f9aeff..5e316e26 100644 --- a/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx +++ b/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx @@ -188,7 +188,7 @@ export default function TableListFinalLog() { // enqueueSnackbar('Mohon isi alasan', { variant: 'warning' }); // return false; // } - axios.post('/submit-claims', { + axios.post('/submit-claims', { selectedRows: selectedRows }) .then((response) => { @@ -202,7 +202,7 @@ export default function TableListFinalLog() { enqueueSnackbar(response.data.meta.message, {variant : "error"}); } getData(); - setSelectedRows([]); + setSelectedRows([]); }) .catch(({response}) => { enqueueSnackbar(response.data.errors ? response.data.errors[0] : (response.data ? response.data.meta.message : 'Opps, Something went Wrong!'), {variant : "error"}) @@ -365,8 +365,8 @@ export default function TableListFinalLog() { ]; function handleSearchMember(noPolis:any, birthDate:any) { setLoadingClaim(false) - axios.post('/search-member', { - no_polis: noPolis, + axios.post('/search-member', { + no_polis: noPolis, birth_date: birthDate ? fPostFormat(birthDate, 'yyyy-MM-dd') : null, type: 'view' }) @@ -466,6 +466,27 @@ export default function TableListFinalLog() { View + {obj.status !== 'approved' ? ( + + navigate('/detail-request-final-log/'+obj.id, { + state: { + Log_id: obj.id, + full_name: obj.full_name, + no_polis: obj.no_polis, + submission_date: obj.submission_date, + service_code: obj.service_code, + member_id: obj.member_id, + specialities_id: obj.specialities_id, + dppj: obj.dppj, + }, + }) + } + > + + Edit Request Final LOG + + ):''} {obj.status === 'approved' ? ( handleDownloadLog(obj.id, obj.service_code, obj.no_polis, obj.full_name, obj.provider, obj.approved_final_log_at)}> @@ -542,7 +563,7 @@ export default function TableListFinalLog() { DialogMember(currentMember, () => setOpenDialogBenefit(false)) } maxWidth="sm" - /> + /> - + {localeData.txtDialogConfirmation} {valDialog == "decline" ? ( @@ -596,7 +617,7 @@ export default function TableListFinalLog() { - + ); } \ No newline at end of file From 8eba77dc2f7a472f1ec8c8197211f2483007cc2b Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Thu, 9 Apr 2026 14:22:47 +0700 Subject: [PATCH 10/23] edit final log update --- .../src/sections/dashboard/DetailRequestFinalLog.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/hospital-portal/src/sections/dashboard/DetailRequestFinalLog.tsx b/frontend/hospital-portal/src/sections/dashboard/DetailRequestFinalLog.tsx index 569e2264..e516f84a 100644 --- a/frontend/hospital-portal/src/sections/dashboard/DetailRequestFinalLog.tsx +++ b/frontend/hospital-portal/src/sections/dashboard/DetailRequestFinalLog.tsx @@ -1279,7 +1279,7 @@ export default function DetailRequestFinalLog() { - {requestLog?.status == 'approved' ? ( + {requestLog?.status == 'approved' && requestLog?.status_final_log == 'requested' ? ( <> From 88be6605c22e7c36d7453f7e1b2fa3cdf126dff9 Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Thu, 9 Apr 2026 16:16:01 +0700 Subject: [PATCH 11/23] DPPJ --- .../src/pages/CustomerService/FinalLog/Detail.tsx | 8 ++++---- .../src/pages/CustomerService/Request/Detail.tsx | 2 +- .../src/sections/dashboard/DetailRequestFinalLog.tsx | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frontend/dashboard/src/pages/CustomerService/FinalLog/Detail.tsx b/frontend/dashboard/src/pages/CustomerService/FinalLog/Detail.tsx index 1ae4c1b8..49ad188a 100644 --- a/frontend/dashboard/src/pages/CustomerService/FinalLog/Detail.tsx +++ b/frontend/dashboard/src/pages/CustomerService/FinalLog/Detail.tsx @@ -111,7 +111,7 @@ function submitRequestFinalLog() { //cek dpjp if(!inputDppj) { - enqueueSnackbar('DPPJ', { variant: 'warning' }); + enqueueSnackbar('DPJP', { variant: 'warning' }); return false; } setSubmitLoading(true); @@ -442,7 +442,7 @@ function submitRequestFinalLog() { {requestLog?.specialities_id ? requestLog?.specialities_id : '-'} - DPPJ + DPJP {requestLog?.dppj ? requestLog?.dppj : '-'} @@ -569,12 +569,12 @@ function submitRequestFinalLog() { - DPPJ + DPJP { setInputDppj(event.target.value); }} diff --git a/frontend/dashboard/src/pages/CustomerService/Request/Detail.tsx b/frontend/dashboard/src/pages/CustomerService/Request/Detail.tsx index f74d7c6b..33c8c18a 100644 --- a/frontend/dashboard/src/pages/CustomerService/Request/Detail.tsx +++ b/frontend/dashboard/src/pages/CustomerService/Request/Detail.tsx @@ -162,7 +162,7 @@ export default function Detail() { {requestLog?.specialities_id ? requestLog?.specialities_id : '-'} - DPPJ + DPJP {requestLog?.dppj ? requestLog?.dppj : '-'} diff --git a/frontend/hospital-portal/src/sections/dashboard/DetailRequestFinalLog.tsx b/frontend/hospital-portal/src/sections/dashboard/DetailRequestFinalLog.tsx index e516f84a..776ed1c0 100644 --- a/frontend/hospital-portal/src/sections/dashboard/DetailRequestFinalLog.tsx +++ b/frontend/hospital-portal/src/sections/dashboard/DetailRequestFinalLog.tsx @@ -512,7 +512,7 @@ export default function DetailRequestFinalLog() { {requestLog?.specialities_id ? requestLog?.specialities_id : '-'} - DPPJ + DPJP {requestLog?.dppj ? requestLog?.dppj : '-'} @@ -639,7 +639,7 @@ export default function DetailRequestFinalLog() { - DPPJ + DPJP 0) ) { alert( - 'Lengkapi Tanggal Keluar, Service Code, Specialities, DPPJ, isi benefit, dan upload files terlebih dahulu, lalu simpan' + 'Lengkapi Tanggal Keluar, Service Code, Specialities, DPJP, isi benefit, dan upload files terlebih dahulu, lalu simpan' ); return; } From 5dbad1f6a28653be24bf9182c0657a28c25bda68 Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Fri, 10 Apr 2026 13:52:02 +0700 Subject: [PATCH 12/23] update benefit import --- Modules/Internal/Services/CorporateService.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Modules/Internal/Services/CorporateService.php b/Modules/Internal/Services/CorporateService.php index 497cbd15..11444721 100755 --- a/Modules/Internal/Services/CorporateService.php +++ b/Modules/Internal/Services/CorporateService.php @@ -245,14 +245,13 @@ class CorporateService ->where('corporate_plan_id', $benefit_data['plan_code']) ->first(); $benefit_data['plan_code'] = $plan->id; - $benefit = Benefit::updateOrCreate([ + $benefit = Benefit::firstOrCreate([ 'code' => $benefit_data['code'], 'service_code' => $plan->service_code, ], [ - 'code' => $benefit_data['code'], - 'service_code' => $plan->service_code, - 'description' => $benefit_data['description'], + 'description' => $benefit_data['description'], // hanya initial ]); + $corporateBenefit = $corporate->corporateBenefits()->updateOrCreate([ 'benefit_id' => $benefit->id, 'plan_id' => $plan->id, From 7dad4e8004940cae5012861cc8e94d9d9a23f46d Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Mon, 13 Apr 2026 14:48:29 +0700 Subject: [PATCH 13/23] add edit provider prime center --- .../Api/OrganizationController.php | 10 ++ Modules/Internal/Routes/api.php | 3 + .../Http/Controllers/Api/MasterController.php | 5 +- .../Components/DialogEditFinalLOG.tsx | 68 +++++++++++-- .../pages/CustomerService/FinalLog/Detail.tsx | 96 ++++++++++++++++--- .../CustomerService/FinalLog/Model/Types.tsx | 1 + .../src/sections/dashboard/Model/Types.ts | 1 + 7 files changed, 159 insertions(+), 25 deletions(-) diff --git a/Modules/Internal/Http/Controllers/Api/OrganizationController.php b/Modules/Internal/Http/Controllers/Api/OrganizationController.php index 7c2cbbd1..e7ead6b5 100755 --- a/Modules/Internal/Http/Controllers/Api/OrganizationController.php +++ b/Modules/Internal/Http/Controllers/Api/OrganizationController.php @@ -31,6 +31,16 @@ class OrganizationController extends Controller return response()->json(OrganizationResource::collection($organizations)); } + public function organizations() + { + $data = Organization::hospital()->select('id', 'name', 'code')->get(); + + return response()->json([ + 'status' => 'success', + 'data' => OrganizationResource::collection($data) + ]); + } + /** * Show the form for creating a new resource. * @return Renderable diff --git a/Modules/Internal/Routes/api.php b/Modules/Internal/Routes/api.php index e0a613a0..48d8f406 100755 --- a/Modules/Internal/Routes/api.php +++ b/Modules/Internal/Routes/api.php @@ -56,6 +56,7 @@ use Modules\Internal\Http\Controllers\ClaimEncounterController; use Modules\Linksehat\Http\Controllers\Api\AutocompleteController; use Modules\HospitalPortal\Http\Controllers\Api\MemberController as MemberControllerHospitalPortal; use Modules\HospitalPortal\Http\Controllers\Api\RequestLogController as RequestLogControllerHospitalPortal; +use Modules\Primaya\Http\Controllers\Api\MasterController; @@ -397,6 +398,8 @@ Route::prefix('internal')->group(function () { Route::get('search-organizations', [OrganizationController::class, 'searchOrganization']); Route::get('search-specialities', [SpecialityController::class, 'searchSpeciality']); Route::resource('organizations', OrganizationController::class); + Route::get('organizations', [MasterController::class, 'organizations']); + Route::resource('appointments', AppointmentController::class); Route::get('live-chat/export', [LivechatController::class, 'export']); Route::resource('live-chat', LivechatController::class); diff --git a/Modules/Primaya/Http/Controllers/Api/MasterController.php b/Modules/Primaya/Http/Controllers/Api/MasterController.php index 62656569..d1f1b952 100644 --- a/Modules/Primaya/Http/Controllers/Api/MasterController.php +++ b/Modules/Primaya/Http/Controllers/Api/MasterController.php @@ -22,6 +22,7 @@ use App\Models\ClaimRequest; use App\Models\CorporateBenefit; use App\Models\RequestLogBenefit; use App\Models\Speciality; +use Modules\Internal\Transformers\OrganizationResource; class MasterController extends Controller { @@ -53,11 +54,11 @@ class MasterController extends Controller public function organizations() { - $data = Organization::select('id', 'name', 'code')->get(); + $data = Organization::hospital()->select('id', 'name', 'code')->get(); return response()->json([ 'status' => 'success', - 'data' => $data + 'data' => OrganizationResource::collection($data) ]); } } diff --git a/frontend/dashboard/src/pages/CustomerService/FinalLog/Components/DialogEditFinalLOG.tsx b/frontend/dashboard/src/pages/CustomerService/FinalLog/Components/DialogEditFinalLOG.tsx index 6d371ee0..498fa8b4 100644 --- a/frontend/dashboard/src/pages/CustomerService/FinalLog/Components/DialogEditFinalLOG.tsx +++ b/frontend/dashboard/src/pages/CustomerService/FinalLog/Components/DialogEditFinalLOG.tsx @@ -14,7 +14,7 @@ type DialogConfirmationType = { openDialog: boolean; setOpenDialog: any; onSubmit?: void; - requestLog: DetailFinalLogType|undefined; + requestLog: DetailFinalLogType|undefined; } export default function DialogEditFinalLOG({requestLog, setOpenDialog, openDialog, onSubmit} : DialogConfirmationType ) { @@ -28,11 +28,13 @@ export default function DialogEditFinalLOG({requestLog, setOpenDialog, openDialo catatan: requestLog?.catatan, icdCodes: requestLog?.diagnosis, reason: requestLog?.reason, - type_of_member: requestLog?.type_of_member + type_of_member: requestLog?.type_of_member, + organization_id: requestLog?.organization_id || 0, + }); const [error, setError] = useState(false); - + const [icdOptions, setIcdOptions] = useState([ { value: '-', label: '-' } ]); @@ -48,9 +50,9 @@ export default function DialogEditFinalLOG({requestLog, setOpenDialog, openDialo .catch((error) => { console.error('Error fetching ICD options:', error); }); - + }, []); // useEffect dijalankan hanya sekali saat komponen dimount - + useEffect(() => { setFormData({ discharge_date: requestLog?.discharge_date|| '', @@ -61,7 +63,10 @@ export default function DialogEditFinalLOG({requestLog, setOpenDialog, openDialo icdCodes: requestLog?.diagnosis|| [], reason: requestLog?.reason|| '', type_of_member: requestLog?.type_of_member|| '', + organization_id: requestLog?.organization_id || 0, + }); + setIdProvider(requestLog?.organization_id || 0); }, [requestLog]); @@ -93,13 +98,13 @@ export default function DialogEditFinalLOG({requestLog, setOpenDialog, openDialo console.error('Error fetching ICD options:', error); }); } - + const handleSubmit = () => { if (formData.type_of_member == "" && requestLog?.corporate_id == 5) { setError(true); alert('Silakan pilih Type Of Member sebelum mengirimkan data.'); - } + } else if (isReasonSelected && formData.reason !== '') { axios .post(`customer-service/request/final-log`, formData) @@ -117,7 +122,7 @@ export default function DialogEditFinalLOG({requestLog, setOpenDialog, openDialo alert('Silakan pilih alasan sebelum mengirimkan data.'); } } - + const style1 = { color: '#919EAB', width: '30%' @@ -140,12 +145,14 @@ export default function DialogEditFinalLOG({requestLog, setOpenDialog, openDialo invoice_no: requestLog?.invoice_no ?? '', catatan: requestLog?.catatan ?? '', icdCodes: requestLog?.diagnosis ?? [], - reason: requestLog?.reason ?? '', + reason: requestLog?.reason ?? '', type_of_member: requestLog?.type_of_member ?? '', + organization_id: requestLog?.organization_id || 0, + }); }; const [isReasonSelected, setIsReasonSelected] = useState(true); - + const handleCloseDialog = () => { setOpenDialog(false); resetForm(); @@ -161,6 +168,27 @@ export default function DialogEditFinalLOG({requestLog, setOpenDialog, openDialo // console.log(formData.type_of_member) + const [providers, setProviders] = useState([]); + const [idProvider, setIdProvider] = useState(0); + + useEffect(() => { + axios + .get('/organizations') + .then((res) => { + setProviders(res.data.data || []); + }) + .catch((err) => console.error(err)); + }, []); + + useEffect(() => { + + if (requestLog?.organization_id) { + console.log(requestLog?.organization_id); + setIdProvider(requestLog.organization_id); + console.log(idProvider); + } + }, [requestLog]); + const getContent = () => ( Are you sure to edit this final log ? @@ -193,6 +221,26 @@ export default function DialogEditFinalLOG({requestLog, setOpenDialog, openDialo + + + Provider + + + option.name?.trim() || '-'} + value={providers.find((item) => item.id == idProvider) || null} + onChange={(event, newValue) => { + const id = newValue?.id || 0; + setIdProvider(id); + handleChange('organization_id', id); + }} + renderInput={(params) => ( + + )} + fullWidth + /> + Invoice Provider (format(new Date(), "yyyy MMM d HH:mm:ss")); - const [serviceOptions, setServiceOptions] = useState([ - { value: '-', label: '-' } -]); -const [specialisOptions, setSpecialisOptions] = useState([ - { value: '-', label: '-' } -]); +// const [dischargeDate, setDischargeDate] = useState(format(new Date(), "yyyy MMM d HH:mm:ss")); +const [dischargeDate, setDischargeDate] = useState(null) + + +// const [serviceOptions, setServiceOptions] = useState([ +// { value: '-', label: '-' } +// ]); +// const [specialisOptions, setSpecialisOptions] = useState([ +// { value: '-', label: '-' } +// ]); + +const [serviceOptions, setServiceOptions] = useState< +{ value: string; label: string }[] +>([]) + +const [specialisOptions, setSpecialisOptions] = useState< +{ value: number; label: string }[] +>([]) const [serviceCode, setServiceCode] = useState(""); -const [idSpecialities, setIdSpecialities] = useState(""); +const [idSpecialities, setIdSpecialities] = useState(null) + const [inputDppj, setInputDppj] = useState(""); +const [requestLog, setRequestLog] = useState(); function submitRequestFinalLog() { if(dischargeDate == '') { @@ -120,6 +135,7 @@ function submitRequestFinalLog() { // result_files: fileHasilPenunjangs, // diagnosa_files: fileDiagnosas, // kondisi_files: fileKondisis, + request_logs_id: requestLog?.id, discharge_date: fPostFormat(dischargeDate, 'yyyy-MM-dd HH:mm:ss'), service_code: serviceCode, spescialis_id: idSpecialities, @@ -147,7 +163,7 @@ function submitRequestFinalLog() { const navigate = useNavigate(); const { themeStretch } = useSettings(); - const [requestLog, setRequestLog] = useState(); + const [isReversal, setIsReversal] = useState(false); const [submitLoading, setSubmitLoading] = useState(false); @@ -337,6 +353,40 @@ function submitRequestFinalLog() { ); }; + useEffect(() => { + if (requestLog?.discharge_date) { + setDischargeDate( + parse( + requestLog.discharge_date, + 'yyyy-MM-dd HH:mm:ss', + new Date() + ) + ) + } + }, [requestLog?.discharge_date]) + useEffect(() => { + if (!requestLog) return + setServiceCode(requestLog.service_code ?? '') + setIdSpecialities(requestLog.specialitiesID ?? null) + setInputDppj(requestLog.dppj ?? '') + }, [requestLog]) + const selectedService = useMemo( + () => + serviceOptions.find( + (o) => String(o.value) === String(serviceCode) + ) || null, + [serviceOptions, serviceCode] + ) + console.log(serviceOptions); + console.log(serviceCode); + const selectedSpecialis = useMemo( + () => + specialisOptions.find( + (o) => Number(o.value) === Number(idSpecialities) + ) || null, + [specialisOptions, idSpecialities] + ) + return ( @@ -354,7 +404,7 @@ function submitRequestFinalLog() { Detail - {requestLog?.status_final_log != 'requested' ? ( + {requestLog?.status_final_log != 'approved' ? ( Tipe Service - option.label || ""} @@ -542,7 +592,17 @@ function submitRequestFinalLog() { renderInput={(params) => ( )} - /> + /> */} + o.label} + isOptionEqualToValue={(o, v) => o.value === v.value} + onChange={(_, v) => setServiceCode(v?.value ?? '')} + renderInput={(params) => ( + + )} + /> @@ -551,7 +611,7 @@ function submitRequestFinalLog() { Spesialis - option.label || ''} @@ -562,6 +622,16 @@ function submitRequestFinalLog() { renderInput={(params) => ( )} + /> */} + o.label} + isOptionEqualToValue={(o, v) => o.value === v.value} + onChange={(_, v) => setIdSpecialities(v?.value ?? null)} + renderInput={(params) => ( + + )} /> diff --git a/frontend/dashboard/src/pages/CustomerService/FinalLog/Model/Types.tsx b/frontend/dashboard/src/pages/CustomerService/FinalLog/Model/Types.tsx index 15af824a..0466ff70 100644 --- a/frontend/dashboard/src/pages/CustomerService/FinalLog/Model/Types.tsx +++ b/frontend/dashboard/src/pages/CustomerService/FinalLog/Model/Types.tsx @@ -35,6 +35,7 @@ export type DetailFinalLogType = { id : number, code : string, member_id : string, + organization_id : any, id_member : string, service_code : string, specialitiesID : any, diff --git a/frontend/hospital-portal/src/sections/dashboard/Model/Types.ts b/frontend/hospital-portal/src/sections/dashboard/Model/Types.ts index 15af824a..0466ff70 100644 --- a/frontend/hospital-portal/src/sections/dashboard/Model/Types.ts +++ b/frontend/hospital-portal/src/sections/dashboard/Model/Types.ts @@ -35,6 +35,7 @@ export type DetailFinalLogType = { id : number, code : string, member_id : string, + organization_id : any, id_member : string, service_code : string, specialitiesID : any, From 14e01827099fc60f59c020f9ef1e39f5c9bcc1ab Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Tue, 14 Apr 2026 16:23:22 +0700 Subject: [PATCH 14/23] update revisi --- .../Controllers/Api/RequestLogController.php | 8 +-- .../Controllers/Api/RequestLogController.php | 22 +++++-- .../Transformers/RequestLogShowResource.php | 5 +- .../Components/DialogConfirmation.tsx | 56 +++++++++--------- .../Components/DialogEditFinalLOG.tsx | 44 ++++++++------ .../pages/CustomerService/FinalLog/Detail.tsx | 14 +++-- .../CustomerService/FinalLog/Model/Types.tsx | 1 + .../Request/Components/DialogConfirmation.tsx | 58 ++++++++++--------- .../Components/DialogEditInformation.tsx | 50 ++++++++-------- .../pages/CustomerService/Request/Detail.tsx | 12 ++-- .../CustomerService/Request/Model/Types.tsx | 1 + .../Components/DialogConfirmation.tsx | 42 ++++++++------ .../Components/DialogEditFinalLOG.tsx | 50 +++++++++------- .../dashboard/DetailRequestFinalLog.tsx | 36 +++++++++--- .../src/sections/dashboard/Model/Types.ts | 1 + .../sections/dashboard/TableListFinalLog.tsx | 2 +- .../pdf/final_log_page_1_primayan.blade.php | 10 ++-- .../pdf/req_log_page_1_primayan.blade.php | 8 +-- 18 files changed, 243 insertions(+), 177 deletions(-) diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php index dd1ca899..66edb01f 100755 --- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php @@ -375,14 +375,14 @@ class RequestLogController extends Controller DB::table('request_logs') ->where('request_logs.id', '=', $request->request_logs_id) ->update([ - 'status_final_log' => 'requested', - 'final_log' => 1, + 'status_final_log' => $request->edit ? null : 'requested', + 'final_log' => $request->edit ? 0 : 1, 'service_code' =>$request->service_code, 'discharge_date' => $request->discharge_date, 'dppj' => $request->dppj, 'specialities_id' => $request->spescialis_id, - 'created_final_by'=> auth()->user()->id, - 'created_final_at'=> date('Y-m-d H:i:s'), + 'created_final_by'=> $request->edit ? null : auth()->user()->id, + 'created_final_at'=> $request->edit ? null : date('Y-m-d H:i:s'), ]); if ($request->hasFile('result_files')) { foreach ($request->result_files as $file) { diff --git a/Modules/Internal/Http/Controllers/Api/RequestLogController.php b/Modules/Internal/Http/Controllers/Api/RequestLogController.php index 8c924a14..0be472cb 100755 --- a/Modules/Internal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/Internal/Http/Controllers/Api/RequestLogController.php @@ -517,9 +517,7 @@ class RequestLogController extends Controller } else { $requestLog->diagnosis = ''; } - if (!empty($request->status)) { - $requestLog->status_final_log = $status; - } + if (!empty($request->reason)) { $requestLog->reason_final = $request->reason; @@ -533,9 +531,21 @@ class RequestLogController extends Controller $requestLog->organization_id = $request->organization_id; } - $requestLog->final_log = 1; - $requestLog->approved_final_log_by = auth()->user()->id; - $requestLog->approved_final_log_at = Carbon::now(); + if(empty($request->edit)) { + if (!empty($request->status)) { + $requestLog->status_final_log = $status; + if($request->status == 'requested') { + $requestLog->final_log = 1; + $requestLog->created_final_by = auth()->user()->id; + $requestLog->created_final_at = date('Y-m-d H:i:s'); + } + if($request->status == 'approved') { + $requestLog->approved_final_log_by = auth()->user()->id; + $requestLog->approved_final_log_at = Carbon::now(); + } + } + } + // if($requestLog->service_code != 'IP'){ // $requestLog->discharge_date = Carbon::now(); // } diff --git a/Modules/Internal/Transformers/RequestLogShowResource.php b/Modules/Internal/Transformers/RequestLogShowResource.php index 1a6fac3e..14b42009 100755 --- a/Modules/Internal/Transformers/RequestLogShowResource.php +++ b/Modules/Internal/Transformers/RequestLogShowResource.php @@ -15,6 +15,7 @@ use App\Models\ClaimRequest; use App\Models\Icd; use App\Models\Speciality; use App\Helpers\Helper; +use App\Models\Corporate; use App\Models\CorporatePolicy; use Illuminate\Http\Resources\Json\JsonResource; @@ -135,6 +136,8 @@ class RequestLogShowResource extends JsonResource } else { $dppj = '-'; } + //cek untuk view omt non omt + $code_corporate = Corporate::where('id', $corporateId)->first(); $data = [ 'id' => $requestLog['id'], 'code' => $requestLog['code'], @@ -186,7 +189,7 @@ class RequestLogShowResource extends JsonResource 'diagnosis' => $icd, 'url_approval' => env('LMS_WEB_URL') . '/custormer-service/final-log/detail/'.$requestLog['id'] . '/' . auth()->user()->id, 'is_reversal' => $isReversal, // untuk penjagaan, jika true tidak bisa di edit/hapus lagi - + 'view_type_member' => $code_corporate->code == 'VALEIND' ? true : false, ]; diff --git a/frontend/dashboard/src/pages/CustomerService/FinalLog/Components/DialogConfirmation.tsx b/frontend/dashboard/src/pages/CustomerService/FinalLog/Components/DialogConfirmation.tsx index 8b6ce0d5..9aa56ee4 100644 --- a/frontend/dashboard/src/pages/CustomerService/FinalLog/Components/DialogConfirmation.tsx +++ b/frontend/dashboard/src/pages/CustomerService/FinalLog/Components/DialogConfirmation.tsx @@ -14,7 +14,7 @@ type DialogConfirmationType = { setOpenDialog: any; onSubmit?: void; approve: string; - requestLog: DetailFinalLogType|undefined; + requestLog: DetailFinalLogType|undefined; } export default function DialogConfirmation({requestLog, setOpenDialog, openDialog, approve, onSubmit} : DialogConfirmationType ) { @@ -29,7 +29,7 @@ export default function DialogConfirmation({requestLog, setOpenDialog, openDialo // icdCodes: requestLog?.diagnosis.length ? requestLog.diagnosis.map(diagnosis => ({ value: diagnosis.id, label: diagnosis.name })) : [] icdCodes: requestLog?.diagnosis }); - + const [error, setError] = useState(false); const [icdOptions, setIcdOptions] = useState([ @@ -73,10 +73,10 @@ export default function DialogConfirmation({requestLog, setOpenDialog, openDialo } const handleSubmit = () => { - if (formData.type_of_member == "" && requestLog?.corporate_id == 5) { // corporate vale + if (formData.type_of_member == "" && requestLog?.view_type_member) { // corporate vale setError(true); alert('Silakan pilih Type Of Member sebelum mengirimkan data.'); - } + } else { axios .post(`customer-service/request/final-log`, formData) @@ -121,10 +121,12 @@ export default function DialogConfirmation({requestLog, setOpenDialog, openDialo Member ID {requestLog?.member_id} - - Member Of Type - {requestLog?.type_of_member} - + {requestLog?.view_type_member ? ( + + Member Of Type + {requestLog?.type_of_member} + + ):('')} Policy Number {requestLog?.policy_number} @@ -189,24 +191,26 @@ export default function DialogConfirmation({requestLog, setOpenDialog, openDialo )} /> - - Type Of Member* - - + {requestLog?.view_type_member ? ( + + Type Of Member + + + ):('')} diff --git a/frontend/dashboard/src/pages/CustomerService/FinalLog/Components/DialogEditFinalLOG.tsx b/frontend/dashboard/src/pages/CustomerService/FinalLog/Components/DialogEditFinalLOG.tsx index 498fa8b4..25a3bde1 100644 --- a/frontend/dashboard/src/pages/CustomerService/FinalLog/Components/DialogEditFinalLOG.tsx +++ b/frontend/dashboard/src/pages/CustomerService/FinalLog/Components/DialogEditFinalLOG.tsx @@ -30,6 +30,7 @@ export default function DialogEditFinalLOG({requestLog, setOpenDialog, openDialo reason: requestLog?.reason, type_of_member: requestLog?.type_of_member, organization_id: requestLog?.organization_id || 0, + edit: true }); @@ -64,6 +65,7 @@ export default function DialogEditFinalLOG({requestLog, setOpenDialog, openDialo reason: requestLog?.reason|| '', type_of_member: requestLog?.type_of_member|| '', organization_id: requestLog?.organization_id || 0, + edit: true }); setIdProvider(requestLog?.organization_id || 0); @@ -101,7 +103,7 @@ export default function DialogEditFinalLOG({requestLog, setOpenDialog, openDialo const handleSubmit = () => { - if (formData.type_of_member == "" && requestLog?.corporate_id == 5) { + if (formData.type_of_member == "" && requestLog?.view_type_member) { setError(true); alert('Silakan pilih Type Of Member sebelum mengirimkan data.'); } @@ -148,6 +150,7 @@ export default function DialogEditFinalLOG({requestLog, setOpenDialog, openDialo reason: requestLog?.reason ?? '', type_of_member: requestLog?.type_of_member ?? '', organization_id: requestLog?.organization_id || 0, + edit: true }); }; @@ -163,6 +166,7 @@ export default function DialogEditFinalLOG({requestLog, setOpenDialog, openDialo { value: 'endorsement', label: 'Endorsement' }, { value: 'renewal', label: 'Renewal' }, { value: 'wrong_setting', label: 'Wrong Setting' }, + { value: 'approval', label: 'Approval' }, // Add more options as needed ]; @@ -261,24 +265,26 @@ export default function DialogEditFinalLOG({requestLog, setOpenDialog, openDialo onChange={(e) => handleChange('billing_no', e.target.value)} /> - - Type Of Member* - - + {requestLog?.view_type_member ? ( + + Type Of Member + + + ):('')} Discharge Date Member ID {requestLog?.member_id} - - Type Of Member - {requestLog?.type_of_member} - + {requestLog?.view_type_member ? ( + + Type Of Member + {requestLog?.type_of_member} + + ):('')} Policy Number {requestLog?.policy_number} @@ -1275,7 +1277,7 @@ function submitRequestFinalLog() { {requestLog?.status_final_log == 'requested' ? ( - + <>
) } - + ); diff --git a/frontend/dashboard/src/pages/CustomerService/Request/Components/DialogEditInformation.tsx b/frontend/dashboard/src/pages/CustomerService/Request/Components/DialogEditInformation.tsx index b0b02131..e545a52e 100644 --- a/frontend/dashboard/src/pages/CustomerService/Request/Components/DialogEditInformation.tsx +++ b/frontend/dashboard/src/pages/CustomerService/Request/Components/DialogEditInformation.tsx @@ -17,7 +17,7 @@ type DialogConfirmationType = { openDialog: boolean; setOpenDialog: any; onSubmit?: void; - requestLog: DetailRequestLogType|undefined; + requestLog: DetailRequestLogType|undefined; } export default function DialogEditInformation({requestLog, setOpenDialog, openDialog, onSubmit} : DialogConfirmationType ) { @@ -34,7 +34,7 @@ export default function DialogEditInformation({requestLog, setOpenDialog, openDi const [error, setError] = useState(false); const [isReasonSelected, setIsReasonSelected] = useState(true); - + useEffect(() => { // Update formData setiap kali requestLog berubah setFormData({ @@ -65,10 +65,10 @@ export default function DialogEditInformation({requestLog, setOpenDialog, openDi })); handleSubmit(); }; - + const handleSubmit = () => { - if (formData.type_of_member == "" && requestLog?.corporate_id == 5) { + if (formData.type_of_member == "" && requestLog?.view_type_member) { setError(true); alert('Silakan pilih Type Of Member sebelum mengirimkan data.'); } else if (isReasonSelected && formData.reason !== '') { @@ -88,7 +88,7 @@ export default function DialogEditInformation({requestLog, setOpenDialog, openDi alert('Silakan pilih alasan sebelum mengirimkan data.'); } - + } const style1 = { @@ -114,7 +114,7 @@ export default function DialogEditInformation({requestLog, setOpenDialog, openDi penempatan_kamar: requestLog?.penempatan_kamar ?? '', reason: requestLog?.reason ?? '', type_of_member: requestLog?.type_of_member ?? '' - + }); }; @@ -201,24 +201,26 @@ export default function DialogEditInformation({requestLog, setOpenDialog, openDi onChange={(e) => handleChange('penempatan_kamar', e.target.value)} /> - - Type Of Member* - - + {requestLog?.view_type_member ? ( + + Type Of Member + + + ):('')} Reason* Member ID {requestLog?.member_id} - - Type Of Member - {requestLog?.type_of_member} - + {requestLog?.view_type_member ? ( + + Type Of Member + {requestLog?.type_of_member} + + ):('')} Policy Number {requestLog?.policy_number} @@ -192,7 +194,7 @@ export default function Detail() { {requestLog?.status == 'requested' || requestLog?.status == 'canceled' || requestLog?.status == 'waiting_billing' ? ( - + <>
diff --git a/frontend/hospital-portal/src/sections/dashboard/Model/Types.ts b/frontend/hospital-portal/src/sections/dashboard/Model/Types.ts index 0466ff70..5efb4c56 100644 --- a/frontend/hospital-portal/src/sections/dashboard/Model/Types.ts +++ b/frontend/hospital-portal/src/sections/dashboard/Model/Types.ts @@ -35,6 +35,7 @@ export type DetailFinalLogType = { id : number, code : string, member_id : string, + view_type_member : any, organization_id : any, id_member : string, service_code : string, diff --git a/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx b/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx index 5e316e26..1c2af680 100644 --- a/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx +++ b/frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx @@ -484,7 +484,7 @@ export default function TableListFinalLog() { } > - Edit Request Final LOG + Edit ):''} {obj.status === 'approved' ? ( diff --git a/resources/views/pdf/final_log_page_1_primayan.blade.php b/resources/views/pdf/final_log_page_1_primayan.blade.php index a8604520..f5a98f47 100644 --- a/resources/views/pdf/final_log_page_1_primayan.blade.php +++ b/resources/views/pdf/final_log_page_1_primayan.blade.php @@ -253,10 +253,10 @@ {{ $dataMember->code_plan }} -
+ +
LinkSehat bertindak mewakili perusahaan asuransi/penanggung untuk mengeluarkan Surat Jaminan Akhir untuk peserta dibawah ini :
@@ -439,7 +439,7 @@ @php if(count($dataDiagnosis)) { - foreach ($dataDiagnosis as $valDiagnosis) + foreach ($dataDiagnosis as $valDiagnosis) { @endphp @@ -453,7 +453,7 @@ @endphp - - + @php } @endphp diff --git a/resources/views/pdf/req_log_page_1_primayan.blade.php b/resources/views/pdf/req_log_page_1_primayan.blade.php index e7bb838f..c1a157a9 100644 --- a/resources/views/pdf/req_log_page_1_primayan.blade.php +++ b/resources/views/pdf/req_log_page_1_primayan.blade.php @@ -260,10 +260,10 @@ {{ $dataMember->code_plan }} -
+ +
LinkSehat bertindak mewakili perusahaan asuransi/penanggung untuk mengeluarkan Surat Jaminan Awal untuk peserta dibawah ini :
@@ -395,7 +395,7 @@
SYARAT DAN KETENTUAN
- + From 18edec53931b30e6095bf950fe1d27018378e28f Mon Sep 17 00:00:00 2001 From: Fadila Date: Sat, 25 Apr 2026 08:29:38 +0700 Subject: [PATCH 15/23] tambah keterangan at pada approved dan approved final log --- .../Controllers/Api/RequestLogController.php | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/Modules/Primaya/Http/Controllers/Api/RequestLogController.php b/Modules/Primaya/Http/Controllers/Api/RequestLogController.php index cd2850b0..d141c3f0 100644 --- a/Modules/Primaya/Http/Controllers/Api/RequestLogController.php +++ b/Modules/Primaya/Http/Controllers/Api/RequestLogController.php @@ -37,6 +37,8 @@ class RequestLogController extends Controller 'organization_name' => !empty($request->organization_name) ? $request->organization_name : null, 'address_provider' => !empty($request->address_provider) ? $request->address_provider : null, 'submission_date' => $request->submission_date, + 'approved_at' => $request->approved_at, + 'approved_final_log_at' => $request->approved_final_log_at, 'discharge_date' => $request->discharge_date, 'corporate_id_partner' => !empty($request->corporate_id_partner) ? $request->corporate_id_partner : [], 'specialities_id' => $request->specialities_id, @@ -46,6 +48,8 @@ class RequestLogController extends Controller 'member_id' => 'required', 'service_code' => 'required', 'submission_date' => 'required', + 'approved_at' => 'required', + 'approved_final_log_at' => 'required', 'discharge_date' => 'required', 'specialities_id' => 'required', 'dppj' => 'required', @@ -53,6 +57,8 @@ class RequestLogController extends Controller 'member_id.required' => trans('Validation.required',['attribute' => 'Member ID']), 'service_code.required' => trans('Validation.required',['attribute' => 'Service Code']), 'submission_date.required' => trans('Validation.required',['attribute' => 'Submission Date']), + 'approved_at.required' => trans('Validation.required',['attribute' => 'Submission Date']), + 'approved_final_log_at.required' => trans('Validation.required',['attribute' => 'Submission Date']), 'discharge_date.required' => trans('Validation.required',['attribute' => 'Discharge Date']), 'specialities_id.required' => trans('Validation.required',['attribute' => 'Specialities']), 'dppj.required' => trans('Validation.required',['attribute' => 'DPJP']), @@ -64,6 +70,8 @@ class RequestLogController extends Controller 'member_id' => 'required', 'service_code' => 'required', 'submission_date' => 'required', + 'approved_at' => 'required', + 'approved_final_log_at' => 'required', 'discharge_date' => 'required', 'specialities_id' => 'required', 'dppj' => 'required', @@ -72,6 +80,8 @@ class RequestLogController extends Controller 'member_id.required' => trans('Validation.required',['attribute' => 'Member ID']), 'service_code.required' => trans('Validation.required',['attribute' => 'Service Code']), 'submission_date.required' => trans('Validation.required',['attribute' => 'Submission Date']), + 'approved_at.required' => trans('Validation.required',['attribute' => 'Approved At Date']), + 'approved_final_log_at.required' => trans('Validation.required',['attribute' => 'Approved Final Log At Date']), 'discharge_date.required' => trans('Validation.required',['attribute' => 'Discharge Date']), 'specialities_id.required' => trans('Validation.required',['attribute' => 'Specialities']), 'dppj.required' => trans('Validation.required',['attribute' => 'DPJP']), @@ -150,6 +160,8 @@ class RequestLogController extends Controller 'status' => 'approved', 'status_final_log' => 'approved', 'final_log' => 1, + 'approved_at' => $request->approved_at ?? now(), + 'approved_final_log_at' => $request->approved_final_log_at ?? now(), 'payment_type' => 'cashless', 'service_code' => $request->service_code, 'policy_id' => $member->currentPolicy->id ?? null, @@ -256,6 +268,8 @@ class RequestLogController extends Controller 'organization_name' => !empty($request->organization_name) ? $request->organization_name : null, 'address_provider' => !empty($request->address_provider) ? $request->address_provider : null, 'submission_date' => $request->submission_date, + 'approved_at' => $request->approved_at, + 'approved_final_log_at' => $request->approved_final_log_at, 'corporate_id_partner' => !empty($request->corporate_id_partner) ? $request->corporate_id_partner : [], 'specialities_id' => $request->specialities_id, 'dppj' => $request->dppj @@ -264,12 +278,16 @@ class RequestLogController extends Controller 'member_id' => 'required', 'service_code' => 'required', 'submission_date' => 'required', + 'approved_at' => 'required', + 'approved_final_log_at' => 'required', 'specialities_id' => 'required', 'dppj' => 'required', ], [ 'member_id.required' => trans('Validation.required',['attribute' => 'Member ID']), 'service_code.required' => trans('Validation.required',['attribute' => 'Service Code']), 'submission_date.required' => trans('Validation.required',['attribute' => 'Submission Date']), + 'approved_at.required' => trans('Validation.required',['attribute' => 'Approved At Date']), + 'approved_final_log_at.required' => trans('Validation.required',['attribute' => 'Approved Final Log At Date']), 'specialities_id.required' => trans('Validation.required',['attribute' => 'Specialities']), 'dppj.required' => trans('Validation.required',['attribute' => 'DPJP']), ]); @@ -280,6 +298,8 @@ class RequestLogController extends Controller 'member_id' => 'required', 'service_code' => 'required', 'submission_date' => 'required', + 'approved_at' => 'required', + 'approved_final_log_at' => 'required', 'specialities_id' => 'required', 'dppj' => 'required', ], [ @@ -287,6 +307,8 @@ class RequestLogController extends Controller 'member_id.required' => trans('Validation.required',['attribute' => 'Member ID']), 'service_code.required' => trans('Validation.required',['attribute' => 'Service Code']), 'submission_date.required' => trans('Validation.required',['attribute' => 'Submission Date']), + 'approved_at.required' => trans('Validation.required',['attribute' => 'Submission Date']), + 'approved_final_log_at.required' => trans('Validation.required',['attribute' => 'Submission Date']), 'specialities_id.required' => trans('Validation.required',['attribute' => 'Specialities']), 'dppj.required' => trans('Validation.required',['attribute' => 'DPJP']), ]); @@ -369,6 +391,7 @@ class RequestLogController extends Controller 'specialities_id' => $request->specialities_id, 'dppj' => $request->dppj, 'approved_at' => $request->approved_at ?? now(), + 'approved_final_log_at' => $request->approved_final_log_at ?? now(), ]; // SIMPAN LOG From f42266258f36252173490d40f58d984712e3b7be Mon Sep 17 00:00:00 2001 From: Iqbal Date: Tue, 28 Apr 2026 14:50:41 +0700 Subject: [PATCH 16/23] fix sign --- .../views/pdf/final_log_page_2_primayan.blade.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/resources/views/pdf/final_log_page_2_primayan.blade.php b/resources/views/pdf/final_log_page_2_primayan.blade.php index 125d532e..d1eae975 100644 --- a/resources/views/pdf/final_log_page_2_primayan.blade.php +++ b/resources/views/pdf/final_log_page_2_primayan.blade.php @@ -270,14 +270,11 @@ echo ''; } @endphp --> - @php - if(!empty($dataMember->code_perusahaan) == 'VALEIND' && $dataRequestLog->submission_date <= '2025-05-12') { - $imgSrc = 'data:image/png;base64,' . base64_encode(file_get_contents(public_path('images/ttd_dr_vale.png'))); + @php + if(!empty($ttdImage)) { + $imgSrc = 'data:image/png;base64,' . base64_encode(file_get_contents($ttdImage)); echo ''; - } else if(!empty($dataMember->code_perusahaan) == 'VALEIND'){ - $imgSrc = 'data:image/png;base64,' . base64_encode(file_get_contents(public_path('images/ttd_dr_irma_2.png'))); - echo ''; - } + } @endphp
From c32e0dd7793590b305b65fd9244eaf9fdf991fea Mon Sep 17 00:00:00 2001 From: Iqbal Date: Tue, 5 May 2026 13:43:35 +0700 Subject: [PATCH 17/23] feat: add log_type column to request_logs table --- app/Models/RequestLog.php | 1 + ..._log_type_column_to_request_logs_table.php | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 database/migrations/2026_05_04_110554_add_log_type_column_to_request_logs_table.php diff --git a/app/Models/RequestLog.php b/app/Models/RequestLog.php index d415be4f..a0b25c53 100644 --- a/app/Models/RequestLog.php +++ b/app/Models/RequestLog.php @@ -57,6 +57,7 @@ class RequestLog extends Model 'type_of_member', 'nominal', 'approval_nominal_by', + 'log_type', ]; protected $hidden = [ diff --git a/database/migrations/2026_05_04_110554_add_log_type_column_to_request_logs_table.php b/database/migrations/2026_05_04_110554_add_log_type_column_to_request_logs_table.php new file mode 100644 index 00000000..41504927 --- /dev/null +++ b/database/migrations/2026_05_04_110554_add_log_type_column_to_request_logs_table.php @@ -0,0 +1,36 @@ +enum('log_type', ['reference', 'prescription', 'consultation'])->after('dppj')->nullable()->comment('Type of LOG: reference, prescription, or consultation'); + }); + } + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + if(Schema::hasColumn('request_logs', 'log_type')) { + Schema::table('request_logs', function (Blueprint $table) { + $table->dropColumn('log_type'); + }); + } + } +}; From e494fbb8009e8f21f194d1c7ee8a9a7657f81cab Mon Sep 17 00:00:00 2001 From: Iqbal Date: Tue, 5 May 2026 13:44:01 +0700 Subject: [PATCH 18/23] feat: return log_type field in getRequestLog API --- .../Http/Controllers/Api/RequestLogController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php index 66edb01f..45af4fbd 100755 --- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php @@ -237,6 +237,7 @@ class RequestLogController extends Controller 'request_logs.service_code', 'request_logs.specialities_id', 'request_logs.dppj', + 'request_logs.log_type', DB::raw(' CASE WHEN request_logs.status = "requested" THEN "requested" @@ -316,6 +317,7 @@ class RequestLogController extends Controller 'members.id AS member_id', 'request_logs.service_code', 'members.birth_date', + 'request_logs.log_type', DB::raw(' CASE WHEN request_logs.status_final_log = "requested" THEN "requested" From ad111bc61fa4cf67c4b84eea41dc909a14505629 Mon Sep 17 00:00:00 2001 From: Iqbal Date: Tue, 5 May 2026 13:44:15 +0700 Subject: [PATCH 19/23] feat: add translation keys for log type and final log status --- frontend/hospital-portal/src/lang/en-US.json | 4 +++- frontend/hospital-portal/src/lang/id-ID.json | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/hospital-portal/src/lang/en-US.json b/frontend/hospital-portal/src/lang/en-US.json index 84adae4e..56dc8376 100644 --- a/frontend/hospital-portal/src/lang/en-US.json +++ b/frontend/hospital-portal/src/lang/en-US.json @@ -142,7 +142,9 @@ "txtDPPJ": "DPJP", "txtSpecialist": "Specialist", "txtWarningDPPJ": "Please input DPJP", - "txtWarningSpecialist": "Please select Specialist" + "txtWarningSpecialist": "Please select Specialist", + "txtLogType": "LOG Type", + "txtStatusFinalLog": "Final LOG Status" } diff --git a/frontend/hospital-portal/src/lang/id-ID.json b/frontend/hospital-portal/src/lang/id-ID.json index e97fce57..a5e529af 100644 --- a/frontend/hospital-portal/src/lang/id-ID.json +++ b/frontend/hospital-portal/src/lang/id-ID.json @@ -142,5 +142,7 @@ "txtDPPJ": "DPJP", "txtSpecialist": "Spesialis", "txtWarningDPPJ": "Mohon isi DPJP", - "txtWarningSpecialist": "Mohon pilih Spesialis" + "txtWarningSpecialist": "Mohon pilih Spesialis", + "txtLogType": "Tipe LOG", + "txtStatusFinalLog": "Status Final LOG" } From 51018456bc1612ba75d0e68cce192a2fe7a6d3a0 Mon Sep 17 00:00:00 2001 From: Iqbal Date: Tue, 5 May 2026 13:44:39 +0700 Subject: [PATCH 20/23] feat: add log type and final log status columns to request log table --- .../sections/dashboard/TableListReqLog.tsx | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/frontend/hospital-portal/src/sections/dashboard/TableListReqLog.tsx b/frontend/hospital-portal/src/sections/dashboard/TableListReqLog.tsx index 4e11d427..aaabaf13 100644 --- a/frontend/hospital-portal/src/sections/dashboard/TableListReqLog.tsx +++ b/frontend/hospital-portal/src/sections/dashboard/TableListReqLog.tsx @@ -294,6 +294,12 @@ export default function TableList() { label: localeData.txtRequestCode, isSort: true, }, + { + id: 'log_type', + align: 'left', + label: localeData.txtLogType, + isSort: true, + }, { id: 'provider', align: 'left', @@ -318,6 +324,12 @@ export default function TableList() { label: localeData.txtStatus, isSort: true, }, + { + id: 'status_final_log', + align: 'center', + label: localeData.txtStatusFinalLog, + isSort: true, + }, { id: 'action', align: 'right', @@ -399,6 +411,34 @@ export default function TableList() { ...obj, provider:obj.provider, full_name:formatTitleCase(obj.full_name), + log_type: + obj.log_type === 'reference' ? ( + + ) : obj.log_type === 'prescription' ? ( + + ) : obj.log_type === 'consultation' ? ( + + ) : ( + + ), + status_final_log: + obj.final_log === 1 ? ( + + ) : ( + + ), status: obj.status === 'requested' ? ( ), + log_type: + obj.log_type === 'final' ? ( + + ) : obj.log_type === 'prescription' ? ( + + ) : obj.log_type === 'reference' ? ( + + ) : ( + + ), submission_date:
1.