diff --git a/Modules/Internal/Http/Controllers/Api/Linksehat/PrescriptionController.php b/Modules/Internal/Http/Controllers/Api/Linksehat/PrescriptionController.php index 91d50556..9b96b3e7 100644 --- a/Modules/Internal/Http/Controllers/Api/Linksehat/PrescriptionController.php +++ b/Modules/Internal/Http/Controllers/Api/Linksehat/PrescriptionController.php @@ -26,7 +26,14 @@ class PrescriptionController extends Controller { // return $request->toArray(); $prescription = Prescription::query() - ->with(['livechat', 'user', 'items']); + ->with(['livechat', 'user', 'items']) + ->join('tx_prescription_orders', 'tx_prescriptions.nID', '=', 'tx_prescription_orders.nIDPrescription') + ->select( + 'tx_prescriptions.*', + 'tx_prescription_orders.sStatus as status_prescription', + 'tx_prescription_orders.sAddress as kirim_ke', + 'tx_prescription_orders.sDeliveryMethod as delivery', + ); if ($request->has('search')) { $search = $request->search; $prescription->where(function ($query) use ($search) { @@ -34,13 +41,13 @@ class PrescriptionController extends Controller ->orWhere('sKodeResep', 'LIKE', '%' . $search . "%"); }); } - + if (($request->has('prescription_start') || $request->has('prescription_end')) && !empty($request->prescription_start) && !empty($request->prescription_end) ) { - - + + $prescription = $prescription->where(function($q) use ($request) { $q->where('dTanggalResep', '>=', $request->prescription_start) ->where('dTanggalResep', '<=', $request->prescription_end); @@ -156,6 +163,7 @@ class PrescriptionController extends Controller 'Date Consultation', 'Patient', 'Doctor', + 'Status', 'Jenis Obat (Drugs)', 'Jumlah Obat (QTY)', 'Cara Minum Obat', @@ -178,7 +186,7 @@ class PrescriptionController extends Controller }); } - if ($request->has('prescription_start') && $request->has('prescription_end') && + if ($request->has('prescription_start') && $request->has('prescription_end') && !empty($request->prescription_start) && !empty($request->prescription_end)) { $prescriptionQuery->whereBetween('dTanggalResep', [$request->prescription_start, $request->prescription_end]); } diff --git a/Modules/Internal/Transformers/ReportPrescriptionResource.php b/Modules/Internal/Transformers/ReportPrescriptionResource.php index baefd72f..e72099ef 100644 --- a/Modules/Internal/Transformers/ReportPrescriptionResource.php +++ b/Modules/Internal/Transformers/ReportPrescriptionResource.php @@ -16,7 +16,7 @@ class ReportPrescriptionResource extends JsonResource public function toArray($request) { $patientName = $this->user ? $this->user->sFirstName .' '. $this->user->sLastName : '-'; - + $data = [ 'id' => $this->nID, 'patient_name' => $patientName, @@ -25,6 +25,7 @@ class ReportPrescriptionResource extends JsonResource 'date_consultation' => $this->dTanggalResep ? Carbon::parse($this->dTanggalResep)->format('Y-m-d H:i:s') : null, 'doctor_name' => $this->sDokterName ? $this->sDokterName : '-', 'items' => $this->items ? $this->items : [], + 'status_prescription' => $this->status_prescription ]; return $data; diff --git a/frontend/dashboard/src/pages/Report/Prescription/List.tsx b/frontend/dashboard/src/pages/Report/Prescription/List.tsx index 7ea1d96e..9cfe6b1f 100755 --- a/frontend/dashboard/src/pages/Report/Prescription/List.tsx +++ b/frontend/dashboard/src/pages/Report/Prescription/List.tsx @@ -158,7 +158,7 @@ export default function List() { setSearchText(searchParams.get('search') ?? ''); }, []); - + return (
@@ -337,6 +337,7 @@ export default function List() { {row.date_consultation ? fDateTime(row.date_consultation) : '-'} {row.patient_name ?? '-'} {row.doctor_name ?? '-'} + {row.status_prescription ?? '-'} {/* @@ -390,7 +391,7 @@ export default function List() { - + {/* END COLLAPSIBLE ROW */} Doctor + + Status + {/* Aksi */}