|
@@ -466,7 +466,7 @@ class OrderController extends AuthController
|
|
]);
|
|
]);
|
|
$user = $this->user;
|
|
$user = $this->user;
|
|
|
|
|
|
- $builder = Order::with(['docter.office', 'docter.qualification', 'orderPatient', 'orderPack', 'orderNurse', 'orderVaccine', 'organization.docter'])->where('user_id', $user['id']);
|
|
|
|
|
|
+ $builder = Order::with(['docter.office', 'docter.qualification', 'orderPatient', 'orderPack', 'orderNurse', 'orderVaccine', 'organization.docter', 'suggest'])->where('user_id', $user['id']);
|
|
if (!empty($req['product_type'])) {
|
|
if (!empty($req['product_type'])) {
|
|
$builder->where('product_type', $req['product_type']);
|
|
$builder->where('product_type', $req['product_type']);
|
|
}
|
|
}
|
|
@@ -517,7 +517,7 @@ class OrderController extends AuthController
|
|
]);
|
|
]);
|
|
$user = $this->user;
|
|
$user = $this->user;
|
|
|
|
|
|
- $data = Order::with(['docter.office', 'docter.qualification', 'orderPatient', 'orderPack.team.docter', 'orderNurse', 'orderVaccine', 'organization.docter'])->where('id', $req['order_id'])->where('user_id', $user['id'])->first();
|
|
|
|
|
|
+ $data = Order::with(['docter.office', 'docter.qualification', 'orderPatient', 'orderPack.team.docter', 'orderNurse', 'orderVaccine', 'organization.docter', 'suggest'])->where('id', $req['order_id'])->where('user_id', $user['id'])->first();
|
|
|
|
|
|
return out($data);
|
|
return out($data);
|
|
}
|
|
}
|