update bugs fix detail final log
This commit is contained in:
@@ -11,6 +11,7 @@ use App\Models\RequestLogMedicine;
|
||||
use App\Models\Exclusion;
|
||||
use App\Models\Icd;
|
||||
use App\Helpers\Helper;
|
||||
use App\Models\CorporatePolicy;
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
|
||||
class RequestLogShowResource extends JsonResource
|
||||
@@ -42,6 +43,7 @@ class RequestLogShowResource extends JsonResource
|
||||
array_push($medicineData, $data);
|
||||
}
|
||||
}
|
||||
|
||||
// Service Rule
|
||||
$corporateService = CorporateService::query()
|
||||
->where('corporate_id', $corporateId)
|
||||
@@ -51,7 +53,7 @@ class RequestLogShowResource extends JsonResource
|
||||
$config = [];
|
||||
if ($corporateService) {
|
||||
$config = $corporateService->configs->pluck('value', 'name')->toArray();
|
||||
}
|
||||
}
|
||||
|
||||
// Exclusion Service or diagnosis
|
||||
$exclusions = Exclusion::query()
|
||||
@@ -60,15 +62,21 @@ class RequestLogShowResource extends JsonResource
|
||||
->with(['exclusionable', 'rules'])
|
||||
->get()->toArray();
|
||||
|
||||
// Policy Number
|
||||
$policyNumber = CorporatePolicy::query()
|
||||
->where('corporate_id', $corporateId)
|
||||
->first();
|
||||
|
||||
|
||||
$data = [
|
||||
'id' => $requestLog['id'],
|
||||
'code' => $requestLog['code'],
|
||||
'member_id' => $requestLog['member']['member_id'],
|
||||
'policy_number' => $requestLog['member']['current_policy']['code'],
|
||||
'policy_number' =>$policyNumber->code ? $policyNumber->code : '-',
|
||||
'name' => $requestLog['member']['name'],
|
||||
'date_of_birth' => $requestLog['member']['birth_date'],
|
||||
'gender' => $requestLog['member']['gender'],
|
||||
'marital_status' => Helper::maritalNormalization($requestLog['member']['marital_status']),
|
||||
'marital_status' => $requestLog['member']['status_marital'],
|
||||
'member_type' => Helper::memberType($requestLog['member']['record_type']),
|
||||
'principal_id' => $requestLog['member']['principal_id'] ? $requestLog['member']['principal_id'] : '-',
|
||||
'principal_name' => $requestLog['member']['principal_id'] ? Helper::principalName($requestLog['member']['principal_id']) : '-',
|
||||
@@ -84,7 +92,7 @@ class RequestLogShowResource extends JsonResource
|
||||
'exclusion' => $exclusions,
|
||||
'medicine' => $medicineData,
|
||||
'files' => $requestLog['files'],
|
||||
|
||||
|
||||
|
||||
];
|
||||
|
||||
|
||||
@@ -245,31 +245,6 @@ class Member extends Model
|
||||
);
|
||||
}
|
||||
|
||||
protected function maritalStatus(): Attribute
|
||||
{
|
||||
if ($this->relationLoaded('person')) {
|
||||
$marital_status = $this->person->marital_status ?? ($this->marital_status ?? null);
|
||||
|
||||
if ($marital_status === 'M') {
|
||||
$marital_status = 'Menikah';
|
||||
}
|
||||
|
||||
return Attribute::make(
|
||||
get: fn () => $marital_status
|
||||
);
|
||||
} else {
|
||||
$marital_status = $this->marital_status ?? null;
|
||||
|
||||
if ($marital_status === 'M') {
|
||||
$marital_status = 'Menikah';
|
||||
}
|
||||
|
||||
return Attribute::make(
|
||||
get: fn () => $marital_status
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
protected function relationship(): Attribute
|
||||
{
|
||||
$relation = null;
|
||||
|
||||
Reference in New Issue
Block a user