diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php index 1359465b..f6b7f71d 100644 --- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php @@ -400,7 +400,7 @@ class RequestLogController extends Controller DB::raw(' (Select plans.code FROM member_plans LEFT JOIN plans ON plans.id = member_plans.plan_id - WHERE member_plans.member_id = members.id LIMIT 1) AS code_plan + WHERE member_plans.member_id = members.id AND plans.service_code = "'.$dataRequestLog->service_code.'" LIMIT 1) AS code_plan '), DB::raw(' (Select plans.limit_rules FROM member_plans @@ -521,7 +521,7 @@ class RequestLogController extends Controller DB::raw(' (Select plans.code FROM member_plans LEFT JOIN plans ON plans.id = member_plans.plan_id - WHERE member_plans.member_id = members.id LIMIT 1) AS code_plan + WHERE member_plans.member_id = members.id AND plans.service_code = "'.$dataRequestLog->service_code.'" LIMIT 1) AS code_plan '), DB::raw(' (Select plans.limit_rules FROM member_plans diff --git a/frontend/hospital-portal/public/lang/id-ID.json b/frontend/hospital-portal/public/lang/id-ID.json index 29798776..bb75e6d5 100644 --- a/frontend/hospital-portal/public/lang/id-ID.json +++ b/frontend/hospital-portal/public/lang/id-ID.json @@ -37,6 +37,6 @@ "txtAdditionalDocuments" : "Dokumen Tambahan", "txtAddNew" : "Tambah Baru", "txtAddress" : "Alamat", - "txtProvider": "Penyedia", + "txtProvider": "Provider", "txtAlertProvider" : "Mohon masukan provider" } diff --git a/resources/views/pdf/final_log_page_1.blade.php b/resources/views/pdf/final_log_page_1.blade.php index 80928fee..718a330c 100644 --- a/resources/views/pdf/final_log_page_1.blade.php +++ b/resources/views/pdf/final_log_page_1.blade.php @@ -187,6 +187,18 @@ margin-top: 1px; /* jarak antara segitiga dan gambar */ margin-bottom: 5px; } + .container2-timestamp; ?>:after { + content: ""; + display: table; + clear: both; + } + + .container2-timestamp; ?> > div { + float: left; /* Membuat elemen berdampingan */ + width: 48%; /* Atur lebar elemen agar mereka tidak tumpang tindih */ + box-sizing: border-box; /* Menghitung padding dan border ke dalam lebar elemen */ + + }
@@ -236,96 +248,126 @@ -| Jenis Surat Jaminan | -: | -SURAT JAMINAN AKHIR | -Penjamin | -: | -{{ $dataMember->penjamin }} | -
| Nama Peserta | -: | -{{ $dataMember->name }} | -Nama Perusahaan | -: | -{{ $dataMember->nama_perusahaan }} | -
| Nama Karyawan | -: | -{{ $namaKaryawan }} | -Phone Perusahaan | -: | -- |
| Tanggal Lahir | -: | -{{ \Carbon\Carbon::parse($dataMember->birth_date)->format('d M Y') }} | -No. Polis | -: | -{{ $dataMember->no_polis }} | -
| Jenis Kelamin | -: | -{{ $dataMember->gender == 'male' ? 'Laki-Laki' : 'Perempuan' }} | -Tipe | -: | -{{ $dataMember->limit_rules == '999999999' ? 'As Charge' : 'Max Amount, Rp '.number_format($dataMember->limit_rules, 2, ',', '.') }} | -
| Member ID (BN) | -: | -{{ $dataMember->member_id }} | -Status Polis | -: | -{{ $dataMember->status_polis == 'active' ? 'Aktif' : 'Tidak Aktif' }} | -
| Identitas Peserta | -: | -{{ $dataMember->nik }} | -Periode Jaminan | -: | -{{ \Carbon\Carbon::parse($request_logs->submission_date)->format('d M Y') }} | -
| Hak Kamar Pasien | -: | -{{ !empty($dataRequestLog->hak_kamar_pasien) ? $dataRequestLog->hak_kamar_pasien : ''}} | -Mata Uang | -: | -{{ $dataMember->mata_uang }} | -
| Penempatan Kamar | -: | -{{ !empty($dataRequestLog->penempatan_kamar) ? $dataRequestLog->penempatan_kamar : ''}} | -Alamat Provider | -: | -{{ !empty($rumahSakit->alamat_rumahsakit) ? $rumahSakit->alamat_rumahsakit : '' }} | -
| No. Rekam Medis | -: | -- | - | - | - |
| Jenis Perawatan | -: | -{{ $dataMember->jenis_perwatan }} | -- | - | - |