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-01 11:51:07 +07:00
parent 177896a5aa e3ea1a3854
commit 0657448ef8
3 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
View File

@@ -448,9 +448,9 @@ class RequestLogController extends Controller
DB::raw('
(Select persons.nik FROM persons WHERE persons.id = members.person_id LIMIT 1) AS nik
'),
DB::raw('
"LinkSehat" AS penjamin
'),
// DB::raw('
// "LinkSehat" AS penjamin
// '),
DB::raw('
(Select corporates.name FROM corporates
LEFT JOIN corporate_employees ON corporate_employees.corporate_id = corporates.id
@@ -514,11 +514,23 @@ class RequestLogController extends Controller
->leftJoin('addresses', 'addresses.addressable_id', '=', 'organizations.id')
->where('organizations.id', '=', $dataRequestLog->organization_id)
->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();
$data['rumahSakit'] = $dataRumahSakit;
//get penjamin
$data['penjamin'] = 'LinkSehat';
if($dataRumahSakit->corporate_id_partner)
{
$corporate_id_partners = explode(',', $dataRumahSakit->corporate_id_partner);
$valueToCheck = $dataMember->id_perusahaan;
if (in_array($valueToCheck, $corporate_id_partners)) {
$data['penjamin'] = $dataMember->nama_perusahaan;
}
}
$logoPerusahaan = DB::table('files')
->leftJoin('corporate_employees', 'corporate_employees.corporate_id', '=', 'files.fileable_id')
->leftJoin('corporates', 'corporate_employees.corporate_id', '=', 'corporates.id')
@@ -608,9 +620,9 @@ class RequestLogController extends Controller
DB::raw('
(Select persons.nik FROM persons WHERE persons.id = members.person_id LIMIT 1) AS nik
'),
DB::raw('
"LinkSehat" AS penjamin
'),
// DB::raw('
// "LinkSehat" AS penjamin
// '),
DB::raw('
(Select corporates.name FROM corporates
LEFT JOIN corporate_employees ON corporate_employees.corporate_id = corporates.id
@@ -693,11 +705,23 @@ class RequestLogController extends Controller
->leftJoin('addresses', 'addresses.addressable_id', '=', 'organizations.id')
->where('organizations.id', '=', $dataRequestLog->organization_id)
->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();
$data['rumahSakit'] = $dataRumahSakit;
//get penjamin
$data['penjamin'] = 'LinkSehat';
if($dataRumahSakit->corporate_id_partner)
{
$corporate_id_partners = explode(',', $dataRumahSakit->corporate_id_partner);
$valueToCheck = $dataMember->id_perusahaan;
if (in_array($valueToCheck, $corporate_id_partners)) {
$data['penjamin'] = $dataMember->nama_perusahaan;
}
}
$logoPerusahaan = DB::table('files')
->leftJoin('corporate_employees', 'corporate_employees.corporate_id', '=', 'files.fileable_id')
->leftJoin('corporates', 'corporate_employees.corporate_id', '=', 'corporates.id')

2
resources/views/pdf/final_log_page_1.blade.php
View File

@@ -324,7 +324,7 @@
<tr>
<td style="width: 20%;">Penjamin</td>
<td style="width: 1%;">:</td>
<td style="width: 29%;">{{ $dataMember->penjamin }}</td>
<td style="width: 29%;">{{ $penjamin }}</td>
</tr>
<tr>
<td>Nama Perusahaan</td>

2
resources/views/pdf/req_log_page_1.blade.php
View File

@@ -333,7 +333,7 @@
<tr>
<td style="width: 20%;">Penjamin</td>
<td style="width: 1%;">:</td>
<td style="width: 29%;">{{ $dataMember->penjamin }}</td>
<td style="width: 29%;">{{ $penjamin }}</td>
</tr>
<tr>
<td>Nama Perusahaan</td>