Merge remote-tracking branch 'origin/staging' into origin/production
This commit is contained in:
@@ -283,6 +283,7 @@ class ClaimController extends Controller
|
||||
'Member Name',
|
||||
'Member Name Principal',
|
||||
'Plan Code',
|
||||
'Service',
|
||||
'Payor ID',
|
||||
'Corporate name',
|
||||
'Policy Number',
|
||||
@@ -401,7 +402,7 @@ class ClaimController extends Controller
|
||||
'),
|
||||
DB::raw('
|
||||
(Select services.name FROM services
|
||||
WHERE services.code = "'.$item->service_code.'" LIMIT 1) AS jenis_perwatan
|
||||
WHERE services.code = "'.$item->service_code.'" LIMIT 1) AS jenis_perawatan
|
||||
'),
|
||||
DB::raw('
|
||||
(Select member_policies.policy_id FROM member_policies WHERE member_policies.member_id = members.member_id LIMIT 1) AS no_polis
|
||||
@@ -494,6 +495,7 @@ class ClaimController extends Controller
|
||||
!empty($dataMember->name) ? $dataMember->name : '',
|
||||
$data['namaKaryawan'],
|
||||
($firtIndex == $index ? (!empty($dataMember->code_plan) ? $dataMember->code_plan : '') : ''),
|
||||
!empty($dataMember->jenis_perawatan) ? $dataMember->jenis_perawatan : '',
|
||||
$penjamin,
|
||||
!empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '',
|
||||
!empty($dataMember->no_polis) ? $dataMember->no_polis : '',
|
||||
@@ -527,6 +529,7 @@ class ClaimController extends Controller
|
||||
!empty($dataMember->name) ? $dataMember->name : '',
|
||||
$data['namaKaryawan'],
|
||||
!empty($dataMember->code_plan) ? $dataMember->code_plan : '',
|
||||
!empty($dataMember->jenis_perawatan) ? $dataMember->jenis_perawatan : '',
|
||||
$penjamin,
|
||||
!empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '',
|
||||
!empty($dataMember->no_polis) ? $dataMember->no_polis : '',
|
||||
@@ -578,6 +581,7 @@ class ClaimController extends Controller
|
||||
'',
|
||||
'',
|
||||
'',
|
||||
'',
|
||||
$grand_total_billing,
|
||||
'',
|
||||
'',
|
||||
|
||||
Reference in New Issue
Block a user