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

This commit is contained in:
Linksehat Staging Server
2024-01-09 09:32:05 +07:00
10 changed files with 115 additions and 16 deletions

View File

@@ -4,6 +4,7 @@ namespace Modules\Internal\Transformers;
use Illuminate\Http\Resources\Json\JsonResource;
use Illuminate\Support\Str;
use App\Models\Organization;
class RequestLogResource extends JsonResource
{
@@ -18,6 +19,7 @@ class RequestLogResource extends JsonResource
$filesGroupByType = $this->files->mapToGroups(function($file) {
return [Str::slug($file->type, '_') => $file];
});
$provider = Organization::where('id', $this->organization_id)->first();
$data = [
'id' => $this->id,
@@ -25,6 +27,7 @@ class RequestLogResource extends JsonResource
'submission_date' => $this->submission_date,
'member_name' => $this->member->name,
'status' => $this->status ?? 'unknown',
'provider' => $provider ? $provider->name : '-',
'status_final_log' => $this->status_final_log ?? 'unknown',
'service_name' => $this->service ? $this->service->name : '',
'payment_type' => $this->payment_type,

View File

@@ -8,6 +8,7 @@ use App\Models\MemberPlan;
use App\Models\CorporateService;
use App\Models\RequestLogBenefit;
use App\Models\RequestLogMedicine;
use App\Models\Organization;
use App\Models\Exclusion;
use App\Models\Icd;
use App\Helpers\Helper;
@@ -35,12 +36,16 @@ class RequestLogShowResource extends JsonResource
$benefit = CorporateBenefit::with('benefit')->where('plan_id', $planId->id)->get()->toArray();
$benefitDetailLog = RequestLogBenefit::with('benefit')->where('request_log_id', $requestLog['id'])->get()->toArray();
$medicineDetailLog = RequestLogMedicine::where('request_log_id', $requestLog['id'])->get()->toArray();
$provider = Organization::where('id', $requestLog['organization_id'])->first();
if ($provider){
$providerName = $provider->name;
} else {
$providerName = '-';
}
$benefitData = [];
// $benefit = CorporateBenefit::with('benefit')->where('plan_id', $corporateId)->get()->toArray();
// $benefitDetailLog = RequestLogBenefit::with('benefit')->where('request_log_id', $requestLog['id'])->get()->toArray();
// $medicineDetailLog = RequestLogMedicine::where('request_log_id', $requestLog['id'])->get()->toArray();
// $benefitData = [];
if (count($benefit)){
foreach($benefit as $data){
array_push($benefitData, $data['benefit']);
@@ -103,11 +108,13 @@ class RequestLogShowResource extends JsonResource
'exclusion' => $exclusions,
'medicine' => $medicineData,
'files' => $requestLog['files'],
'provider' => $providerName,
'no_identitas' => $requestLog['no_identitas'],
'keterangan' => $requestLog['keterangan'],
'hak_kamar_pasien' => $requestLog['hak_kamar_pasien'],
'penempatan_kamar' => $requestLog['penempatan_kamar'],
'catatan' => $requestLog['catatan'],
];