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-22 10:59:50 +07:00
parent d7a78337fa 4eba294f5a
commit 9667961b8c
2 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -364,7 +364,7 @@ class ClaimController extends Controller
->leftJoin('addresses', 'addresses.addressable_id', '=', 'organizations.id') ->leftJoin('addresses', 'addresses.addressable_id', '=', 'organizations.id')
->where('organizations.id', '=', $item->organization_id) ->where('organizations.id', '=', $item->organization_id)
->where('addresses.addressable_type', '=', 'App\Models\Organization') ->where('addresses.addressable_type', '=', 'App\Models\Organization')
->select('organizations.name AS nama_rumahsakit', 'addresses.text AS alamat_rumahsakit') ->select('organizations.name AS nama_rumahsakit', 'addresses.text AS alamat_rumahsakit', 'organizations.corporate_id_partner')
->first(); ->first();
//Data Member //Data Member
$dataMember = DB::table('members') $dataMember = DB::table('members')
@@ -380,9 +380,9 @@ class ClaimController extends Controller
DB::raw(' DB::raw('
(Select persons.nik FROM persons WHERE persons.id = members.person_id LIMIT 1) AS nik (Select persons.nik FROM persons WHERE persons.id = members.person_id LIMIT 1) AS nik
'), '),
DB::raw(' // DB::raw('
"LinkSehat" AS penjamin // "LinkSehat" AS penjamin
'), // '),
DB::raw(' DB::raw('
(Select corporates.name FROM corporates (Select corporates.name FROM corporates
LEFT JOIN corporate_employees ON corporate_employees.corporate_id = corporates.id LEFT JOIN corporate_employees ON corporate_employees.corporate_id = corporates.id
@@ -426,6 +426,18 @@ class ClaimController extends Controller
) )
->first(); ->first();
//get penjamin
$penjamin = 'LinkSehat';
if(!empty($dataRumahSakit->corporate_id_partner))
{
$corporate_id_partners = explode(',', $dataRumahSakit->corporate_id_partner);
$valueToCheck = $dataMember->id_perusahaan;
if (in_array($valueToCheck, $corporate_id_partners)) {
$penjamin = $dataMember->nama_perusahaan;
}
}
//Nama Karyawan //Nama Karyawan
$data['namaKaryawan'] = ''; $data['namaKaryawan'] = '';
if($dataMember->principal_id) if($dataMember->principal_id)
@@ -480,7 +492,7 @@ class ClaimController extends Controller
!empty($dataMember->name) ? $dataMember->name : '', !empty($dataMember->name) ? $dataMember->name : '',
$data['namaKaryawan'], $data['namaKaryawan'],
!empty($dataMember->code_plan) ? $dataMember->code_plan : '', !empty($dataMember->code_plan) ? $dataMember->code_plan : '',
'LinkSehat', $penjamin,
!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 : '',
($firtIndex == $index ? $item->tot_bill : ''), ($firtIndex == $index ? $item->tot_bill : ''),
@@ -513,7 +525,7 @@ class ClaimController extends Controller
!empty($dataMember->name) ? $dataMember->name : '', !empty($dataMember->name) ? $dataMember->name : '',
$data['namaKaryawan'], $data['namaKaryawan'],
!empty($dataMember->code_plan) ? $dataMember->code_plan : '', !empty($dataMember->code_plan) ? $dataMember->code_plan : '',
'LinkSehat', $penjamin,
!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 : '',
'', '',

26
frontend/client-portal/src/pages/AlarmCenter/List.tsx
View File

@@ -298,26 +298,26 @@ export default function List() {
setData( setData(
response.data.data.map((obj: any) => ({ response.data.data.map((obj: any) => ({
...obj, ...obj,
start_date: <Label>{obj.start_date ? fDateSuffix(obj.start_date) : '-'}</Label>, start_date: obj.start_date && obj.start_date != '0000-00-00' ? <Label>{fDateSuffix(obj.start_date)}</Label> : '-',
end_date: <Label> {obj.end_date ? fDateSuffix(obj.end_date) : '-'}</Label>, end_date: obj.end_date && obj.end_date != '0000-00-00' ? <Label>{fDateSuffix(obj.end_date)}</Label> : '-',
action: ( action: (
<TableMoreMenu <TableMoreMenu
actions={ actions={
<> <>
<MenuItem onClick={() => navigate('member/' + obj.id)}> <MenuItem onClick={() => navigate('member/' + obj.id)}>
<VisibilityOutlinedIcon /> <VisibilityOutlinedIcon />
View View
</MenuItem> </MenuItem>
<MenuItem onClick={() => handleDocumentClick(obj.link_document)}> <MenuItem onClick={() => handleDocumentClick(obj.link_document)}>
<Download /> <Download />
Document Member Document Member
</MenuItem> </MenuItem>
</> </>
} }
/> />
), ),
})) }))
); );
setPaginationTable(response.data); setPaginationTable(response.data);