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:
Server D3 Linksehat
2025-02-24 16:03:57 +07:00
parent 66762055da ccd39e4d77
commit b66494194e
37 changed files with 1299 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Modules/HospitalPortal/Http/Controllers/Api/MemberController.php
View File

@@ -37,27 +37,24 @@ class MemberController extends Controller
else
{
$members = DB::table('members')
->leftJoin('member_policies', 'member_policies.member_id', '=', 'members.member_id')
->leftJoin('persons', 'persons.id', '=', 'members.person_id')
->where('members.member_id', '=', $request->no_polis)
->where('members.birth_date', '=', $request->birth_date)
->whereNull('members.deleted_at') // Mengecek apakah deleted_at adalah NULL
->select(
'members.id',
'members.name',
'members.member_id',
'member_policies.policy_id',
'persons.nik',
'members.email',
'members.birth_date',
'members.gender',
'members.marital_status',
'members.language',
'members.race',
'members.relation_with_principal'
)
->first(); // Mengambil hasil pertama
->leftJoin('member_policies', 'member_policies.member_id','=', 'members.member_id')
->leftJoin('persons', 'persons.id', '=', 'members.person_id')
->where('members.member_id', '=', $request->no_polis)
->where('members.birth_date', '=', $request->birth_date)
->select(
'members.id',
'members.name',
'members.member_id',
'member_policies.policy_id',
'persons.nik',
'members.email',
'members.birth_date',
'members.gender',
'members.marital_status',
'members.language',
'members.race',
'members.relation_with_principal')
->first();
if($members)
{
$res_data['members'] = $members;
@@ -134,6 +131,17 @@ class MemberController extends Controller
$res_data['companies'] = $companies;
// specialities
$specialities = DB::table('specialities')
->select(
'specialities.id',
'specialities.name'
)
->orderBy('specialities.name','asc')
->get();
$res_data['specialities'] = $specialities;
return ApiResponse::apiResponse("Success", $res_data, trans('Message.success'), 200);
}

7
Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
View File

@@ -36,6 +36,8 @@ class RequestLogController extends Controller
'address_provider' => !empty($request->address_provider) ? $request->address_provider : null,
'submission_date' => $request->submission_date,
'corporate_id_partner' => !empty($request->corporate_id_partner) ? $request->corporate_id_partner : [],
'specialities_id' => $request->specialities_id,
'dppj' => $request->dppj
];
$validator = Validator::make($request->all(), [
'member_id' => 'required',
@@ -240,6 +242,8 @@ class RequestLogController extends Controller
'request_logs.submission_date',
'request_logs.approved_at')
->paginate($limit);
return response()->json(Helper::paginateResources($results));
}
@@ -338,12 +342,14 @@ class RequestLogController extends Controller
$validator = Validator::make($request->all(), [
'request_logs_id' => 'required',
'discharge_date' => 'required',
'service_code' => 'required',
'result_files.*' => 'sometimes|file|max:10000',
'diagnosa_files.*' => 'sometimes|file|max:10000',
'kondisi_files.*' => 'sometimes|file|max:10000',
], [
'request_logs_id.required' => trans('Validation.required',['attribute' => 'Request Logs ID']),
'discharge_date.required' => trans('Validation.required',['attribute' => 'Discharge Date']),
'service_code.required' => trans('Validation.required',['attribute' => 'Service Code']),
'result_files.*.max' => trans('Validation.max.file', ['attribute' => 'Result Files', 'max' => '10 MB' ]),
'diagnosa_files.*.max' => trans('Validation.max.file', ['attribute' => 'Diagnosis Files', 'max' => '10 MB' ]),
'kondisi_files.*.max' => trans('Validation.max.file', ['attribute' => 'Condition Files', 'max' => '10 MB' ]),
@@ -361,6 +367,7 @@ class RequestLogController extends Controller
->update([
'status_final_log' => 'requested',
'final_log' => 1,
'service_code' =>$request->service_code,
'discharge_date' => $request->discharge_date,
'created_final_by'=> auth()->user()->id,
'created_final_at'=> date('Y-m-d H:i:s'),