Merge branch 'staging' of https://dev.sismedika.online/febio/aso into staging
This commit is contained in:
@@ -275,6 +275,7 @@ class ClaimController extends Controller
|
|||||||
'No',
|
'No',
|
||||||
'Code',
|
'Code',
|
||||||
'Date Submission',
|
'Date Submission',
|
||||||
|
'Date Admission',
|
||||||
'Date Discharge',
|
'Date Discharge',
|
||||||
'Provider',
|
'Provider',
|
||||||
'Member ID (BN)',
|
'Member ID (BN)',
|
||||||
@@ -320,6 +321,7 @@ class ClaimController extends Controller
|
|||||||
->select(
|
->select(
|
||||||
DB::raw('1 AS no'),
|
DB::raw('1 AS no'),
|
||||||
'request_logs.submission_date',
|
'request_logs.submission_date',
|
||||||
|
'request_logs.created_at',
|
||||||
'request_logs.discharge_date',
|
'request_logs.discharge_date',
|
||||||
'request_logs.organization_id',
|
'request_logs.organization_id',
|
||||||
'request_logs.id',
|
'request_logs.id',
|
||||||
@@ -328,10 +330,15 @@ class ClaimController extends Controller
|
|||||||
'request_logs.code',
|
'request_logs.code',
|
||||||
'request_logs.diagnosis',
|
'request_logs.diagnosis',
|
||||||
'request_logs.keterangan',
|
'request_logs.keterangan',
|
||||||
'request_logs.catatan'
|
'request_logs.catatan',
|
||||||
|
DB::raw('
|
||||||
|
(Select SUM(request_log_benefits.amount_approved) as tot_bill FROM request_log_benefits
|
||||||
|
WHERE request_log_benefits.request_log_id = request_logs.id LIMIT 1) AS tot_bill
|
||||||
|
')
|
||||||
)
|
)
|
||||||
->groupBy(
|
->groupBy(
|
||||||
'request_logs.submission_date',
|
'request_logs.submission_date',
|
||||||
|
'request_logs.created_at',
|
||||||
'request_logs.discharge_date',
|
'request_logs.discharge_date',
|
||||||
'request_logs.organization_id',
|
'request_logs.organization_id',
|
||||||
'request_logs.id',
|
'request_logs.id',
|
||||||
@@ -340,7 +347,8 @@ class ClaimController extends Controller
|
|||||||
'request_logs.code',
|
'request_logs.code',
|
||||||
'request_logs.diagnosis',
|
'request_logs.diagnosis',
|
||||||
'request_logs.keterangan',
|
'request_logs.keterangan',
|
||||||
'request_logs.catatan'
|
'request_logs.catatan',
|
||||||
|
'tot_bill'
|
||||||
)
|
)
|
||||||
->orderBy('request_logs.submission_date')
|
->orderBy('request_logs.submission_date')
|
||||||
->get();
|
->get();
|
||||||
@@ -455,6 +463,7 @@ class ClaimController extends Controller
|
|||||||
}
|
}
|
||||||
$total_billing = 0;
|
$total_billing = 0;
|
||||||
$lastIndex = count($dataClaimLog) - 1;
|
$lastIndex = count($dataClaimLog) - 1;
|
||||||
|
$firtIndex = 0;
|
||||||
if (isset($dataClaimLog) && count($dataClaimLog) > 0)
|
if (isset($dataClaimLog) && count($dataClaimLog) > 0)
|
||||||
{
|
{
|
||||||
foreach ($dataClaimLog as $index => $item_benefit)
|
foreach ($dataClaimLog as $index => $item_benefit)
|
||||||
@@ -463,6 +472,7 @@ class ClaimController extends Controller
|
|||||||
$rowData = [
|
$rowData = [
|
||||||
$check_first_id != $item->id ? $no : $no,
|
$check_first_id != $item->id ? $no : $no,
|
||||||
!empty($item->code) ? $item->code : '',
|
!empty($item->code) ? $item->code : '',
|
||||||
|
!empty($item->created_at) ? $item->created_at : '',
|
||||||
!empty($item->submission_date) ? $item->submission_date : '',
|
!empty($item->submission_date) ? $item->submission_date : '',
|
||||||
!empty($item->discharge_date) ? $item->discharge_date : '',
|
!empty($item->discharge_date) ? $item->discharge_date : '',
|
||||||
!empty($dataRumahSakit->nama_rumahsakit) ? $dataRumahSakit->nama_rumahsakit : '',
|
!empty($dataRumahSakit->nama_rumahsakit) ? $dataRumahSakit->nama_rumahsakit : '',
|
||||||
@@ -473,7 +483,7 @@ class ClaimController extends Controller
|
|||||||
'LinkSehat',
|
'LinkSehat',
|
||||||
!empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '',
|
!empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '',
|
||||||
!empty($dataMember->no_polis) ? $dataMember->no_polis : '',
|
!empty($dataMember->no_polis) ? $dataMember->no_polis : '',
|
||||||
($lastIndex == $index ? $total_billing : ''),
|
($firtIndex == $index ? $item->tot_bill : ''),
|
||||||
!empty($item_benefit->code) ? $item_benefit->code : '',
|
!empty($item_benefit->code) ? $item_benefit->code : '',
|
||||||
!empty($item_benefit->benfit) ? $item_benefit->benfit : '',
|
!empty($item_benefit->benfit) ? $item_benefit->benfit : '',
|
||||||
!empty($item_benefit->amount_incurred) ? $item_benefit->amount_incurred : '',
|
!empty($item_benefit->amount_incurred) ? $item_benefit->amount_incurred : '',
|
||||||
@@ -495,6 +505,7 @@ class ClaimController extends Controller
|
|||||||
$rowData = [
|
$rowData = [
|
||||||
$check_first_id != $item->id ? $no : '',
|
$check_first_id != $item->id ? $no : '',
|
||||||
!empty($item->code) ? $item->code : '',
|
!empty($item->code) ? $item->code : '',
|
||||||
|
!empty($item->created_at) ? $item->created_at : '',
|
||||||
!empty($item->submission_date) ? $item->submission_date : '',
|
!empty($item->submission_date) ? $item->submission_date : '',
|
||||||
!empty($item->discharge_date) ? $item->discharge_date : '',
|
!empty($item->discharge_date) ? $item->discharge_date : '',
|
||||||
!empty($dataRumahSakit->nama_rumahsakit) ? $dataRumahSakit->nama_rumahsakit : '',
|
!empty($dataRumahSakit->nama_rumahsakit) ? $dataRumahSakit->nama_rumahsakit : '',
|
||||||
@@ -531,9 +542,9 @@ class ClaimController extends Controller
|
|||||||
->build();
|
->build();
|
||||||
$grand_total_billing = 0;
|
$grand_total_billing = 0;
|
||||||
foreach ($dataRow as $rowData) {
|
foreach ($dataRow as $rowData) {
|
||||||
if (is_numeric($rowData[12])) {
|
if (is_numeric($rowData[13])) {
|
||||||
// Jumlahkan nilai angka ke total
|
// Jumlahkan nilai angka ke total
|
||||||
$grand_total_billing += $rowData[12];
|
$grand_total_billing += $rowData[13];
|
||||||
}
|
}
|
||||||
$row = WriterEntityFactory::createRowFromArray($rowData, $style);
|
$row = WriterEntityFactory::createRowFromArray($rowData, $style);
|
||||||
$writer->addRow($row);
|
$writer->addRow($row);
|
||||||
@@ -552,6 +563,7 @@ class ClaimController extends Controller
|
|||||||
'',
|
'',
|
||||||
'',
|
'',
|
||||||
'',
|
'',
|
||||||
|
'',
|
||||||
$grand_total_billing,
|
$grand_total_billing,
|
||||||
'',
|
'',
|
||||||
'',
|
'',
|
||||||
|
|||||||
Reference in New Issue
Block a user