From ae9a1f70fc5fd6c306377a9bae6b354abe84dba6 Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Sat, 6 Jan 2024 15:40:33 +0700 Subject: [PATCH 1/4] bugs fix tanggal start end date alarm center --- .../Dashboard/MemberAlarmCenterResources.php | 4 ++-- app/Services/CorporateMemberService.php | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Modules/Client/Transformers/Dashboard/MemberAlarmCenterResources.php b/Modules/Client/Transformers/Dashboard/MemberAlarmCenterResources.php index 9186f04b..99606aeb 100644 --- a/Modules/Client/Transformers/Dashboard/MemberAlarmCenterResources.php +++ b/Modules/Client/Transformers/Dashboard/MemberAlarmCenterResources.php @@ -19,8 +19,8 @@ class MemberAlarmCenterResources extends JsonResource 'memberId' => $this->member_id, 'fullName' => $this->full_name, 'service' => $this->service_code, - 'start_date' => $this->start_date, - 'end_date' => $this->end_date, + 'start_date' => $this->members_effective_date, + 'end_date' => $this->members_expire_date, 'status' => $this->active, ]; } diff --git a/app/Services/CorporateMemberService.php b/app/Services/CorporateMemberService.php index 1a7c65c7..4c523a61 100644 --- a/app/Services/CorporateMemberService.php +++ b/app/Services/CorporateMemberService.php @@ -174,7 +174,16 @@ class CorporateMemberService $query->getQuery()->orderBy($orderBy, $request->order); }) - ->select(['members.id', 'members.person_id', 'members.member_id', 'members.name', 'members.members_effective_date AS start_date', 'members.members_expire_date AS end_date', 'plans.active', 'plans.service_code']) + ->select([ + 'members.id', + 'members.person_id', + 'members.member_id', + 'members.name', + 'members.members_effective_date', // Use the actual property name + 'members.members_expire_date', // Use the actual property name + 'plans.active', + 'plans.service_code' + ]) ->selectRaw("(select sum(`claims`.`total_claim`) from `claims` where `members`.`id` = `claims`.`member_id` AND `claims`.`deleted_at` IS NULL) AS `claims_sum_total_claim`") ->paginate($limit); } From ed10e2ad4a5ea55dcf56920bc7102e8b1d9f2610 Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Sat, 6 Jan 2024 15:48:06 +0700 Subject: [PATCH 2/4] bugs fix alarm center --- .../Transformers/AlarmCenter/DataServiceMonitoring.php | 8 ++++++-- app/Services/CorporateMemberService.php | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php b/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php index 40863b23..4922f3eb 100644 --- a/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php +++ b/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php @@ -51,6 +51,8 @@ class DataServiceMonitoring extends JsonResource $admissionDate = $historyCareHospital->admission_date; $dischargeDate = $historyCareHospital->discharge_date; $serviceCode = $historyCareHospital->service_code; + $symptoms = $historyCareHospital->symptoms; + $sign = $historyCareHospital->sign; } else { $hospital = '-'; $mainDianosis = '-'; @@ -60,6 +62,8 @@ class DataServiceMonitoring extends JsonResource $admissionDate = '-'; $dischargeDate = '-'; $serviceCode = '-'; + $symptoms = '-'; + $sign = '-'; } @@ -125,8 +129,8 @@ class DataServiceMonitoring extends JsonResource "phone" => $member->person->phone, "email" => $member->email, "birth_date" => $member->birth_date, - "symptoms" => $historyCareHospital->symptoms ? $historyCareHospital->symptoms : '-' , - "sign" => $historyCareHospital->sign ? $historyCareHospital->sign : '-', + "symptoms" => $symptoms, + "sign" => $sign, "main_diagnose" => $mainDianosis, "main_diagnose_code" => $mainDianosisCode, "comparative_diagnosis" => $comporatationDiagnosisName, diff --git a/app/Services/CorporateMemberService.php b/app/Services/CorporateMemberService.php index 4c523a61..76288efa 100644 --- a/app/Services/CorporateMemberService.php +++ b/app/Services/CorporateMemberService.php @@ -149,10 +149,10 @@ class CorporateMemberService }); }) ->when($request->input('start_date'), function (Builder $query, $start) { - $query->where('member_plans.start', '>=', $start); + $query->where('members_effective_date.start', '>=', $start); }) ->when($request->input('end_date'), function (Builder $query, $end) { - $query->where('member_plans.end', '<', $end); + $query->where('members_expire_date.end', '<', $end); }) ->when($request->input('division'), function (Builder $query, $value) { $query->where('corporate_employees.division_id', $value); From 8e8b123f08f5e5ee6ed3d69d9b2a17d39d8e5ac0 Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Sat, 6 Jan 2024 15:52:27 +0700 Subject: [PATCH 3/4] update bux service monitoring --- .../client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx b/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx index 9b75ce5d..acbf7e28 100644 --- a/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx +++ b/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx @@ -400,7 +400,7 @@ export default function ServiceMonitoring() { - {fDateSuffix(row.date)} + {row.date ? fDateSuffix(row.date) : '-'} @@ -530,7 +530,7 @@ export default function ServiceMonitoring() { - + {list.examination} {list.location} From c7ca83bd5704bb1b8525a6e59f8ce4351ed89820 Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Sat, 6 Jan 2024 15:58:13 +0700 Subject: [PATCH 4/4] update --- .../client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx b/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx index acbf7e28..288f41ee 100644 --- a/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx +++ b/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx @@ -187,7 +187,7 @@ export default function ServiceMonitoring() { useEffect(() => { (async () => { - await new Promise((resolve) => setTimeout(resolve, 250)); + // await new Promise((resolve) => setTimeout(resolve, 250)); const response = await axios.get(`${corporateValue}/service-monitoring/${id}`); setData(response.data.data);