diff --git a/Modules/Client/Http/Controllers/Api/CorporateMemberController.php b/Modules/Client/Http/Controllers/Api/CorporateMemberController.php index b8d7695d..17387a83 100644 --- a/Modules/Client/Http/Controllers/Api/CorporateMemberController.php +++ b/Modules/Client/Http/Controllers/Api/CorporateMemberController.php @@ -217,7 +217,7 @@ class CorporateMemberController extends Controller 'service:code,name', 'files', ]) - ->find($request_log_id, ['id', 'submission_date', 'discharge_date', 'member_id', 'service_code', 'organization_id']); + ->find($request_log_id, ['id', 'submission_date', 'discharge_date', 'member_id', 'service_code', 'organization_id', 'diagnosis']); $dataBenefit = []; if (count($data->requestLogBenefits) > 0) { diff --git a/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php b/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php index 9af963a7..15e8c74c 100644 --- a/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php +++ b/Modules/Client/Transformers/AlarmCenter/DataServiceMonitoring.php @@ -4,6 +4,7 @@ namespace Modules\Client\Transformers\AlarmCenter; use Illuminate\Http\Resources\Json\JsonResource; use Illuminate\Support\Carbon; +use App\Models\Icd; class DataServiceMonitoring extends JsonResource { @@ -49,6 +50,34 @@ class DataServiceMonitoring extends JsonResource ]; } + $diagnosis = '-'; + $main_diagnosis = '-'; + if ($this->diagnosis){ + $diagnosis = explode(',', $this->diagnosis); + if (count($diagnosis)>0){ + + foreach($diagnosis as $key => $d){ + $icd = Icd::where('code', $d)->first('name'); + if($key == 0){ + if ($icd){ + $main_diagnosis = $icd->name; + } else { + $main_diagnosis = $d; + } + $diagnosis = '-'; + } + + if ($key > 0){ + if ($icd) { + $diagnosis .= $icd->name . ', '; + } else { + $diagnosis .= $d .', '; + } + } + } + } + } + return [ 'companyName' => $this->member->currentCorporate->name ?? null, 'serviceCode' => $this->service_code ?? null, @@ -59,6 +88,8 @@ class DataServiceMonitoring extends JsonResource 'email' => $this->member->email ?? ($this->member->person->email ?? null), 'serviceName' => $this->service->name ?? ($this->service_code ?? null), 'files' => $files, + 'mainDiagnose' => $main_diagnosis, + 'comparativeDiagnosis' => $diagnosis, 'benefits' => collect($this->requestLogBenefits)->map(function ($requestLogBenefit) { return [ 'amountIncurred' => $requestLogBenefit->amount_incurred, diff --git a/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx b/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx index 98105872..0970c76a 100644 --- a/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx +++ b/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx @@ -367,8 +367,15 @@ export default function ServiceMonitoring() { + + + {loading ? : 'Detail Letter Of Guarante'} + + + + @@ -1103,7 +1110,7 @@ export default function ServiceMonitoring() { {data && data.laboratoriumResults && Object.keys(data.laboratoriumResults).length > 0 ? ( - Object.keys(data.dailyMonitorings).map((date, dateIndex) => ( + Object.keys(data.laboratoriumResults).map((date, dateIndex) => ( - {date ? date : '-'} - {data.laboratoriumResults[date].map( - (laboratoriumResult, laboratoriumResultIndex) => ( - - - - - - Date - Examination - Location - {/* */} - - - - - - - - - {laboratoriumResult.examination - ? laboratoriumResult.examination - : '-'} - - - {laboratoriumResult.location - ? laboratoriumResult.location - : '-'} - - {/* - handleDownloadClick(laboratoriumResult.file)} - > - - Download - - - } - /> */} - - -
-
- ) - )} + {date ? date : '-'} + {data.laboratoriumResults[date]?.map((laboratoriumResult, laboratoriumResultIndex) => ( + + + + + + Date + Examination + Location + + + + + + {laboratoriumResult.examination || '-'} + {laboratoriumResult.location || '-'} + {/* + handleDownloadClick(laboratoriumResult.file)}> + Download + + + } + /> */} + + +
+
+ ))}
))