排班页面

app/Admin/Actions/Community/Notice/sendNotice.php

@@ -14,6 +14,7 @@ class sendNotice extends BatchAction
     public function handle(Collection $collection)
     {
         foreach ($collection as $model) {
+            dd($model->toArray());
             $openid = User::where('id',$model->id)->value('openid');
             $content = request('content');
             $remark= request('remark');

app/Community/Controllers/ScheduleController.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Community\Controllers;
+
+use App\Http\Controllers\Controller;
+use App\Models\Docter;
+use Encore\Admin\Controllers\AdminController;
+use Encore\Admin\Facades\Admin;
+use Encore\Admin\Layout\Content;
+
+
+class ScheduleController extends AdminController
+{
+    public function index(Content $content)
+    {
+
+        $content->title('排班页面');
+        $content->description('医生排班页面');
+        $user = Admin::user();
+        $org_id = $user->org_id;
+        $docter_id = $user->docter_id;
+        $url = '/cdms/chat_view?docter_id='.$docter_id;
+        $content->body('<iframe src="/cdms/chat_view?docter_id='.$docter_id.'" style="width: 100%;height:800px;border: none"></iframe>');
+        return $content;
+    }
+
+    public function schedule()
+    {
+        return view('/cdms');
+    }
+}

app/Http/Controllers/ScheDuleController.php

@@ -87,7 +87,7 @@ class ScheDuleController  extends Controller
         $sche_dule_arr =[
             [
                 'date'=>"上午",
-                'mondy'=>false,
+                'monday'=>false,
                 'tuesday'=>false,
                 'wednesday'=>false,
                 'thursday'=>false,
@@ -97,7 +97,7 @@ class ScheDuleController  extends Controller
             ],
             [
                 'date'=>"下午",
-                'mondy'=>false,
+                'monday'=>false,
                 'tuesday'=>false,
                 'wednesday'=>false,
                 'thursday'=>false,
@@ -107,7 +107,7 @@ class ScheDuleController  extends Controller
             ],
             [
                 'date'=>"晚上",
-                'mondy'=>false,
+                'monday'=>false,
                 'tuesday'=>false,
                 'wednesday'=>false,
                 'thursday'=>false,
@@ -118,7 +118,7 @@ class ScheDuleController  extends Controller
         ];
 
         //周字段映射
-        $week_arr = ['mondy','tuesday','wednesday','thursday','friday','saturday','sunday'];
+        $week_arr = ['monday','tuesday','wednesday','thursday','friday','saturday','sunday'];
 
         //时段区间id
         $schedule_config = SystemConfig::get('docter_config');
@@ -142,9 +142,12 @@ class ScheDuleController  extends Controller
                 $strtime = "$i";
                 $str_time = substr($strtime,0,4).'-'.substr($strtime,4,2).'-'.substr($strtime,6,2);
                 //检测上午
+
                 $is_mo_have = SchedulePeriod::whereIn('schedule_id',$sche_dule)->where('schedule_date',$str_time)->whereIn('time_period_id',$mo)
                     ->where('organization_id','!=',$org_id)->count();
-                $is_self = SchedulePeriod::where('schedule_id',$sche_dule)->where('schedule_date',$str_time)->whereIn('time_period_id',$mo)
+                ['schedule_id'=>$sche_dule,'schedule_date'=>$str_time,'organization_id'=>$org_id,'docter_id'=>$docter_id];
+
+                $is_self = SchedulePeriod::whereIn('schedule_id',$sche_dule)->where('schedule_date',$str_time)->whereIn('time_period_id',$mo)
                     ->where('organization_id',$org_id)->count();
                 if($is_self){
                     $sche_dule_arr[0][$week_arr[$j]] = true;
@@ -155,7 +158,7 @@ class ScheDuleController  extends Controller
                 //检测下午
                 $is_af_have = SchedulePeriod::whereIn('schedule_id',$sche_dule)->where('schedule_date',$str_time)->whereIn('time_period_id',$af)
                     ->where('organization_id','!=',$org_id)->count();
-                $is_af_self = SchedulePeriod::where('schedule_id',$sche_dule)->where('schedule_date',$str_time)->whereIn('time_period_id',$af)
+                $is_af_self = SchedulePeriod::whereIn('schedule_id',$sche_dule)->where('schedule_date',$str_time)->whereIn('time_period_id',$af)
                     ->where('organization_id',$org_id)->count();
                 if($is_af_self){
                     $sche_dule_arr[1][$week_arr[$j]] = true;
@@ -167,7 +170,7 @@ class ScheDuleController  extends Controller
                 //检测晚上
                 $is_ev_have = SchedulePeriod::whereIn('schedule_id',$sche_dule)->where('schedule_date',$str_time)->whereIn('time_period_id',$ev)
                     ->where('organization_id','!=',$org_id)->count();
-                $is_ev_self = SchedulePeriod::where('schedule_id',$sche_dule)->where('schedule_date',$str_time)->whereIn('time_period_id',$ev)
+                $is_ev_self = SchedulePeriod::whereIn('schedule_id',$sche_dule)->where('schedule_date',$str_time)->whereIn('time_period_id',$ev)
                     ->where('organization_id',$org_id)->count();
                 if($is_ev_self){
                     $sche_dule_arr[2][$week_arr[$j]] = true;
@@ -177,7 +180,6 @@ class ScheDuleController  extends Controller
                 }
             }
 
-
         } else {
             $ids = DocterOrganization::where(['docter_id'=>$docter_id])->pluck('organization_id');
             $list = Organization::whereIn('id',$ids)->get(['id as value','name as label'])->toArray();
@@ -189,10 +191,13 @@ class ScheDuleController  extends Controller
                 $strtime = "$i";
                 $str_time = substr($strtime,0,4).'-'.substr($strtime,4,2).'-'.substr($strtime,6,2);
                 //检测上午
+//                echo $str_time.'<br>';
+
                 $is_mo_have = SchedulePeriod::whereIn('schedule_id',$sche_dule)->where('schedule_date',$str_time)->whereIn('time_period_id',$mo)
-                    ->where('organization_id','!=',$org_id)->where('docter_id','!=',$docter_id)->count();
+                    ->where('organization_id','!=',$org_id)->where('docter_id','=',$docter_id)->count();
+
                 $is_mo_self = SchedulePeriod::whereIn('schedule_id',$sche_dule)->where('schedule_date',$str_time)->whereIn('time_period_id',$mo)
-                    ->where('organization_id','!=',$org_id)->where('docter_id',$docter_id)->count();
+                    ->where('organization_id','=',$org_id)->where('docter_id',$docter_id)->count();
                 if($is_mo_self){
                     $sche_dule_arr[0][$week_arr[$j]] = true;
                 }
@@ -201,9 +206,9 @@ class ScheDuleController  extends Controller
                 }
                 //检测下午
                 $is_af_have = SchedulePeriod::whereIn('schedule_id',$sche_dule)->where('schedule_date',$str_time)->whereIn('time_period_id',$af)
-                    ->where('organization_id','!=',$org_id)->where('docter_id','!=',$docter_id)->count();
+                    ->where('organization_id','!=',$org_id)->where('docter_id','=',$docter_id)->count();
                 $is_af_self = SchedulePeriod::whereIn('schedule_id',$sche_dule)->where('schedule_date',$str_time)->whereIn('time_period_id',$af)
-                    ->where('organization_id','!=',$org_id)->where('docter_id',$docter_id)->count();
+                    ->where('organization_id','=',$org_id)->where('docter_id',$docter_id)->count();
                 if($is_af_self){
                     $sche_dule_arr[1][$week_arr[$j]] = true;
                 }
@@ -213,9 +218,9 @@ class ScheDuleController  extends Controller
 
                 //检测晚上
                 $is_ev_have = SchedulePeriod::whereIn('schedule_id',$sche_dule)->where('schedule_date',$str_time)->whereIn('time_period_id',$ev)
-                    ->where('organization_id','!=',$org_id)->where('docter_id','!=',$docter_id)->count();
+                    ->where('organization_id','!=',$org_id)->where('docter_id','=',$docter_id)->count();
                 $is_ev_self = SchedulePeriod::whereIn('schedule_id',$sche_dule)->where('schedule_date',$str_time)->whereIn('time_period_id',$ev)
-                    ->where('organization_id','!=',$org_id)->where('docter_id',$docter_id)->count();
+                    ->where('organization_id','=',$org_id)->where('docter_id',$docter_id)->count();
                 if($is_ev_self){
                     $sche_dule_arr[2][$week_arr[$j]] = true;
                 }
@@ -236,7 +241,7 @@ class ScheDuleController  extends Controller
 
         $data['docter'] = $sche_dule_arr;
         $data['name'] = $name;
-        $data['list'] = $list;
+//        $data['list'] = $list;
 
         $data['role'] = $role;
         $data['user_id'] = $user_id;
@@ -248,11 +253,13 @@ class ScheDuleController  extends Controller
     {
         $docter_id = request('docter_id');
         $org_id = request('org_id');
-        $role = request('role');
-        $set_time = request('schdule_date');
+        $set_time = request('time');
+        $data = request('schedulingtime');
         $shcdule_id = request('schdule_id');
-        $set_time = '2020-11-30至2020-12-06';
-
+        $set_time = '2020-12-07至2020-12-13';
+        if(empty($set_time) || empty($org_id) || empty($docter_id)){
+            return json_encode(['status'=>601,'msg'=>'缺少必要参数','data'=>'']);
+        }
         $all_time = explode('至',$set_time);
         if(count($all_time) <2) {
             return json_encode(['status'=>601,'msg'=>'缺少必要参数','data'=>'']);
@@ -260,24 +267,23 @@ class ScheDuleController  extends Controller
         $start_time  = intval(str_replace('-','',$all_time[0]));
         $end_time  = intval(str_replace('-','',$all_time[1]));
         //周字段映射
-        $week_arr = ['mondy','tuesday','wednesday','thursday','friday','saturday','sunday'];
-
+        $week_arr = ['monday','tuesday','wednesday','thursday','friday','saturday','sunday'];
 
         $data = [
             [
                 'date'=>"上午",
-                'mondy'=>false,
+                'monday'=>false,
                 'tuesday'=>false,
                 'wednesday'=>false,
-                'thursday'=>false,
+                'thursday'=>true,
                 'friday'=>false,
                 'saturday'=>false,
                 'sunday'=>false,
             ],
             [
                 'date'=>"下午",
-                'mondy'=>false,
-                'tuesday'=>false,
+                'monday'=>false,
+                'tuesday'=>true,
                 'wednesday'=>false,
                 'thursday'=>false,
                 'friday'=>false,
@@ -286,9 +292,9 @@ class ScheDuleController  extends Controller
             ],
             [
                 'date'=>"晚上",
-                'mondy'=>false,
+                'monday'=>false,
                 'tuesday'=>false,
-                'wednesday'=>false,
+                'wednesday'=>true,
                 'thursday'=>false,
                 'friday'=>false,
                 'saturday'=>false,
@@ -334,6 +340,7 @@ class ScheDuleController  extends Controller
             unset($schedule_insert['schedule_day']);
 
             $schedule_insert['schedule_id'] =$shcdule_id;
+            $info = [];
             for ($i = 0 ;$i<=2;$i++){
                 $mo_schedule = array_values($data[$i]);
                 foreach ($mo_schedule as $key=>$val){
@@ -342,17 +349,16 @@ class ScheDuleController  extends Controller
                     $strtime = "$schedule_date";
                     $first_day = strtotime('this week');
                     $time_insert = $schedule_insert;
-                    $time_insert['type'] = $i;
+                    $time_insert['type'] = $i+1;
                     $real_time = date('Y-m-d',($first_day + ($key-1)*86400));
                     $time_insert['schedule_date'] = $real_time;
                     $time_insert['me_sure'] = 1;
                     foreach ($mo as $time_id){
-                        $is_have = SchedulePeriod::where(['time_period_id'=>$time_id,'type'=>1,'docter_id'=>$docter_id,'schedule_date'=>$real_time]);
-                        if(!$is_have){
-                            $time_insert['time_period_id'] = $time_id;
-                            $info[] = $time_insert;
-                            SchedulePeriod::insert($time_insert);
-                        }
+                        $is_have = SchedulePeriod::where(['time_period_id'=>$time_id,'type'=>($i+1),'docter_id'=>$docter_id,'schedule_date'=>$real_time]);
+                        if($is_have) break;
+                        $time_insert['time_period_id'] = $time_id;
+                        $info[] = $time_insert;
+                        SchedulePeriod::insert($time_insert);
                     }
                     if($val){
                         $data['schedule_date'] = $start_time ;
@@ -372,7 +378,6 @@ class ScheDuleController  extends Controller
     {
         $docter_id = request('docter_id');
         $org_id = request('org_id');
-//        dd(request()->toArray());
         $is_docter = CdmsUsers::where('docter_id',$docter_id);
         $role = 1;
         if(empty($org_id) && empty($docter_id)){

public/cdms/static/css/app.999c8fb4.css

@@ -0,0 +1 @@
+#app{width:1200px;margin:30px auto}

resources/views/cdms/schedule.blade.php

@@ -0,0 +1 @@
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>scheduling</title><link href="static/css/app.999c8fb4.css" rel="preload" as="style"><link href="static/css/chunk-vendors.767f701c.css" rel="preload" as="style"><link href="static/js/app.e96ab16e.js" rel="preload" as="script"><link href="static/js/chunk-vendors.6c9b2a24.js" rel="preload" as="script"><link href="static/css/chunk-vendors.767f701c.css" rel="stylesheet"><link href="static/css/app.999c8fb4.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but scheduling doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="static/js/chunk-vendors.6c9b2a24.js"></script><script src="static/js/app.e96ab16e.js"></script></body></html>