bugs fix export claim request
This commit is contained in:
@@ -59,7 +59,7 @@ class ClaimRequestController extends Controller
|
|||||||
$q->where('submission_date', '<', Carbon::parse($endDate)->addDay());
|
$q->where('submission_date', '<', Carbon::parse($endDate)->addDay());
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
->when($request->service_code, function ($q, $serviceCode) {
|
->when($request->service_code, function ($q, $serviceCode) {
|
||||||
$q->whereIn('service_code', $serviceCode);
|
$q->whereIn('service_code', $serviceCode);
|
||||||
})
|
})
|
||||||
@@ -76,7 +76,7 @@ class ClaimRequestController extends Controller
|
|||||||
})
|
})
|
||||||
->with(['member', 'files', 'service', 'member.currentPolicy'])
|
->with(['member', 'files', 'service', 'member.currentPolicy'])
|
||||||
->paginate();
|
->paginate();
|
||||||
|
|
||||||
return Helper::paginateResources(ClaimRequestResource::collection($claimRequests));
|
return Helper::paginateResources(ClaimRequestResource::collection($claimRequests));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -443,7 +443,7 @@ class ClaimRequestController extends Controller
|
|||||||
$import = new ImportService();
|
$import = new ImportService();
|
||||||
$import->read($fileRead);
|
$import->read($fileRead);
|
||||||
$import->write($fileWrite, 'xsls');
|
$import->write($fileWrite, 'xsls');
|
||||||
|
|
||||||
foreach ($import->sheetsIterator() as $sheetIndex => $sheet) {
|
foreach ($import->sheetsIterator() as $sheetIndex => $sheet) {
|
||||||
if ($sheetIndex == 1) { // Rename First Sheet to Writer
|
if ($sheetIndex == 1) { // Rename First Sheet to Writer
|
||||||
$firstWriterSheet = $import->writer->getCurrentSheet();
|
$firstWriterSheet = $import->writer->getCurrentSheet();
|
||||||
@@ -524,7 +524,7 @@ class ClaimRequestController extends Controller
|
|||||||
Storage::delete('temp/' . $file_name);
|
Storage::delete('temp/' . $file_name);
|
||||||
$import->writer->close();
|
$import->writer->close();
|
||||||
return [
|
return [
|
||||||
|
|
||||||
'result_file' => [
|
'result_file' => [
|
||||||
'url' => Storage::disk('public')->url('temp/result-' . $file_name),
|
'url' => Storage::disk('public')->url('temp/result-' . $file_name),
|
||||||
'name' => 'result-' . $file_name,
|
'name' => 'result-' . $file_name,
|
||||||
@@ -603,7 +603,7 @@ class ClaimRequestController extends Controller
|
|||||||
->offset($offset)
|
->offset($offset)
|
||||||
->limit($limit)
|
->limit($limit)
|
||||||
->get();
|
->get();
|
||||||
|
|
||||||
$data = [];
|
$data = [];
|
||||||
if(count($memberList)>0){
|
if(count($memberList)>0){
|
||||||
$temp = [];
|
$temp = [];
|
||||||
@@ -668,7 +668,7 @@ class ClaimRequestController extends Controller
|
|||||||
$date = date('ymd');
|
$date = date('ymd');
|
||||||
// Menghasilkan kode dengan format yang diinginkan
|
// Menghasilkan kode dengan format yang diinginkan
|
||||||
return self::$code_prefix . $sparator. 'H' . $sparator. $provideCode . $sparator. $date. $sparator . $member->currentPolicy->code . $sparator. $member->member_id . $sparator. str_pad($next_number, 6, '0', STR_PAD_LEFT);
|
return self::$code_prefix . $sparator. 'H' . $sparator. $provideCode . $sparator. $date. $sparator . $member->currentPolicy->code . $sparator. $member->member_id . $sparator. str_pad($next_number, 6, '0', STR_PAD_LEFT);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function requestFiles(Request $request, $claim_id)
|
public function requestFiles(Request $request, $claim_id)
|
||||||
@@ -800,7 +800,7 @@ class ClaimRequestController extends Controller
|
|||||||
// 'Reason',
|
// 'Reason',
|
||||||
'Diagnosis',
|
'Diagnosis',
|
||||||
'Keterangan',
|
'Keterangan',
|
||||||
'Catatan',
|
'Catatan',
|
||||||
'Status',
|
'Status',
|
||||||
'QC'
|
'QC'
|
||||||
];
|
];
|
||||||
@@ -823,9 +823,9 @@ class ClaimRequestController extends Controller
|
|||||||
foreach($results as $item)
|
foreach($results as $item)
|
||||||
{
|
{
|
||||||
// $gr_total += $item->tot_bill;
|
// $gr_total += $item->tot_bill;
|
||||||
// $requestLogData = RequestLogBenefit::selectRaw('*,
|
// $requestLogData = RequestLogBenefit::selectRaw('*,
|
||||||
// (SELECT code FROM benefits WHERE benefits.id = request_log_benefits.benefit_id) AS benefit_code,
|
// (SELECT code FROM benefits WHERE benefits.id = request_log_benefits.benefit_id) AS benefit_code,
|
||||||
// (SELECT description FROM benefits WHERE benefits.id = request_log_benefits.benefit_id) AS benefit_description,
|
// (SELECT description FROM benefits WHERE benefits.id = request_log_benefits.benefit_id) AS benefit_description,
|
||||||
// sum(amount_incurred) AS total_incurred'
|
// sum(amount_incurred) AS total_incurred'
|
||||||
// )
|
// )
|
||||||
// ->where(['request_log_id' => $item->request_log_id, 'deleted_at' => null])
|
// ->where(['request_log_id' => $item->request_log_id, 'deleted_at' => null])
|
||||||
@@ -837,7 +837,7 @@ class ClaimRequestController extends Controller
|
|||||||
->select(
|
->select(
|
||||||
'*',
|
'*',
|
||||||
// DB::raw('SUM(request_log_benefits.amount_incurred) AS total_incurred'),
|
// DB::raw('SUM(request_log_benefits.amount_incurred) AS total_incurred'),
|
||||||
|
|
||||||
DB::raw('
|
DB::raw('
|
||||||
(Select benefits.description FROM benefits
|
(Select benefits.description FROM benefits
|
||||||
WHERE benefits.id = request_log_benefits.benefit_id LIMIT 1) AS benefit_description
|
WHERE benefits.id = request_log_benefits.benefit_id LIMIT 1) AS benefit_description
|
||||||
@@ -850,10 +850,18 @@ class ClaimRequestController extends Controller
|
|||||||
->get();
|
->get();
|
||||||
if ($item->member){
|
if ($item->member){
|
||||||
$member = Member::where('member_id', $item->member->principal_id)->first();
|
$member = Member::where('member_id', $item->member->principal_id)->first();
|
||||||
$memberPrincipal = $member->name;
|
if ($member){
|
||||||
|
$memberPrincipal = $member->name;
|
||||||
|
} else {
|
||||||
|
$memberPrincipal = '-';
|
||||||
|
}
|
||||||
$memberPlan = MemberPlan::where('member_id', $item->member->id)->get('plan_id')->toArray();
|
$memberPlan = MemberPlan::where('member_id', $item->member->id)->get('plan_id')->toArray();
|
||||||
$plan= Plan::whereIn('id', $memberPlan)->where('service_code', $item->requestLog->service_code)->first();
|
$plan= Plan::whereIn('id', $memberPlan)->where('service_code', $item->requestLog->service_code)->first();
|
||||||
$planCode = $plan->code;
|
if ($plan){
|
||||||
|
$planCode = $plan->code;
|
||||||
|
} else {
|
||||||
|
$planCode = '-';
|
||||||
|
}
|
||||||
if ($item->member->currentCorporate->id == $item->requestLog->organization->corporate_id_partner){
|
if ($item->member->currentCorporate->id == $item->requestLog->organization->corporate_id_partner){
|
||||||
$payor = $item->member->currentCorporate->name;
|
$payor = $item->member->currentCorporate->name;
|
||||||
} else {
|
} else {
|
||||||
@@ -864,7 +872,7 @@ class ClaimRequestController extends Controller
|
|||||||
$planCode = '-';
|
$planCode = '-';
|
||||||
$payor = '-';
|
$payor = '-';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$requestLogData->isEmpty()){
|
if (!$requestLogData->isEmpty()){
|
||||||
foreach($requestLogData as $key => $data){
|
foreach($requestLogData as $key => $data){
|
||||||
$no++;
|
$no++;
|
||||||
|
|||||||
Reference in New Issue
Block a user