| xqd
@@ -280,7 +280,7 @@ class DocterController extends AuthController
|
|
|
]);
|
|
|
$builder = Schedule::with(['schedulePeriod.timePeriod', 'schedulePeriod.organization'])->where('organization_id', $req['organization_id'])->where('schedule_type', $req['schedule_type'])->where('schedule_day', '>=', date('Ymd'))->orderBy('schedule_day');
|
|
|
$data = $builder->paginate($req['per_page']??15)->toArray();
|
|
|
- $docterSettings = DocterSetting::select(['service_num'])->where('organization_id', $req['organization_id'])->where('type',$req['schedule_type'])->first();
|
|
|
+ $docterSettings = DocterSetting::select(['service_num'])->where('org_id', $req['organization_id'])->where('type',$req['schedule_type'])->first();
|
|
|
if (!empty($data)) {
|
|
|
foreach ($data['data'] as $k => &$v) {
|
|
|
foreach ($v['schedule_period'] as $k1 => &$v1) {
|