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

bugs fix alarm center

Browse Source
This commit is contained in:
Tb Fajri
2024-01-06 15:48:06 +07:00
parent ae9a1f70fc
commit ed10e2ad4a
2 changed files with 8 additions and 4 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; $admissionDate = $historyCareHospital->admission_date;
$dischargeDate = $historyCareHospital->discharge_date; $dischargeDate = $historyCareHospital->discharge_date;
$serviceCode = $historyCareHospital->service_code; $serviceCode = $historyCareHospital->service_code;
$symptoms = $historyCareHospital->symptoms;
$sign = $historyCareHospital->sign;
} else { } else {
$hospital = '-'; $hospital = '-';
$mainDianosis = '-'; $mainDianosis = '-';
@@ -60,6 +62,8 @@ class DataServiceMonitoring extends JsonResource
$admissionDate = '-'; $admissionDate = '-';
$dischargeDate = '-'; $dischargeDate = '-';
$serviceCode = '-'; $serviceCode = '-';
$symptoms = '-';
$sign = '-';
} }
@@ -125,8 +129,8 @@ class DataServiceMonitoring extends JsonResource
"phone" => $member->person->phone, "phone" => $member->person->phone,
"email" => $member->email, "email" => $member->email,
"birth_date" => $member->birth_date, "birth_date" => $member->birth_date,
"symptoms" => $historyCareHospital->symptoms ? $historyCareHospital->symptoms : '-' , "symptoms" => $symptoms,
"sign" => $historyCareHospital->sign ? $historyCareHospital->sign : '-', "sign" => $sign,
"main_diagnose" => $mainDianosis, "main_diagnose" => $mainDianosis,
"main_diagnose_code" => $mainDianosisCode, "main_diagnose_code" => $mainDianosisCode,
"comparative_diagnosis" => $comporatationDiagnosisName, "comparative_diagnosis" => $comporatationDiagnosisName,

4
app/Services/CorporateMemberService.php
View File

@@ -149,10 +149,10 @@ class CorporateMemberService
}); });
}) })
->when($request->input('start_date'), function (Builder $query, $start) { ->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) { ->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) { ->when($request->input('division'), function (Builder $query, $value) {
$query->where('corporate_employees.division_id', $value); $query->where('corporate_employees.division_id', $value);