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-08 14:09:39 +07:00
parent aaeea495a5 0c65434c29
commit 1245e44178
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php
View File

@@ -108,7 +108,7 @@ class DailyMonitoringController extends Controller
->first(); ->first();
$detail_list = RequestDailyMonitoring::where('request_log_id', empty($request_logs) == false ? $request_logs->id : '') $detail_list = RequestDailyMonitoring::where('request_log_id', empty($request_logs) == false ? $request_logs->id : '')
->orderBy("created_at", "desc") ->orderBy("submission_date", "desc")
->get(); ->get();
return response()->json([ return response()->json([

2
frontend/dashboard/src/pages/CaseManagement/InpatientMonitoring/List.tsx
View File

@@ -350,7 +350,7 @@ export default function List() {
<TableCell align="left">{row.code}</TableCell> <TableCell align="left">{row.code}</TableCell>
<TableCell align="left">{row.provider}</TableCell> <TableCell align="left">{row.provider}</TableCell>
<TableCell align="left">{row.member_name}</TableCell> <TableCell align="left">{row.member_name}</TableCell>
<TableCell align="left"><Label>{fDateTimesecond(row.submission_date)}</Label></TableCell> <TableCell align="left"><Label>{fDateTimesecond(row.admission_date)}</Label></TableCell>
<TableCell align="left">{row.service_name}</TableCell> <TableCell align="left">{row.service_name}</TableCell>
<TableCell align="left">{row.payment_type_name}</TableCell> <TableCell align="left">{row.payment_type_name}</TableCell>
<TableCell align="left"> <TableCell align="left">

1
frontend/dashboard/src/pages/CustomerService/FinalLog/Model/Types.tsx
View File

@@ -17,6 +17,7 @@ export type FinalLogType = {
member_name : string, member_name : string,
submission_date_fgl : string, submission_date_fgl : string,
submission_date : string, submission_date : string,
admission_date : string,
service_name : string, service_name : string,
payment_type_name : string, payment_type_name : string,
status_final_log : string, status_final_log : string,