diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php index 7d3bdb2f..82acb9cb 100644 --- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php @@ -71,33 +71,33 @@ class RequestLogController extends Controller // Membuat kode organisasi $kodeOrganisasi = "ORG000" . $singkatan; - + // Insert data ke tabel organizations $organization_id = DB::table('organizations') ->insertGetId([ 'name' => $request->organization_name, - 'code' => $kodeOrganisasi, - 'type' => 'hospital', + 'code' => $kodeOrganisasi, + 'type' => 'hospital', 'created_at' => now(), 'created_by' => auth()->user()->id ]); - + // Insert data ke tabel addresses $address_id = DB::table('addresses') ->insertGetId([ - 'text'=> $request->address_provider, - 'addressable_type' => 'App\Models\Organization', + 'text'=> $request->address_provider, + 'addressable_type' => 'App\Models\Organization', 'addressable_id' => $organization_id, - 'type' => 'hospital', + 'type' => 'hospital', 'created_at' => now(), 'created_by' => auth()->user()->id ]); - + // Update main_address_id di tabel organizations DB::table('organizations') ->where('organizations.id', '=', $organization_id) ->update(['main_address_id' => $address_id]); - + // Commit transaksi DB::commit(); $request->merge(['organization_id' => $organization_id]); @@ -144,7 +144,7 @@ class RequestLogController extends Controller } catch (\Exception $e) { // Rollback transaksi jika terjadi kesalahan DB::rollBack(); - + // Handle error, bisa di-log atau dikembalikan sebagai response return ApiResponse::apiResponse('Server Error', $data, $e->getMessage(), 500); } @@ -178,11 +178,11 @@ class RequestLogController extends Controller }) ->when($request->input('status'), function ($query, $status) { $query->where(function ($query) use ($status) { - + if ($status === 'requested') { $query->where('request_logs.status', '=', 'requested'); } - + if ($status === 'reviewed') { $query->where('request_logs.status', '=', 'approved'); } @@ -194,29 +194,29 @@ class RequestLogController extends Controller if ($status === 'declined') { $query->where('request_logs.status', '=', 'declined'); } - + }); }) ->select( 'request_logs.id', 'request_logs.member_id', 'request_logs.final_log', - 'request_logs.code', - 'members.name as full_name', + 'request_logs.code', + 'members.name as full_name', 'members.member_id as no_polis', 'members.birth_date', DB::raw(' - CASE + CASE WHEN request_logs.status = "requested" THEN "requested" WHEN request_logs.status = "approved" THEN "approved" WHEN request_logs.status = "declined" THEN "declined" WHEN request_logs.status = "reviewed" THEN "reviewed" - ELSE "" + ELSE "" END AS status '), DB::raw(' (SELECT organizations.name FROM organizations WHERE organizations.id = request_logs.organization_id LIMIT 1) AS provider - '), + '), 'request_logs.submission_date') ->paginate($limit); return response()->json(Helper::paginateResources($results)); @@ -250,11 +250,11 @@ class RequestLogController extends Controller }) ->when($request->input('status'), function ($query, $status) { $query->where(function ($query) use ($status) { - + if ($status === 'requested') { $query->where('request_logs.status_final_log', '=', 'requested'); } - + if ($status === 'reviewed') { $query->where('request_logs.status_final_log', '=', 'approved'); } @@ -266,39 +266,39 @@ class RequestLogController extends Controller if ($status === 'declined') { $query->where('request_logs.status_final_log', '=', 'declined'); } - + }); }) ->where('request_logs.final_log', '=', 1) ->select( 'request_logs.id', 'request_logs.final_log', - 'request_logs.code', - 'members.name as full_name', + 'request_logs.code', + 'members.name as full_name', 'members.member_id as no_polis', 'members.id AS member_id', 'request_logs.service_code', 'members.birth_date', DB::raw(' - CASE + CASE WHEN request_logs.status_final_log = "requested" THEN "requested" WHEN request_logs.status_final_log = "approved" THEN "approved" WHEN request_logs.status_final_log = "declined" THEN "declined" WHEN request_logs.status_final_log = "reviewed" THEN "reviewed" - ELSE "" + ELSE "" END AS status - '), + '), 'request_logs.submission_date', DB::raw(' - CASE + CASE WHEN service_code = "OP" THEN "Outpatient" WHEN service_code = "IP" THEN "Inpatient" - ELSE "" + ELSE "" END AS service_type '), DB::raw(' (SELECT organizations.name FROM organizations WHERE organizations.id = request_logs.organization_id LIMIT 1) AS provider - '), + '), DB::raw(' (Select request_log_id FROM claim_requests WHERE claim_requests.request_log_id = request_logs.id LIMIT 1) AS check_claim ') @@ -428,7 +428,7 @@ class RequestLogController extends Controller 'members.nric', 'members.id', 'members.principal_id', - 'members.name', + 'members.name', 'members.birth_date', 'members.member_id', 'members.gender', @@ -439,15 +439,15 @@ class RequestLogController extends Controller "LinkSehat" AS penjamin '), DB::raw(' - (Select corporates.name FROM corporates + (Select corporates.name FROM corporates LEFT JOIN corporate_employees ON corporate_employees.corporate_id = corporates.id WHERE corporate_employees.member_id = members.id LIMIT 1) AS nama_perusahaan '), DB::raw(' - (Select corporates.id FROM corporates + (Select corporates.id FROM corporates LEFT JOIN corporate_employees ON corporate_employees.corporate_id = corporates.id WHERE corporate_employees.member_id = members.id LIMIT 1) AS id_perusahaan - '), + '), DB::raw(' (Select services.name FROM services WHERE services.code = "'.$dataRequestLog->service_code.'" LIMIT 1) AS jenis_perwatan @@ -459,12 +459,12 @@ class RequestLogController extends Controller (Select member_policies.status FROM member_policies WHERE member_policies.member_id = members.member_id LIMIT 1) AS status_polis '), DB::raw(' - (Select plans.code FROM member_plans + (Select plans.code FROM member_plans LEFT JOIN plans ON plans.id = member_plans.plan_id WHERE member_plans.member_id = members.id AND plans.service_code = "'.$dataRequestLog->service_code.'" LIMIT 1) AS code_plan '), DB::raw(' - (Select plans.limit_rules FROM member_plans + (Select plans.limit_rules FROM member_plans LEFT JOIN plans ON plans.id = member_plans.plan_id WHERE member_plans.member_id = members.id LIMIT 1) AS limit_rules '), @@ -473,20 +473,20 @@ class RequestLogController extends Controller '), 'members.members_effective_date AS mulai', 'members.members_expire_date AS akhir' - ) + ) ->first(); - $data['namaKaryawan'] = ''; + $data['namaKaryawan'] = ''; if($dataMember->principal_id) { $dataNamaKaryawan = DB::table('members') ->where('members.member_id', '=', $dataMember->principal_id) ->select('members.name') ->first(); - $data['namaKaryawan'] = $dataNamaKaryawan->name; + $data['namaKaryawan'] = $dataNamaKaryawan->name; } else{ $data['namaKaryawan'] = $dataMember->name; - } + } $data['dataMember'] = $dataMember; @@ -545,7 +545,7 @@ class RequestLogController extends Controller // Halaman 1 $html1 = view('pdf.req_log_page_1', $data); - + // Halaman 2 // $html2 = view('pdf.req_log_page_2', $data); @@ -555,10 +555,10 @@ class RequestLogController extends Controller $pdf->loadHtml($htmlCombined); $pdf->render(); - + $headers = [ 'Content-Type' => 'application/pdf', - 'Content-Disposition' => 'inline; filename="file.pdf"', + 'Content-Disposition' => 'inline; filename="file.pdf"', ]; return response($pdf->output(), 200, $headers); @@ -576,7 +576,7 @@ class RequestLogController extends Controller 'members.nric', 'members.id', 'members.principal_id', - 'members.name', + 'members.name', 'members.birth_date', 'members.member_id', 'members.gender', @@ -587,12 +587,12 @@ class RequestLogController extends Controller "LinkSehat" AS penjamin '), DB::raw(' - (Select corporates.name FROM corporates + (Select corporates.name FROM corporates LEFT JOIN corporate_employees ON corporate_employees.corporate_id = corporates.id WHERE corporate_employees.member_id = members.id LIMIT 1) AS nama_perusahaan '), DB::raw(' - (Select corporates.id FROM corporates + (Select corporates.id FROM corporates LEFT JOIN corporate_employees ON corporate_employees.corporate_id = corporates.id WHERE corporate_employees.member_id = members.id LIMIT 1) AS id_perusahaan '), @@ -607,12 +607,12 @@ class RequestLogController extends Controller (Select member_policies.status FROM member_policies WHERE member_policies.member_id = members.member_id LIMIT 1) AS status_polis '), DB::raw(' - (Select plans.code FROM member_plans + (Select plans.code FROM member_plans LEFT JOIN plans ON plans.id = member_plans.plan_id WHERE member_plans.member_id = members.id AND plans.service_code = "'.$dataRequestLog->service_code.'" LIMIT 1) AS code_plan '), DB::raw(' - (Select plans.limit_rules FROM member_plans + (Select plans.limit_rules FROM member_plans LEFT JOIN plans ON plans.id = member_plans.plan_id WHERE member_plans.member_id = members.id LIMIT 1) AS limit_rules '), @@ -621,9 +621,9 @@ class RequestLogController extends Controller '), 'members.members_effective_date AS mulai', 'members.members_expire_date AS akhir' - ) + ) ->first(); - $data['namaKaryawan'] = ''; + $data['namaKaryawan'] = ''; if($dataMember->principal_id) { $dataNamaKaryawan = DB::table('members') @@ -631,11 +631,11 @@ class RequestLogController extends Controller ->select('members.name') ->limit(1) ->first(); - $data['namaKaryawan'] = $dataNamaKaryawan->name; + $data['namaKaryawan'] = $dataNamaKaryawan->name; } else{ $data['namaKaryawan'] = $dataMember->name; - } + } $data['dataMember'] = $dataMember; @@ -658,7 +658,7 @@ class RequestLogController extends Controller $data['dataClaimLog'] = $dataClaimLog; - + $dataRumahSakit = DB::table('organizations') ->leftJoin('addresses', 'addresses.addressable_id', '=', 'organizations.id') ->where('organizations.id', '=', $dataRequestLog->organization_id) @@ -710,7 +710,7 @@ class RequestLogController extends Controller // Halaman 1 $html1 = view('pdf.final_log_page_1', $data); - + // Halaman 2 $html2 = view('pdf.final_log_page_2', $data); @@ -719,10 +719,10 @@ class RequestLogController extends Controller $pdf->loadHtml($htmlCombined); $pdf->render(); - + $headers = [ 'Content-Type' => 'application/pdf', - 'Content-Disposition' => 'inline; filename="file.pdf"', + 'Content-Disposition' => 'inline; filename="file.pdf"', ]; return response($pdf->output(), 200, $headers); diff --git a/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php b/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php index dbb941ee..ef4f23ab 100644 --- a/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php +++ b/Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php @@ -42,7 +42,7 @@ class DailyMonitoringController extends Controller ->leftJoin('members', 'request_logs.member_id', '=', 'members.id') ->leftJoin('member_plans', 'request_logs.member_id', '=', 'member_plans.member_id') ->leftJoin('organizations', 'organizations.id', '=', 'request_logs.organization_id') - ->select('members.member_id','members.name','member_plans.start AS startdate','member_plans.end AS enddate', 'request_logs.submission_date as addmision_date', 'organizations.name as provider' ) + ->select('members.member_id','members.name','members.members_effective_date AS startdate','members.members_expire_date AS enddate', 'request_logs.submission_date as addmision_date', 'organizations.name as provider' ) ->where('request_logs.service_code', 'IP') ->where('request_logs.status_final_log', 'approved') ->groupBy('request_logs.member_id') @@ -118,7 +118,7 @@ class DailyMonitoringController extends Controller public function AddDetailMonitoringList(Request $request, $claim_code) { $request->merge(['claim_code' => $claim_code]); - + // validation rule $validator = Validator::make($request->all(),[ 'claim_code' => 'required|exists:claim_requests,code', @@ -145,7 +145,7 @@ class DailyMonitoringController extends Controller ->select('id') ->where('code', $claim_code) ->first(); - + // get claim $claim = DB::table('claims') ->select('id') @@ -219,7 +219,7 @@ class DailyMonitoringController extends Controller public function AddDetailMonitoringListRequestLog(Request $request, $request_code) { $request->merge(['request_code' => $request_code]); - + // validation rule $validator = Validator::make($request->all(),[ 'request_code' => 'required|exists:request_logs,code', @@ -319,7 +319,7 @@ class DailyMonitoringController extends Controller 'extension' => $extension, 'path' => $path, ]); - + } } if ($request->medical_action_letter){ @@ -337,7 +337,7 @@ class DailyMonitoringController extends Controller 'extension' => $extension, 'path' => $path, ]); - + // $file->storeAs($this->path_for_store, $fileName); } } @@ -356,7 +356,7 @@ class DailyMonitoringController extends Controller 'extension' => $extension, 'path' => $path, ]); - + // $file->storeAs($this->path_for_store, $fileName); } } @@ -389,10 +389,10 @@ class DailyMonitoringController extends Controller $request_log = DB::table('request_logs') ->where('code', $request_code) ->update([ - 'discharge_date' => now(), + 'discharge_date' => now(), 'updated_by' => auth()->user()->id, 'updated_at' => now() - ]); + ]); if ($request_log) { return response()->json([ 'error' => false, diff --git a/Modules/Internal/Http/Controllers/Api/RequestLogController.php b/Modules/Internal/Http/Controllers/Api/RequestLogController.php index 414d9837..fa9d2a89 100644 --- a/Modules/Internal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/Internal/Http/Controllers/Api/RequestLogController.php @@ -32,6 +32,7 @@ use App\Models\FilesMcu; use Illuminate\Support\Facades\DB; use App\Models\Member; use Modules\Internal\Services\RequestLogService; +use App\Services\RequestLogService as AppRequestLogService; class RequestLogController extends Controller { @@ -42,9 +43,9 @@ class RequestLogController extends Controller * @return Renderable */ - public function __construct(RequestLogService $requestLogService) + public function __construct() { - $this->requestLogService = $requestLogService; + $this->requestLogService = New RequestLogService; } public function index(Request $request) @@ -115,7 +116,7 @@ class RequestLogController extends Controller ){ DB::beginTransaction(); try { - $newRequestLog = RequestLogService::storeRequestLog( + $newRequestLog = AppRequestLogService::storeRequestLog( row: [], code: $code, member: $member, @@ -138,7 +139,7 @@ class RequestLogController extends Controller } else { DB::beginTransaction(); try { - $newRequestLog = RequestLogService::storeRequestLog( + $newRequestLog = AppRequestLogService::storeRequestLog( row: [], code: $code, member: $member, @@ -459,7 +460,7 @@ class RequestLogController extends Controller $file_name = now()->getPreciseTimestamp(3) . '-' . $request->file('file')->getClientOriginalName(); $file = $request->file('file')->storeAs('temp', $file_name); - + $reader = ReaderEntityFactory::createXLSXReader(Storage::path('temp/' . $file_name)); $reader->open(Storage::path('temp/' . $file_name)); diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index c94d5705..e41efe7a 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -394,6 +394,7 @@ class Helper ini_set('post_max_size', '32M'); // Batas post Yang di Upload ini_set('upload_max_filesize', '10M'); // Batas File yang di Upload ini_set('max_input_time ', '-1'); // Batas max time menunggu input max 5 menit + ini_set('memory_limit', '256M'); } }