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-01-18 08:59:52 +07:00
parent 7648a7b16e 13eb8df193
commit 04f63cc0ec
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -309,8 +309,8 @@ class ClaimController extends Controller
->leftJoin('corporate_employees','corporate_employees.member_id','=','members.id')
->where('corporate_employees.corporate_id', '=', $corporate_id)
->when($start != 'all' && $end != 'all', function ($query) use ($start, $end) {
$query->where('request_logs.submission_date', '>', $start)
->where('request_logs.submission_date', '<', $end);
$query->where('request_logs.submission_date', '>=', $start)
->where('request_logs.submission_date', '<=', $end);
})
->select(
DB::raw('1 AS no'),
@@ -336,7 +336,7 @@ class ClaimController extends Controller
$dataRumahSakit = DB::table('organizations')
->leftJoin('addresses', 'addresses.addressable_id', '=', 'organizations.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')
->first();
//Data Member

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

@@ -66,7 +66,7 @@ class RequestLogController extends Controller
$words = explode(' ', $request->organization_name);
foreach ($words as $word) {
$singkatan .= strtoupper(substr($word, 0, 1));
$singkatan .= strtoupper(substr($word, 0, 2));
}
// Membuat kode organisasi

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

@@ -384,9 +384,9 @@
<tr style="background-color: #F4F6F8;">
<td style="width: 5%; text-align: left;"><b>No.</b></td>
<td style="width: 25%; text-align: left;"><b>Item Layanan</b></td>
<td style="width: 15%; text-align: left;"><b>Total Klaim</b></td>
<td style="width: 20%; text-align: left;"><b>Total Disetujui</b></td>
<td style="width: 20%; text-align: left;"><b>Total Selisih</b></td>
<td style="width: 15%; text-align: right;"><b>Total Klaim</b></td>
<td style="width: 20%; text-align: right;"><b>Total Disetujui</b></td>
<td style="width: 20%; text-align: right;"><b>Total Selisih</b></td>
<td style="width: 15%; text-align: left;"><b>Keterangan</b></td>
</tr>
</thead>