This commit is contained in:
ivan-sim
2024-09-23 09:20:20 +07:00
parent 59e38b969e
commit 15138f7edf
3 changed files with 21 additions and 8 deletions

View File

@@ -26,7 +26,14 @@ class PrescriptionController extends Controller
{ {
// return $request->toArray(); // return $request->toArray();
$prescription = Prescription::query() $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')) { if ($request->has('search')) {
$search = $request->search; $search = $request->search;
$prescription->where(function ($query) use ($search) { $prescription->where(function ($query) use ($search) {
@@ -156,6 +163,7 @@ class PrescriptionController extends Controller
'Date Consultation', 'Date Consultation',
'Patient', 'Patient',
'Doctor', 'Doctor',
'Status',
'Jenis Obat (Drugs)', 'Jenis Obat (Drugs)',
'Jumlah Obat (QTY)', 'Jumlah Obat (QTY)',
'Cara Minum Obat', 'Cara Minum Obat',

View File

@@ -25,6 +25,7 @@ class ReportPrescriptionResource extends JsonResource
'date_consultation' => $this->dTanggalResep ? Carbon::parse($this->dTanggalResep)->format('Y-m-d H:i:s') : null, 'date_consultation' => $this->dTanggalResep ? Carbon::parse($this->dTanggalResep)->format('Y-m-d H:i:s') : null,
'doctor_name' => $this->sDokterName ? $this->sDokterName : '-', 'doctor_name' => $this->sDokterName ? $this->sDokterName : '-',
'items' => $this->items ? $this->items : [], 'items' => $this->items ? $this->items : [],
'status_prescription' => $this->status_prescription
]; ];
return $data; return $data;

View File

@@ -337,6 +337,7 @@ export default function List() {
<TableCell align="left">{row.date_consultation ? fDateTime(row.date_consultation) : '-'}</TableCell> <TableCell align="left">{row.date_consultation ? fDateTime(row.date_consultation) : '-'}</TableCell>
<TableCell align="left">{row.patient_name ?? '-'}</TableCell> <TableCell align="left">{row.patient_name ?? '-'}</TableCell>
<TableCell align="left">{row.doctor_name ?? '-'}</TableCell> <TableCell align="left">{row.doctor_name ?? '-'}</TableCell>
<TableCell align="left">{row.status_prescription ?? '-'}</TableCell>
{/* <TableCell align="center"> {/* <TableCell align="center">
<ButtonGroup variant="text" aria-label="text button group"> <ButtonGroup variant="text" aria-label="text button group">
<Link to={'/report/appointments/' + row.id + '/show'}> <Link to={'/report/appointments/' + row.id + '/show'}>
@@ -542,6 +543,9 @@ export default function List() {
<TableCell style={headStyle} align="left"> <TableCell style={headStyle} align="left">
Doctor Doctor
</TableCell> </TableCell>
<TableCell style={headStyle} align="left">
Status
</TableCell>
{/* <TableCell style={headStyle} align="center"> {/* <TableCell style={headStyle} align="center">
Aksi Aksi
</TableCell> */} </TableCell> */}