tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'staging' of https://dev.sismedika.online/febio/aso into staging

Browse Source
This commit is contained in:
Tb Fajri
2024-01-22 13:45:23 +07:00
parent 7b37a06e20 a0e560631a
commit 4e0e801e95
13 changed files with 307 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Client/Http/Controllers/Api/ClaimController.php
View File

@@ -336,7 +336,7 @@ class ClaimController extends Controller
$dataRumahSakit = DB::table('organizations')
->leftJoin('addresses', 'addresses.addressable_id', '=', 'organizations.id')
->where('organizations.id', '=', $item->organization_id)
// ->where('addresses.addressable_type', '=', 'App\Models\Organization')
->where('addresses.addressable_type', '=', 'App\Models\Organization')
->select('organizations.name AS nama_rumahsakit', 'addresses.text AS alamat_rumahsakit')
->first();
//Data Member

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

@@ -27,25 +27,30 @@ class RequestLogController extends Controller
'service_code' => $request->service_code,
'organization_id' => $request->organization_id,
'organization_name' => $request->organization_name,
'address_provider' => $request->address_provider
'address_provider' => $request->address_provider,
'submission_date' => $request->submission_date,
];
$validator = Validator::make($request->all(), [
'member_id' => 'required',
'service_code' => 'required'
'service_code' => 'required',
'submission_date' => 'required'
], [
'member_id.required' => trans('Validation.required',['attribute' => 'Member ID']),
'service_code.required' => trans('Validation.required',['attribute' => 'Service Code']),
'submission_date.required' => trans('Validation.required',['attribute' => 'Submission Date']),
]);
if($request->organization_id)
{
$validator = Validator::make($request->all(), [
'organization_id' => 'required',
'member_id' => 'required',
'service_code' => 'required'
'service_code' => 'required',
'submission_date' => 'required'
], [
'organization_id.required' => trans('Validation.required',['attribute' => 'Provider ID']),
'member_id.required' => trans('Validation.required',['attribute' => 'Member ID']),
'service_code.required' => trans('Validation.required',['attribute' => 'Service Code']),
'submission_date.required' => trans('Validation.required',['attribute' => 'Submission Date']),
]);
}
if ($validator->fails())
@@ -312,12 +317,15 @@ class RequestLogController extends Controller
public function requestFinalLog(Request $request)
{
$data = [
'request_logs_id' => $request->request_logs_id
'request_logs_id' => $request->request_logs_id,
'discharge_date' => $request->discharge_date,
];
$validator = Validator::make($request->all(), [
'request_logs_id' => 'required'
'request_logs_id' => 'required',
'discharge_date' => 'required'
], [
'request_logs_id.required' => trans('Validation.required',['attribute' => 'Request Logs ID'])
'request_logs_id.required' => trans('Validation.required',['attribute' => 'Request Logs ID']),
'discharge_date.required' => trans('Validation.required',['attribute' => 'Discharge Date'])
]);
if ($validator->fails())
{
@@ -331,7 +339,8 @@ class RequestLogController extends Controller
->where('request_logs.id', '=', $request->request_logs_id)
->update([
'status_final_log' => 'requested',
'final_log' => 1
'final_log' => 1,
'discharge_date' => $request->discharge_date,
]);
if ($request->hasFile('result_files')) {
foreach ($request->result_files as $file) {
@@ -502,7 +511,7 @@ class RequestLogController extends Controller
$dataRumahSakit = DB::table('organizations')
->leftJoin('addresses', 'addresses.addressable_id', '=', 'organizations.id')
->where('organizations.id', '=', $dataRequestLog->organization_id)
// ->where('addresses.addressable_type', '=', 'App\Models\Organization')
->where('addresses.addressable_type', '=', 'App\Models\Organization')
->select('organizations.name AS nama_rumahsakit', 'addresses.text AS alamat_rumahsakit')
->first();
@@ -681,7 +690,7 @@ class RequestLogController extends Controller
$dataRumahSakit = DB::table('organizations')
->leftJoin('addresses', 'addresses.addressable_id', '=', 'organizations.id')
->where('organizations.id', '=', $dataRequestLog->organization_id)
// ->where('addresses.addressable_type', '=', 'App\Models\Organization')
->where('addresses.addressable_type', '=', 'App\Models\Organization')
->select('organizations.name AS nama_rumahsakit', 'addresses.text AS alamat_rumahsakit')
->first();

4
Modules/Internal/Http/Controllers/Api/RequestLogController.php
View File

@@ -122,7 +122,7 @@ class RequestLogController extends Controller
member: $member,
paymentType: 'cashless',
serviceCode: $request->service_code,
submissionDate: null,
submissionDate: $request->submission_date,
// status: 'approved',
status: 'requested', // di nonaktifkan dulu auto approved
organization_id: $request->organization_id,
@@ -145,7 +145,7 @@ class RequestLogController extends Controller
member: $member,
paymentType: 'cashless',
serviceCode: $request->service_code,
submissionDate: null,
submissionDate: $request->submission_date,
status: 'requested',
organization_id: $request->organization_id,
source: $request->source