排班优化

app/Community/Controllers/ApiController.php

@@ -340,6 +340,7 @@ class ApiController extends Controller
 //            $serviceNum = $docter_setting->service_num;
             $time_period = object_array(json_decode($docter_setting->service_time));
             $allCount = TimePeriod::where(['docter_id' => $docter_id, 'org_id' => $org_id])->count();
+
             if ($allCount == 0) return apiReturn(603, '请设置时间段');
             $times[] = TimePeriod::where(['docter_id' => $docter_id, 'org_id' => $org_id, 'type' => $sType])->whereBetween('end_time_period', [intval($time_period[1]['amStartTime']), intval($time_period[1]['amEndTime'])])->pluck('id')->toArray();
             $times[] = TimePeriod::where(['docter_id' => $docter_id, 'org_id' => $org_id, 'type' => $sType])->whereBetween('end_time_period', [intval($time_period[2]['pmStartTime']), intval($time_period[2]['pmEndTime'])])->pluck('id')->toArray();
@@ -807,8 +808,14 @@ class ApiController extends Controller
         $role = 1;
         $docter_id = 0;
         if ($user->docter_id && $user->org_id) {
-            $role = 2;
-            if ($sType == 1) $docter_id = $user->docter_id;
+            if ($sType == 1){
+                $role = 2;
+                $docter_id = $user->docter_id;
+            }  else {
+                $docter_id = 0;
+                $role = 1;
+            }
+
         } else if (!$user->docter_id && $user->org_id) {
             $role = 1;
         } else if (!$user->docter_id && !$user->org_id) {
@@ -920,7 +927,7 @@ class ApiController extends Controller
                     } else {
                         $scheduleId = Schedule::where(['docter_id' => $docterId, 'schedule_type' => $sType,'organization_id'=>$orgId])->where('schedule_day', $numDate)->value('id');
                     }
-                    dump($scheduleId);
+//                    dump($scheduleId);
                     if (empty($scheduleId)) {
                         $numDate = date('Ymd', $todayTimer);
                         $scheduleData['docter_id'] = $docterId;
@@ -945,7 +952,7 @@ class ApiController extends Controller
             }
 
 
-            echo '医生id '.$docterId.' 机构id '.$orgId.' 周几 '.$week;
+//            echo '医生id '.$docterId.' 机构id '.$orgId.' 周几 '.$week;
             $real_id = WeekSchedule::where(['docter_id' => $docterId, 'organization_id' => $orgId, 'week' => $week, 'type' => $tType, 'schedule_type' => $sType])->first();
             if (!empty($real_id)) {
 
@@ -1123,7 +1130,6 @@ class ApiController extends Controller
             }
             DB::commit();
         } catch (\Exception $e) {
-            dd($e->getMessage());
             DB::rollBack();
             return apiReturn(603, '操作失败');
         }