Merge branch 'master' of http://git.9026.com/swdz-WangHaijun/BaoMa

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/Admin/Actions/Serve/Addmember.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Admin\Actions\Serve;
+
+use Encore\Admin\Actions\RowAction;
+use Illuminate\Database\Eloquent\Model;
+
+class Addmember extends RowAction
+{
+    public $name = '添加成员';
+
+//    public function form(){
+//       TeamDocter::insert();
+//      $this->multipleSelect('member', '成员选择')->options(function ($ids) {
+//           return Docter::where('is_then', 1)->pluck('name', 'id');
+//       });
+//    }
+    public function handle(Model $model)
+    {
+        // $request ...
+//        TeamDocter::insert();
+        return $this->response()->success('跳转成功成功')->redirect('/admin/team_docter?team_id='.$this->row->id.'');
+    }
+}

app/Admin/Actions/Serve/member.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Admin\Actions\Serve;
+
+use Encore\Admin\Actions\Action;
+use Illuminate\Http\Request;
+use App\Models\Docter;
+
+class member extends Action
+{
+//    protected $selector = '.member';
+
+    public function handle(Request $request)
+    {
+        // $request ...
+        $provinceId = $request->get('q');
+        return Docter::where('is_then', 1)->get(['id', DB::raw('name as text')]);
+    }
+}

app/Admin/Controllers/ArticleController.php

@@ -15,7 +15,7 @@ class ArticleController extends AdminController
      *
      * @var string
      */
-    protected $title = 'Article';
+    protected $title = '文章列表';
 
     /**
      * Make a grid builder.

app/Admin/Controllers/BannerController.php

@@ -15,7 +15,7 @@ class BannerController extends AdminController
      *
      * @var string
      */
-    protected $title = 'Banner';
+    protected $title = '轮播图列表';
 
     /**
      * Make a grid builder.
@@ -63,11 +63,11 @@ class BannerController extends AdminController
         $show = new Show(Banner::findOrFail($id));
 
         $show->field('id', __('Id'));
-        $show->field('image', __('Image'))->image('',100,100);
-        $show->field('url', __('Url'));
-        $show->field('status', __('Status'));
-        $show->field('updated_at', __('Updated at'));
-        $show->field('created_at', __('Created at'));
+        $show->field('image', __('图片'))->image('',100,100);
+        $show->field('url', __('链接'));
+        $show->field('status', __('状态'));
+        $show->field('updated_at', __('创建时间'));
+        $show->field('created_at', __('更新时间'));
 
         return $show;
     }

app/Admin/Controllers/IconsDoctorController.php

@@ -85,7 +85,7 @@ class IconsDoctorController extends AdminController
             'off' => ['value' => 0, 'text' => '禁用', 'color' => 'danger'],
             'on'  => ['value' => 1, 'text' => '启用', 'color' => 'success'],
         ];
-        $form->switch('status', __('Status'))->states($status);
+        $form->switch('status', __('状态'))->states($status);
 
         return $form;
     }

app/Admin/Controllers/IconsUserController.php

@@ -86,7 +86,7 @@ class IconsUserController extends AdminController
             'off' => ['value' => 0, 'text' => '禁用', 'color' => 'danger'],
             'on'  => ['value' => 1, 'text' => '启用', 'color' => 'success'],
         ];
-        $form->switch('status', __('Status'))->states($status);
+        $form->switch('status', __('状态'))->states($status);
 
         return $form;
     }

app/Admin/Controllers/MenubarController.php

@@ -15,7 +15,7 @@ class MenubarController extends AdminController
      *
      * @var string
      */
-    protected $title = 'Menubar';
+    protected $title = '底部菜单';
 
     /**
      * Make a grid builder.
@@ -54,8 +54,8 @@ class MenubarController extends AdminController
 
         $form->text('name', __('名称'));
         $form->image('image', __('默认图片'));
-        $form->image('image_at', __('Image at'));
-        $form->text('url', __('Url'));
+        $form->image('image_at', __('点击图片'));
+        $form->text('url', __('链接'));
         $status = [
             'off' => ['value' => 0, 'text' => '禁用', 'color' => 'danger'],
             'on'  => ['value' => 1, 'text' => '启用', 'color' => 'success'],

app/Admin/Controllers/OpenPackController.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Models\Team;
+use App\Models\Order;
+use Encore\Admin\Controllers\AdminController;
+use Encore\Admin\Grid;
+
+class OpenPackController extends AdminController
+{
+    /**
+     * Title for current resource.
+     *
+     * @var string
+     */
+    protected $title = '开通记录';
+
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        $grid = new Grid(new Order());
+
+        $grid->model()->where('product_type','6');
+        $grid->column('id', __('订单ID'));
+        $grid->column('user_id', __('用户ID'));
+        $grid->column('user.name','用户姓名');
+        $grid->column('patients.name', __('患者名称'));
+        $grid->column('orderPack.service_pack_id', __('服务包ID'));
+        $grid->column('orderPack.pack_name', __('服务包名称'));
+        $grid->column('orderPack.pack_price', __('服务包价格'));
+        $grid->column('orderPack.team_id', __('所属团队'))->display(function ($model){
+            $name = Team::where('id',$model)->value('name');
+            return $name;
+        });
+        $grid->column('created_at', __('创建时间'));
+        $grid->column('updated_at', __('更新时间'));
+
+        return $grid;
+    }
+}

app/Admin/Controllers/OutpatientServiceController.php

@@ -16,7 +16,7 @@ class OutpatientServiceController extends AdminController
      *
      * @var string
      */
-    protected $title = 'Docter';
+    protected $title = '门诊订单数';
 
     /**
      * Make a grid builder.

app/Admin/Controllers/PhoneServiceController.php

@@ -17,7 +17,7 @@ class PhoneServiceController extends AdminController
      *
      * @var string
      */
-    protected $title = 'Docter';
+    protected $title = '电话订单数';
 
     /**
      * Make a grid builder.

app/Admin/Controllers/ReplyServiceController.php

@@ -16,7 +16,7 @@ class ReplyServiceController extends AdminController
      *
      * @var string
      */
-    protected $title = 'Docter';
+    protected $title = '图文订单数';
 
     /**
      * Make a grid builder.

app/Admin/Controllers/ServicePacksController.php

@@ -15,7 +15,7 @@ class ServicePacksController extends AdminController
      *
      * @var string
      */
-    protected $title = 'ServicePack';
+    protected $title = '服务包列表';
 
     /**
      * Make a grid builder.
@@ -44,7 +44,7 @@ class ServicePacksController extends AdminController
             return 0;
         })->label('info');
         $grid->column('price', __('价格'));
-        $grid->column('team_id', __('团队名称'));
+        $grid->column('team.name', __('团队名称'));
         $grid->column('image','图片')->image('','50','50');
         $grid->column('phone_minutes', __('电话次数（分钟）'));
         $grid->column('chat_num', __('图文次数'));
@@ -100,8 +100,8 @@ class ServicePacksController extends AdminController
 //        $form->number('vaccine_limit_amount', __('计免次数'))->default(0);
 //        $form->number('nurses_limit_amount', __('儿保次数'))->default(0);
         $form->text('effective_days', __('服务时长（秒）'))->default(0);
-        $form->text('insurance_policy', __('保单名称'))->rules('required' ,['required'=>'请填写保单名称！']);;
-        $form->text('insurance_img_url', __('保单图片链接'))->rules('required' ,['required'=>'请填写保单图片链接！']);;
+        $form->text('insurance_policy', __('保单名称'))->rules('required' ,['required'=>'请填写保单名称！']);
+        $form->text('insurance_img_url', __('保单图片链接'))->rules('required' ,['required'=>'请填写保单图片链接！']);
 
         return $form;
     }

app/Admin/Controllers/TeamController.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Admin\Actions\Serve\Addmember;
+use App\Models\Docter;
+use App\Models\Team;
+use App\Models\TeamDocter;
+use Encore\Admin\Controllers\AdminController;
+use Encore\Admin\Form;
+use Encore\Admin\Grid;
+use Encore\Admin\Show;
+use Encore\Admin\Widgets\Table;
+
+class TeamController extends AdminController
+{
+    /**
+     * Title for current resource.
+     *
+     * @var string
+     */
+    protected $title = '团队列表';
+
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        $grid = new Grid(new Team());
+
+        $grid->column('id', __('Id'));
+        $grid->column('name', __('团队名称'));
+        $grid->column('introduction','简介')->limit(15,'...')->width(200);
+        $grid->column('member','成员查看')->display(function (){
+            return '点击查看';
+        })->modal('成员列表', function ($model){
+            $docters = $model->docter()->get()->map(function ($docter) {
+                return $docter->only(['id', 'name']);
+            });
+            return new Table(['医生ID', '医生名称'], $docters->toArray());
+        });
+        $grid->column('created_at', __('创建时间'));
+        $grid->column('updated_at', __('更新时间'));
+        $status = [
+            'off' => ['value' => 0, 'text' => '禁用', 'color' => 'danger'],
+            'on'  => ['value' => 1, 'text' => '启用', 'color' => 'success'],
+        ];
+        $grid->column('status', __('状态'))->switch($status);
+        $grid->actions(function ($actions) {
+            // 去掉查看
+            $actions->disableView();
+        });
+        $grid->actions(function ($actions) {
+            $actions->add(new Addmember);
+        });
+
+        return $grid;
+    }
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        $form = new Form(new Team());
+        $form->text('name', __('团队名称'))->rules('required' ,['required'=>'请填写团队名称！']);
+        $form->text('introduction','简介')->rules('required' ,['required'=>'请填写团队简介！']);
+        $status = [
+            'off' => ['value' => 0, 'text' => '禁用', 'color' => 'danger'],
+            'on'  => ['value' => 1, 'text' => '启用', 'color' => 'success'],
+        ];
+        $form->switch('status', __('状态'))->states($status);
+
+        return $form;
+    }
+
+}

app/Admin/Controllers/TeamDocterController.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Models\TeamDocter;
+use App\Models\Docter;
+use Encore\Admin\Controllers\AdminController;
+use Encore\Admin\Form;
+use Encore\Admin\Grid;
+use Encore\Admin\Show;
+
+class TeamDocterController extends AdminController
+{
+    /**
+     * Title for current resource.
+     *
+     * @var string
+     */
+    protected $title = '团队——医生表';
+
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        $grid = new Grid(new TeamDocter());
+
+        $grid->filter(function ($filter){
+            $filter->disableIdFilter();
+            $filter->equal('team_id','团队');
+        });
+        $grid->column('id', __('Id'));
+        $grid->column('docter_id', __('医生ID'));
+        $grid->column('docter.name', __('医生姓名'));
+        $grid->column('team.name', __('团队名称'));
+        $grid->column('team.introduction', __('团队简介'));
+        $grid->column('created_at', __('创建时间'));
+        $grid->column('updated_at', __('更新时间'));
+
+        return $grid;
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        $form = new Form(new TeamDocter());
+        $form->select('docter_id', __('医生名称'))->options(function (){
+            return Docter::where('is_then', 1)->pluck('name', 'id');
+        });
+//        $form->saving(function (Form $form){
+//           $form -> team_id = $form ->
+//        });
+        $form->text('team_id', __('团队ID'));
+
+        return $form;
+    }
+}

app/Admin/Controllers/VaccinesController.php

@@ -16,7 +16,7 @@ class VaccinesController extends AdminController
      *
      * @var string
      */
-    protected $title = 'Vaccines';
+    protected $title = '疫苗管理';
 
     /**
      * Make a grid builder.

app/Admin/routes.php

@@ -51,7 +51,7 @@ Route::group([
     $router->resource('service_packs', ServicePacksController::class);
     $router->resource('team_docter',TeamDocterController::class);
     //服务包管理->开通记录
-    $router->resource('open_Pack', OpenPackController::class);
+    $router->resource('open_pack', OpenPackController::class);
 
     $router->resource('/setting', 'Config\ConfigController');
     $router->get('/setting_form', 'Config\FormController@form');

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)){

app/Models/Order.php

@@ -31,6 +31,9 @@ class Order extends BaseModel
         return $this->belongsTo(Docter::class);
     }
 
+    public function patients(){
+        return $this->belongsTo(Patient::class);
+    }
     public function orderPatient()
     {
         return $this->hasOne(OrderPatient::class);

app/Models/Patient.php

@@ -45,4 +45,7 @@ class Patient extends BaseModel
     public function users(){
         return $this->belongsTo(User::class,'id','user_id');
     }
+    public function order(){
+        return $this->hasMany(Order::class);
+    }
 }

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>