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

Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php

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

frontend/dashboard/src/pages/CaseManagement/InpatientMonitoring/List.tsx

@@ -350,7 +350,7 @@ export default function List() {
           <TableCell align="left">{row.code}</TableCell>
           <TableCell align="left">{row.provider}</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.payment_type_name}</TableCell>
           <TableCell align="left">

frontend/dashboard/src/pages/CustomerService/FinalLog/Model/Types.tsx

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