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-03-05 13:41:28 +07:00
parent 3fbc4c2cd1 339eec9727
commit ccbded5e4e
41 changed files with 3431 additions and 2144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -316,8 +316,8 @@ class ClaimController extends Controller
// ->where('request_logs.status_final_log', '=', 'approved')
->where('request_logs.deleted_at', '=', null)
->when($start != 'all' && $end != 'all', function ($query) use ($start, $end) {
$query->where('request_logs.submission_date', '>=', $start)
->where('request_logs.submission_date', '<=', Carbon::parse($end)->addDay());
$query->where('request_logs.submission_date', '>=',Carbon::parse($start)->subDay())
->where('request_logs.submission_date', '<=',Carbon::parse($end)->addDay());
})
->select(
DB::raw('1 AS no'),

16
Modules/Client/Http/Controllers/Api/ClaimRequestController.php
View File

@@ -19,7 +19,7 @@ class ClaimRequestController extends Controller
* Display a listing of the resource.
* @return Renderable
*/
private static $code_prefix = 'CP';
private static $code_prefix = 'CLAIM';
public function index()
{
return view('client::index');
@@ -224,10 +224,6 @@ class ClaimRequestController extends Controller
public static function getNextCode()
{
// $last_number = ClaimRequest::max('code');
// $next_number = empty($last_number) ? 1 : ((int) explode('-', $last_number)[2] + 1);
// return self::makeCode($next_number);
$last_numeric_code = ClaimRequest::select(DB::raw('MAX(CAST(SUBSTRING_INDEX(code, "-", -1) AS SIGNED)) as max_numeric_code'))
->whereRaw('SUBSTRING_INDEX(code, "-", -1) REGEXP "^[0-9]+$"')
->value('max_numeric_code');
@@ -247,8 +243,14 @@ class ClaimRequestController extends Controller
{
// Pastikan $next_number adalah integer positif
$next_number = max(1, (int) $next_number);
$requestLogData = RequestLog::where('id', $request_log_id)->first();
$organization = Organization::where(['id' => $requestLogData->organization_id, 'type' => 'hospital'])->first('code');
$provideCode = $organization ? $organization->code : '';
$member = Member::with('currentCorporate')->where(['id' => $requestLogData->member_id])->first();
$sparator = '.';
$date = date('ymd');
// Menghasilkan kode dengan format yang diinginkan
return self::$code_prefix . '-' . str_pad($next_number, 5, '0', STR_PAD_LEFT);
return self::$code_prefix . $sparator. 'H' . $sparator. $provideCode . $sparator. $date. $sparator . $member->currentPolicy->code . $sparator. $member->member_id . $sparator. str_pad($next_number, 6, '0', STR_PAD_LEFT);
}
}

2
Modules/Client/Http/Controllers/Api/CorporateMemberController.php
View File

@@ -229,7 +229,7 @@ class CorporateMemberController extends Controller
'service:code,name',
'files',
])
->find($request_log_id, ['id', 'submission_date', 'discharge_date', 'member_id', 'service_code', 'organization_id', 'diagnosis']);
->find($request_log_id, ['id', 'submission_date', 'discharge_date', 'member_id', 'service_code', 'organization_id', 'diagnosis', 'keterangan', 'catatan']);
$dataBenefit = [];
if (count($data->requestLogBenefits) > 0) {