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-02-09 09:47:31 +07:00
parent fd5ad65487 e2e0fc52fc
commit 81ad0f4dc6
4 changed files with 48 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -491,8 +491,8 @@ class ClaimController extends Controller
!empty($item_benefit->amount_not_approved) ? $item_benefit->amount_not_approved : '',
!empty($item_benefit->excess_paid) ? $item_benefit->excess_paid : '',
!empty($item->diagnosis) ? $item->diagnosis : '',
!empty($item->catatan) ? $item->catatan : '',
!empty($item->keterangan) ? $item->keterangan : '',
!empty($item->catatan) ? $item->catatan : '',
];
array_push($dataRow,$rowData);

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

@@ -26,10 +26,10 @@ class RequestLogController extends Controller
'member_id' => $request->member_id,
'service_code' => $request->service_code,
'organization_id' => $request->organization_id,
'organization_name' => $request->organization_name,
'address_provider' => $request->address_provider,
'organization_name' => !empty($request->organization_name) ? $request->organization_name : null,
'address_provider' => !empty($request->address_provider) ? $request->address_provider : null,
'submission_date' => $request->submission_date,
'corporate_id_partner' => $request->corporate_id_partner,
'corporate_id_partner' => !empty($request->corporate_id_partner) ? $request->corporate_id_partner : [],
];
$validator = Validator::make($request->all(), [
'member_id' => 'required',
@@ -40,7 +40,7 @@ class RequestLogController extends Controller
'service_code.required' => trans('Validation.required',['attribute' => 'Service Code']),
'submission_date.required' => trans('Validation.required',['attribute' => 'Submission Date']),
]);
if($request->organization_id)
if(!empty($request->organization_id))
{
$validator = Validator::make($request->all(), [
'organization_id' => 'required',
@@ -62,7 +62,7 @@ class RequestLogController extends Controller
{
//insert data to organization
try {
if(!$request->organization_id)
if (!empty($request->organization_name) && !empty($request->address_provider))
{
// Memulai transaksi
DB::beginTransaction();
@@ -111,49 +111,54 @@ class RequestLogController extends Controller
}
$requestLogControllerInstance = new PrimeCenterRequestLog();
$response = $requestLogControllerInstance->createNew($request);
if($response->original['statusCode'] == 200)
{
//send email
// Insert data notifications
$emailTo = 'alarm.center@linksehat.com';
$dataNotif = [
'email' => $emailTo,
'title' => 'Request LOG',
'description' => 'Request LOG from Hospital Portal',
'type' => 1,
'isUnRead' => true,
'created_by' => auth()->user()->id,
'created_at' => date('Y-m-d H:i:s'),
'updated_at' => date('Y-m-d H:i:s'),
];
$sendNotif = Helper::insertNotification($dataNotif);
// Send Email after insert notifications
if($sendNotif)
try {
$response = $requestLogControllerInstance->createNew($request);
if($response->original['statusCode'] == 200)
{
//send to alarm
$nameTo = 'Admin LinkSehat';
$dataEmail = [
//send email
// Insert data notifications
$emailTo = 'alarm.center@linksehat.com';
$dataNotif = [
'email' => $emailTo,
'name' => $nameTo,
'subject' => 'Request LOG from Hospital Portal'. ' '.date('Y-m-d H:i:s'),
'body' => View::make('email/notif_email', ['name' => $nameTo, 'link' => 'https://primecenter.linksehat.com/'])->render(),
'title' => 'Request LOG',
'description' => 'Request LOG from Hospital Portal',
'type' => 1,
'isUnRead' => true,
'created_by' => auth()->user()->id,
'created_at' => date('Y-m-d H:i:s'),
'updated_at' => date('Y-m-d H:i:s'),
];
Helper::sendEmail($dataEmail);
$sendNotif = Helper::insertNotification($dataNotif);
// Send Email after insert notifications
if($sendNotif)
{
//send to alarm
$nameTo = 'Admin LinkSehat';
$dataEmail = [
'email' => $emailTo,
'name' => $nameTo,
'subject' => 'Request LOG from Hospital Portal'. ' '.date('Y-m-d H:i:s'),
'body' => View::make('email/notif_email', ['name' => $nameTo, 'link' => 'https://primecenter.linksehat.com/'])->render(),
];
Helper::sendEmail($dataEmail);
}
return ApiResponse::apiResponse("Success", $data, trans('Message.success'), 200);
}
return ApiResponse::apiResponse("Success", $data, trans('Message.success'), 200);
}
else
{
return ApiResponse::apiResponse('Server Error', $data, trans('Message.server_error'), 500);
else
{
return ApiResponse::apiResponse('requestLogControllerInstance1', $data, trans('Message.server_error'), 500);
}
} catch (\Exception $e) {
// Tangani kesalahan di sini
return ApiResponse::apiResponse('requestLogControllerInstance2', $data, $e->getMessage(), 500);
}
} 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);
return ApiResponse::apiResponse('requestLogControllerInstance3', $data, $e->getMessage(), 500);
}
}
}

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

@@ -106,7 +106,7 @@ class RequestLogController extends Controller
]);
if ($request->member_id){
$code = $this->getNextCode($request);
$code = !empty($this->getNextCode($request)) ? $this->getNextCode($request) : '0000';
$member = Member::find($request->member_id);
$memberValid = false;

6
frontend/hospital-portal/src/sections/dashboard/DialogFinalLog.tsx
View File

@@ -196,7 +196,7 @@ export default function DialogFinalLog({ member, getData, onClose, handleSubmitS
style={{ display: 'none' }}
multiple
onChange={handleKondisiInputChange}
accept="application/pdf"
accept="application/pdf,image/*"
/>
</ButtonBase>
</Stack>
@@ -257,7 +257,7 @@ export default function DialogFinalLog({ member, getData, onClose, handleSubmitS
style={{ display: 'none' }}
multiple
onChange={handleDiagnosaInputChange}
accept="application/pdf"
accept="application/pdf,image/*"
/>
</ButtonBase>
</Stack>
@@ -318,7 +318,7 @@ export default function DialogFinalLog({ member, getData, onClose, handleSubmitS
style={{ display: 'none' }}
multiple
onChange={handleResultInputChange}
accept="application/pdf"
accept="application/pdf,image/*"
/>
</ButtonBase>
</Stack>