tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into origin/production

Browse Source
This commit is contained in:
Linksehat Staging Server
2024-01-06 16:29:27 +07:00
parent 887fa4aa71 c7ca83bd57
commit 4b412fa5d2
4 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php
View File

@@ -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,

4
Modules/Client/Transformers/Dashboard/MemberAlarmCenterResources.php
View File

@@ -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,
];
}