tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into origin/production

Browse Source
This commit is contained in:
Linksehat Staging Server
2024-01-17 13:56:13 +07:00
parent 4977ef8666 9a721de5ab
commit fc7d2fe809
6 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -274,6 +274,8 @@ class ClaimController extends Controller
$header = [
'No',
'Code',
'Date Submission',
'Date Discharge',
'Provider',
'Member ID (BN)',
'Member Name',
@@ -312,6 +314,8 @@ class ClaimController extends Controller
})
->select(
DB::raw('1 AS no'),
'request_logs.submission_date',
'request_logs.discharge_date',
'request_logs.organization_id',
'request_logs.id',
'request_logs.member_id',
@@ -319,6 +323,7 @@ class ClaimController extends Controller
'request_logs.code',
'request_logs.diagnosis'
)
->orderBy('request_logs.submission_date')
->get();
if (isset($data) && count($data) > 0)
@@ -436,6 +441,8 @@ class ClaimController extends Controller
$rowData = [
$check_first_id != $item->id ? $no : '',
!empty($item->code) ? $item->code : '',
!empty($item->submission_date) ? $item->submission_date : '',
!empty($item->discharge_date) ? $item->discharge_date : '',
!empty($dataRumahSakit->nama_rumahsakit) ? $dataRumahSakit->nama_rumahsakit : '',
!empty($dataMember->member_id) ? $dataMember->member_id : '',
!empty($dataMember->name) ? $dataMember->name : '',
@@ -463,6 +470,8 @@ class ClaimController extends Controller
$rowData = [
$check_first_id != $item->id ? $no : '',
!empty($item->code) ? $item->code : '',
!empty($item->submission_date) ? $item->submission_date : '',
!empty($item->discharge_date) ? $item->discharge_date : '',
!empty($dataRumahSakit->nama_rumahsakit) ? $dataRumahSakit->nama_rumahsakit : '',
!empty($dataMember->member_id) ? $dataMember->member_id : '',
!empty($dataMember->name) ? $dataMember->name : '',

2
Modules/Internal/Services/RequestLogService.php
View File

@@ -326,7 +326,7 @@ class RequestLogService
// Pastikan $next_number adalah integer positif
$next_number = max(1, (int) $next_number);
// Menghasilkan kode dengan format yang diinginkan
return self::$code_prefix . $sparator. $data['source'] . $sparator. $data['provideCode'] . $sparator. $data['date'] . $sparator . $data['policy'] . $sparator. $data['member_code'] . $sparator. str_pad($next_number, 5, '0', STR_PAD_LEFT);
return self::$code_prefix . $sparator. $data['source'] . $sparator. $data['provideCode'] . $sparator. $data['date'] . $sparator . $data['policy'] . $sparator. $data['member_code'] . $sparator. str_pad($next_number, 6, '0', STR_PAD_LEFT);
}
}