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

Modules/Client/Http/Controllers/Api/ClaimController.php

@@ -283,6 +283,7 @@ class ClaimController extends Controller
             'Member Name',
             'Member Name Principal',
             'Plan Code',
+            'Service',
             'Payor ID',
             'Corporate name',
             'Policy Number',
@@ -334,7 +335,7 @@ class ClaimController extends Controller
             'request_logs.catatan',
             DB::raw('
                 (Select SUM(request_log_benefits.amount_approved) as tot_bill FROM request_log_benefits
-                    WHERE request_log_benefits.request_log_id = request_logs.id LIMIT 1) AS tot_bill
+                    WHERE request_log_benefits.request_log_id = request_logs.id AND request_log_benefits.deleted_at IS NULL LIMIT 1) AS tot_bill
             ')
         )
         ->groupBy(
@@ -401,7 +402,7 @@ class ClaimController extends Controller
                     '),
                     DB::raw('
                         (Select services.name FROM services
-                            WHERE services.code = "'.$item->service_code.'" LIMIT 1) AS jenis_perwatan
+                            WHERE services.code = "'.$item->service_code.'" LIMIT 1) AS jenis_perawatan
                     '),
                     DB::raw('
                         (Select member_policies.policy_id FROM member_policies WHERE member_policies.member_id = members.member_id LIMIT 1) AS no_polis
@@ -494,6 +495,7 @@ class ClaimController extends Controller
                             !empty($dataMember->name) ? $dataMember->name : '',
                             $data['namaKaryawan'],
                             ($firtIndex == $index ? (!empty($dataMember->code_plan) ? $dataMember->code_plan : '') : ''),
+                            !empty($dataMember->jenis_perawatan) ? $dataMember->jenis_perawatan : '',
                             $penjamin,
                             !empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '',
                             !empty($dataMember->no_polis) ? $dataMember->no_polis : '',
@@ -527,6 +529,7 @@ class ClaimController extends Controller
                         !empty($dataMember->name) ? $dataMember->name : '',
                         $data['namaKaryawan'],
                         !empty($dataMember->code_plan) ? $dataMember->code_plan : '',
+                        !empty($dataMember->jenis_perawatan) ? $dataMember->jenis_perawatan : '',
                         $penjamin,
                         !empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '',
                         !empty($dataMember->no_polis) ? $dataMember->no_polis : '',
@@ -578,6 +581,7 @@ class ClaimController extends Controller
                 '',
                 '',
                 '',
+                '',
                 $grand_total_billing,
                 '',
                 '',

frontend/hospital-portal/public/lang/en-US.json

@@ -13,8 +13,8 @@
   "txtDialogMember2" : "Request LOG",
   "txtDialogMember3" : "Detail",
   "txtDialogMember4" : "Please select services",
-  "txtDialogMember5" : "Submission Date",
+  "txtDialogMember5" : "Admission Date",
-  "txtDialogMember6" : "Please select submission date",  
+  "txtDialogMember6" : "Please select admission date",  
   "txtWarningDischargeDate" : "Please select discharge date",
   "txtCreateAt" : "Create at",
   "txtDateBirth" : "Date of Birth",
@@ -30,7 +30,7 @@
   "txtStatus" : "Status",
   "txtSearch" : "Search Name or Member ID...",
   "txtAll" : "All",
-  "txtSubmissionDate" : "Submission Date",
+  "txtSubmissionDate" : "Admission Date",
   "txtDataNotFound" : "Data Not Found",
   "txtConditionDocument" : "Condition Document",
   "txtDiagnosisDokument" : "Diagnosis Dokument",

frontend/hospital-portal/public/lang/id-ID.json

@@ -13,8 +13,8 @@
   "txtDialogMember2" : "Request LOG",
   "txtDialogMember3" : "Detail",
   "txtDialogMember4" : "Mohon pilih layanan",
-  "txtDialogMember5" : "Tanggal Pengajuan",
+  "txtDialogMember5" : "Tanggal Masuk",
-  "txtDialogMember6" : "Mohon pilih tanggal pengajuan",
+  "txtDialogMember6" : "Mohon pilih tanggal masuk",
   "txtWarningDischargeDate" : "Mohon pilih tanggal keluar",
   "txtCreateAt" : "Tanggal Buat",
   "txtDateBirth" : "Tanggal Lahir",
@@ -30,7 +30,7 @@
   "txtStatus" : "Status",
   "txtSearch" : "Cari Nama atau ID Anggota...",
   "txtAll" : "Semua",
-  "txtSubmissionDate" : "Tanggal Pengajuan",
+  "txtSubmissionDate" : "Tanggal Masuk",
   "txtDataNotFound" : "Data Tidak Ditemukan",
   "txtConditionDocument" : "Dokumen Kondisi",
   "txtDiagnosisDokument" : "Dokumen Diagnosis",

frontend/hospital-portal/src/sections/dashboard/CardSearchMember.tsx

@@ -50,8 +50,8 @@ export default function CardSearchMember(handleSubmitSuccess:()=> void) {
   const { localeData }: any = useContext(LanguageContext);
   const {enqueueSnackbar} = useSnackbar();
 
-  const [noPolis, setNoPolis] = useState('AW001-01');
+  const [noPolis, setNoPolis] = useState('');
-  const [birthDate, setBirthDate] = useState('1991-01-10');
+  const [birthDate, setBirthDate] = useState(null);
   const [loadingBenefit, setLoadingBenefit] = useState(false);
   const [loadingClaim, setLoadingClaim] = useState(false);
   const [openDialogBenefit, setOpenDialogBenefit] = useState(false);

frontend/hospital-portal/src/sections/dashboard/TableListFinalLog.tsx

@@ -421,7 +421,7 @@ export default function TableListFinalLog() {
       setData(
           response.data.data.map((obj: any) => ({
             ...obj,
-          provider:formatTitleCase(obj.provider),
+          provider:obj.provider,
           full_name:formatTitleCase(obj.full_name),
           check_status: obj.status,
           check_claim: obj.check_claim,

frontend/hospital-portal/src/sections/dashboard/TableListReqLog.tsx

@@ -384,7 +384,7 @@ export default function TableList() {
       setData(
         response.data.data.map((obj: any) => ({
           ...obj,
-          provider:formatTitleCase(obj.provider),
+          provider:obj.provider,
           full_name:formatTitleCase(obj.full_name),
           status:
             obj.status === 'requested' ? (