From 7648a7b16e93de4184e7710a62bf68b7384e528d Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Thu, 18 Jan 2024 08:59:42 +0700 Subject: [PATCH 1/2] bugs fix discharge date --- Modules/Internal/Services/RequestLogService.php | 8 ++++++-- app/Models/RequestLog.php | 1 + .../src/pages/AlarmCenter/ServiceMonitoring.tsx | 10 +++++----- public/files/Template Import Request LOG.xlsx | Bin 0 -> 9553 bytes 4 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 public/files/Template Import Request LOG.xlsx diff --git a/Modules/Internal/Services/RequestLogService.php b/Modules/Internal/Services/RequestLogService.php index 52fa864e..b9e071ed 100644 --- a/Modules/Internal/Services/RequestLogService.php +++ b/Modules/Internal/Services/RequestLogService.php @@ -23,6 +23,7 @@ class RequestLogService public $doc_headers_to_field_map = [ "Date Of Request" => "submission_date", "Date Addmission" => "submission_date", + "Date Discharge" => "discharge_date", "Member ID Peserta" => "member_id", "Type of patient" => "service", "Provider Name" => "organization_id", @@ -44,6 +45,7 @@ class RequestLogService public $field_to_doc_headers_map = [ "submission_date" => "Date Of Request", "submission_date" => "Date Addmission", + "discharge_date" => "Date Discharge", "member_id" => "Member ID Peserta", "service" => "Type of patient", "organization_id" => "Provider Name", @@ -64,6 +66,7 @@ class RequestLogService public $result_doc_headers = [ "Date Of Request", "Date Addmission", + "Date Discharge", "Member ID Peserta", "Type of patient", "Provider Name", @@ -84,6 +87,7 @@ class RequestLogService public $listing_doc_headers = [ "Date Of Request", "Date Addmission", + "Date Discharge", "Member ID Peserta", "Type of patient", "Provider Name", @@ -213,7 +217,7 @@ class RequestLogService 'code' => $code, 'member_id' => $member->id, 'submission_date' => $row['submission_date'], - 'discharge_date' => $row['submission_date'], + 'discharge_date' => $row['discharge_date'], 'payment_type' => 'cashless', 'status' => $status, 'status_final_log' => $statusFinalLog, @@ -232,7 +236,7 @@ class RequestLogService 'code' => $code, 'member_id' => $member->id, 'submission_date' => $row['submission_date'], - 'discharge_date' => $row['submission_date'], + 'discharge_date' => $row['discharge_date'], 'payment_type' => 'cashless', 'status' => $status, 'status_final_log' => $statusFinalLog, diff --git a/app/Models/RequestLog.php b/app/Models/RequestLog.php index 20010d10..e8dcf199 100644 --- a/app/Models/RequestLog.php +++ b/app/Models/RequestLog.php @@ -20,6 +20,7 @@ class RequestLog extends Model public $fillable = [ 'uuid', 'submission_date', + 'discharge_date', 'member_id', 'payment_type', 'service_code', diff --git a/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx b/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx index 238caca4..18090a99 100644 --- a/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx +++ b/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx @@ -503,7 +503,7 @@ export default function ServiceMonitoring() { gap={1} > - Amount Incurred : Rp. {fSplit(benefitValue.amountApproved)} + Amount Incurred : Rp {fSplit(benefitValue.amountApproved)} @@ -518,7 +518,7 @@ export default function ServiceMonitoring() { gap={1} > - Amount Approved : Rp. {fSplit(benefitValue.amountApproved)} + Amount Approved : Rp {fSplit(benefitValue.amountApproved)} @@ -533,7 +533,7 @@ export default function ServiceMonitoring() { gap={1} > - Amount Not Approved : Rp. {fSplit(benefitValue.amountNotAprroved)} + Amount Not Approved : Rp {fSplit(benefitValue.amountNotAprroved)} @@ -548,7 +548,7 @@ export default function ServiceMonitoring() { gap={1} > - Excess Paid : Rp. {fSplit(benefitValue.excessPaid)} + Excess Paid : Rp {fSplit(benefitValue.excessPaid)} @@ -563,7 +563,7 @@ export default function ServiceMonitoring() { gap={1} > - Description : Rp. {fSplit(benefitValue.description)} + Description : {benefitValue.description} diff --git a/public/files/Template Import Request LOG.xlsx b/public/files/Template Import Request LOG.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..1dc2fe40d10a6a1aef69668a06fc347048ca55f0 GIT binary patch literal 9553 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 Date: Thu, 18 Jan 2024 09:14:58 +0700 Subject: [PATCH 2/2] update --- Modules/Internal/Http/Controllers/Api/CorporateController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/Internal/Http/Controllers/Api/CorporateController.php b/Modules/Internal/Http/Controllers/Api/CorporateController.php index 9a788854..e4218b27 100644 --- a/Modules/Internal/Http/Controllers/Api/CorporateController.php +++ b/Modules/Internal/Http/Controllers/Api/CorporateController.php @@ -572,7 +572,7 @@ class CorporateController extends Controller case 'template-request-log': return Helper::responseJson([ 'file_name' => "Template Import Request LOG.xlsx.xlsx", - "file_url" => url('files/Template Import Request LOG.xlsx.xlsx') + "file_url" => url('files/Template Import Request LOG.xlsx') ]); break; default: