From ed10e2ad4a5ea55dcf56920bc7102e8b1d9f2610 Mon Sep 17 00:00:00 2001
From: Tb Fajri <tubagus@sismedika.com>
Date: Sat, 6 Jan 2024 15:48:06 +0700
Subject: [PATCH] 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);