tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Server D3 Linksehat
2025-03-24 13:19:45 +07:00
parent a661ee7f25 ab3d850bd4
commit 277802c708
6 changed files with 50 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Modules/Internal/Http/Controllers/Api/Linksehat/PrescriptionController.php Normal file → Executable file
View File

@@ -32,8 +32,11 @@ class PrescriptionController extends Controller
'tx_prescriptions.*',
'tx_prescription_orders.sStatus as status_prescription',
'tx_prescription_orders.sAddress as kirim_ke',
'tx_prescription_orders.sDeliveryPrice as ongkir',
'tx_prescription_orders.sDeliveryMethod as delivery',
);
'tx_prescription_orders.nIDApotek',
)
->whereNotNull('nIDUser');
if ($request->has('search')) {
$search = $request->search;
$prescription->where(function ($query) use ($search) {
@@ -163,6 +166,8 @@ class PrescriptionController extends Controller
'Patient',
'Doctor',
'Status',
'Nama Apotek',
'Harga Ongkir',
'Jenis Obat (Drugs)',
'Jumlah Obat (QTY)',
'Cara Minum Obat',
@@ -175,7 +180,17 @@ class PrescriptionController extends Controller
// Query prescription data
$prescriptionQuery = 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.sDeliveryPrice as ongkir',
'tx_prescription_orders.sDeliveryMethod as delivery',
'tx_prescription_orders.nIDApotek',
)
->whereNotNull('nIDUser');
if ($request->has('search')) {
$search = $request->search;
@@ -195,13 +210,18 @@ class PrescriptionController extends Controller
if ($prescriptions->isNotEmpty()) {
$no = 1;
foreach ($prescriptions as $index => $row) {
$patientName = $row->user ? $row->user->sFirstName .' '. $row->user->sLastName : '-';
if ($row->items->isNotEmpty()) {
$rowData = [
$no++,
$row->sKodeResep ?? '-',
$row->dTanggalResep ? Carbon::parse($row->dTanggalResep)->format('Y-m-d') : '-',
$row->user->name ?? '-',
$row->user->fullName ?? '-',
$row->sDokterName ?? '-',
$row->status_prescription ?? '-',
$row->nIDApotek ? Helper::getOrganization($row->nIDApotek) : '-',
$row->ongkir ?? '-',
$row->sDeliveryPrice ?? '-',
];
// Create a row from the array and add it to the writer
@@ -214,6 +234,9 @@ class PrescriptionController extends Controller
'',
'',
'',
'',
'',
'',
$item->sItemName ?? '-',
$item->nQty ?? '-',
$item->sSigna ?? '-'