Merge branch 'staging' of https://dev.sismedika.online/febio/aso into staging

This commit is contained in:
2024-01-23 11:05:16 +07:00

View File

@@ -308,6 +308,7 @@ class ClaimController extends Controller
->leftJoin('members', 'members.id', '=', 'request_logs.member_id') ->leftJoin('members', 'members.id', '=', 'request_logs.member_id')
->leftJoin('corporate_employees','corporate_employees.member_id','=','members.id') ->leftJoin('corporate_employees','corporate_employees.member_id','=','members.id')
->where('corporate_employees.corporate_id', '=', $corporate_id) ->where('corporate_employees.corporate_id', '=', $corporate_id)
->where('request_logs.status_final_log', '=', 'approved')
->when($start != 'all' && $end != 'all', function ($query) use ($start, $end) { ->when($start != 'all' && $end != 'all', function ($query) use ($start, $end) {
$query->where('request_logs.submission_date', '>=', $start) $query->where('request_logs.submission_date', '>=', $start)
->where('request_logs.submission_date', '<=', $end); ->where('request_logs.submission_date', '<=', $end);
@@ -323,6 +324,16 @@ class ClaimController extends Controller
'request_logs.code', 'request_logs.code',
'request_logs.diagnosis' 'request_logs.diagnosis'
) )
->groupBy(
'request_logs.submission_date',
'request_logs.discharge_date',
'request_logs.organization_id',
'request_logs.id',
'request_logs.member_id',
'request_logs.service_code',
'request_logs.code',
'request_logs.diagnosis'
)
->orderBy('request_logs.submission_date') ->orderBy('request_logs.submission_date')
->get(); ->get();