|
|
|
|
@ -234,7 +234,7 @@ class OrdersController extends CommonController
|
|
|
|
|
if ($has_ongoing_order) {
|
|
|
|
|
$query->has("onGoingOrder");
|
|
|
|
|
}
|
|
|
|
|
$query->with(["onGoingOrder" => function ($query) {
|
|
|
|
|
$query->whereHas('onGoingOrder')->with(["onGoingOrder" => function ($query) {
|
|
|
|
|
$query->leftJoin("paramedic", "orders.paramedic_id", "=", "paramedic.id")
|
|
|
|
|
->select("orders.id", "orders.bed_id", "orders.paramedic_id", "orders.status", "paramedic.name as paramedic_name");
|
|
|
|
|
}])->select("bed.id", "bed.name", "bed.room_id", "bed.area_id", "bed.myindex")
|
|
|
|
|
|