|
@@ -235,21 +235,13 @@ class DocterController extends AuthController
|
|
$this->validate(request(), [
|
|
$this->validate(request(), [
|
|
'organization_id' => 'required|integer',
|
|
'organization_id' => 'required|integer',
|
|
'schedule_type' => 'required|integer',
|
|
'schedule_type' => 'required|integer',
|
|
- 'per_page' => 'integer',
|
|
|
|
'latitude' => 'numeric',
|
|
'latitude' => 'numeric',
|
|
'longitude' => 'numeric',
|
|
'longitude' => 'numeric',
|
|
]);
|
|
]);
|
|
|
|
|
|
$docterSettings = DocterSetting::select(['service_num', 'show_days'])->where('org_id', $req['organization_id'])->where('type', $req['schedule_type'])->first();
|
|
$docterSettings = DocterSetting::select(['service_num', 'show_days'])->where('org_id', $req['organization_id'])->where('type', $req['schedule_type'])->first();
|
|
$per_page = !empty($docterSettings['show_days']) ? $docterSettings['show_days'] : 15;
|
|
$per_page = !empty($docterSettings['show_days']) ? $docterSettings['show_days'] : 15;
|
|
- $builder = Schedule::with(['schedulePeriod.timePeriod', 'schedulePeriod.organization'])->where('schedule_day', '>=', date('Ymd'));
|
|
|
|
- if (!empty($req['organization_id'])) {
|
|
|
|
- $builder->where('organization_id', $req['organization_id']);
|
|
|
|
- }
|
|
|
|
- if (!empty($req['schedule_type'])) {
|
|
|
|
- $builder->where('schedule_type', $req['schedule_type']);
|
|
|
|
- }
|
|
|
|
- $data = $builder->orderBy('schedule_day', 'asc')->paginate($per_page)->toArray();
|
|
|
|
|
|
+ $data = Schedule::with(['schedulePeriod.timePeriod', 'schedulePeriod.organization'])->where('schedule_day', '>=', date('Ymd'))->where('organization_id', $req['organization_id'])->where('schedule_type', $req['schedule_type'])->orderBy('schedule_day', 'asc')->paginate($per_page)->toArray();
|
|
|
|
|
|
if (!empty($data)) {
|
|
if (!empty($data)) {
|
|
foreach ($data['data'] as $k => &$v) {
|
|
foreach ($data['data'] as $k => &$v) {
|