Merge branch 'staging' of https://dev.sismedika.online/febio/aso into staging
This commit is contained in:
@@ -44,12 +44,12 @@ class MemberController extends Controller
|
||||
->select(
|
||||
'members.id',
|
||||
'members.name',
|
||||
'members.member_id',
|
||||
'members.member_id',
|
||||
'member_policies.policy_id',
|
||||
'persons.nik',
|
||||
'members.email',
|
||||
'members.birth_date',
|
||||
'members.gender',
|
||||
'persons.nik',
|
||||
'members.email',
|
||||
'members.birth_date',
|
||||
'members.gender',
|
||||
'members.marital_status',
|
||||
'members.language',
|
||||
'members.race',
|
||||
@@ -119,14 +119,26 @@ 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);
|
||||
}
|
||||
else
|
||||
{
|
||||
return ApiResponse::apiResponse("Data Not Found", $data, trans('Message.not_found'), 404);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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',
|
||||
@@ -119,7 +121,7 @@ class RequestLogController extends Controller
|
||||
$requestLogControllerInstance = new PrimeCenterRequestLog();
|
||||
try {
|
||||
$response = $requestLogControllerInstance->createNew($request);
|
||||
|
||||
|
||||
if($response->original['statusCode'] == 200)
|
||||
{
|
||||
//send email
|
||||
@@ -361,7 +363,7 @@ class RequestLogController extends Controller
|
||||
->update([
|
||||
'status_final_log' => 'requested',
|
||||
'final_log' => 1,
|
||||
'discharge_date' => $request->discharge_date,
|
||||
'discharge_date' => $request->discharge_date,
|
||||
'created_final_by'=> auth()->user()->id,
|
||||
'created_final_at'=> date('Y-m-d H:i:s'),
|
||||
]);
|
||||
@@ -785,7 +787,7 @@ class RequestLogController extends Controller
|
||||
$dataDiagnosis = [];
|
||||
if($dataRequestLog->diagnosis)
|
||||
{
|
||||
$dataDiagnosiCodes = explode(',', $dataRequestLog->diagnosis);
|
||||
$dataDiagnosiCodes = explode(',', $dataRequestLog->diagnosis);
|
||||
foreach ($dataDiagnosiCodes as $diagnosisCode)
|
||||
{
|
||||
$diagnoisis = DB::table('icd')
|
||||
@@ -796,8 +798,8 @@ class RequestLogController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
$data['dataDiagnosis'] = $dataDiagnosis;
|
||||
|
||||
$data['dataDiagnosis'] = $dataDiagnosis;
|
||||
|
||||
|
||||
$pdf = new Dompdf();
|
||||
|
||||
@@ -848,7 +850,7 @@ class RequestLogController extends Controller
|
||||
->where('id', '=', $request_logs_id)
|
||||
->select('id', 'member_id', 'service_code')
|
||||
->first();
|
||||
|
||||
|
||||
$check_claim_requests = DB::table('claim_requests')
|
||||
->where('claim_requests.request_log_id', '=', $request_logs_id)
|
||||
->first();
|
||||
@@ -860,12 +862,12 @@ class RequestLogController extends Controller
|
||||
$requestLogData = RequestLog::where('id',$request_logs_id)->first();
|
||||
$organization = Organization::where(['id' => $requestLogData->organization_id, 'type' => 'hospital'])->first('code');
|
||||
$provideCode = $organization ? $organization->code : '';
|
||||
|
||||
|
||||
$newClaimRequest = ClaimRequestService::storeClaimRequest(
|
||||
row: [],
|
||||
code: $code,
|
||||
member: $member,
|
||||
paymentType: 'cashless',
|
||||
row: [],
|
||||
code: $code,
|
||||
member: $member,
|
||||
paymentType: 'cashless',
|
||||
serviceCode: $data_req_logs->service_code,
|
||||
requestLogID: $request_logs_id,
|
||||
organization_code: $provideCode,
|
||||
@@ -877,7 +879,7 @@ class RequestLogController extends Controller
|
||||
'type' => 'info',
|
||||
'system_origin' => 'hospital-portal'
|
||||
]);
|
||||
|
||||
|
||||
// Claim Log
|
||||
DB::table('claim_logs')
|
||||
->insert([
|
||||
|
||||
@@ -149,7 +149,9 @@ class RequestLogController extends Controller
|
||||
// status: 'approved',
|
||||
status: 'requested', // di nonaktifkan dulu auto approved
|
||||
organization_id: $request->organization_id,
|
||||
source: $request->source
|
||||
source: $request->source,
|
||||
specialities_id: $request->specialities_id,
|
||||
dppj: $request->dppj
|
||||
);
|
||||
|
||||
DB::commit();
|
||||
@@ -171,7 +173,9 @@ class RequestLogController extends Controller
|
||||
submissionDate: $request->submission_date,
|
||||
status: 'requested',
|
||||
organization_id: $request->organization_id,
|
||||
source: $request->source
|
||||
source: $request->source,
|
||||
specialities_id: $request->specialities_id,
|
||||
dppj: $request->dppj
|
||||
);
|
||||
|
||||
DB::commit();
|
||||
@@ -508,11 +512,11 @@ class RequestLogController extends Controller
|
||||
if (!empty($request->reason)) {
|
||||
$requestLog->reason_final = $request->reason;
|
||||
}
|
||||
|
||||
|
||||
if (!empty($request->type_of_member)){
|
||||
$requestLog->type_of_member = $request->type_of_member;
|
||||
}
|
||||
|
||||
|
||||
$requestLog->final_log = 1;
|
||||
$requestLog->approved_final_log_by = auth()->user()->id;
|
||||
$requestLog->approved_final_log_at = Carbon::now();
|
||||
|
||||
@@ -13,6 +13,7 @@ use App\Models\Benefit;
|
||||
use App\Models\Exclusion;
|
||||
use App\Models\ClaimRequest;
|
||||
use App\Models\Icd;
|
||||
use App\Models\Speciality;
|
||||
use App\Helpers\Helper;
|
||||
use App\Models\CorporatePolicy;
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
@@ -117,12 +118,20 @@ class RequestLogShowResource extends JsonResource
|
||||
}
|
||||
$memberUsage = Helper::getUsageMember($corporateId, $requestLog['member']['id'], $benefitData);
|
||||
|
||||
// dd($memberLimitUsage);
|
||||
if($requestLog['specialities_id'])
|
||||
{
|
||||
$spesialis = Speciality::query()
|
||||
->where('id', $requestLog['specialities_id'])
|
||||
->select('name')
|
||||
->first();
|
||||
}
|
||||
$data = [
|
||||
'id' => $requestLog['id'],
|
||||
'code' => $requestLog['code'],
|
||||
'invoice_no' => $requestLog['invoice_no'],
|
||||
'billing_no' => $requestLog['billing_no'],
|
||||
'specialities_id' => $spesialis['name'],
|
||||
'dppj' => $requestLog['dppj'],
|
||||
'code' => $requestLog['code'],
|
||||
'code_claim' => $claimCode,
|
||||
'member_id' => $requestLog['member']['member_id'],
|
||||
@@ -161,7 +170,7 @@ class RequestLogShowResource extends JsonResource
|
||||
'reason' => $requestLog['reason'],
|
||||
'diagnosis' => $icd,
|
||||
'is_reversal' => $isReversal, // untuk penjagaan, jika true tidak bisa di edit/hapus lagi
|
||||
|
||||
|
||||
|
||||
];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user