排班

app/Community/Controllers/ApiController.php

@@ -5,11 +5,20 @@ namespace App\Community\Controllers;
 
 
 use App\Http\Controllers\Controller;
+use App\Models\CdmsUsers;
 use App\Models\Docter;
+use App\Models\DocterOrganization;
+use App\Models\Order;
+use App\Models\Organization;
 use App\Models\PatientRemark;
 use App\Models\Schedule;
+use App\Models\SchedulePeriod;
+use App\Models\SystemConfig;
 use App\Models\TimePeriod;
+use Carbon\Carbon;
 use EasyWeChat\Factory;
+use Encore\Admin\Facades\Admin;
+use mysql_xdevapi\Exception;
 
 class ApiController extends Controller
 {
@@ -95,20 +104,375 @@ class ApiController extends Controller
     }
 
 
-
+    //获取排班页面
     public function getComSchedule()
     {
 
-        $time  = TimePeriod::get(['id','start_time_period','end_time_period']);
-        dd($time);
-        $data['community'] = [];
-        $data['docter'] = [];
+        $set_time = request('time');//时间
+        $org_id = request('org_id');//机构
+        $docter_id = request('docter_id');//医生
 
-    }
 
+//        $set_time = '2020-11-30至2020-12-06';
+//        $org_id = 1;
+//        $docter_id = 47;
+        $role = 2;
+
+        if(empty($set_time) || empty($org_id) || empty($docter_id)){
+            return json_encode(['status'=>601,'msg'=>'缺少必要参数','data'=>'']);
+        } else{
+//            echo 'what happend';
+        }
+
+
+        $all_time = explode('至',$set_time);
+        if(count($all_time) <2){
+            return json_encode(['status'=>601,'msg'=>'缺少必要参数','data'=>'']);
+        }
+
+        $start_time  = intval(str_replace('-','',$all_time[0]));
+        $end_time  = intval(str_replace('-','',$all_time[1]));
+        $first_day = strtotime($all_time[0]);
+//        DB::enableQueryLog();
+        $sche_dule = Schedule::whereBetween('schedule_day',[$start_time,$end_time])
+            ->where(['docter_id'=>$docter_id])
+            ->pluck('id')
+            ->toArray();
+//        echo '<pre>';
+//        print_r(DB::getQueryLog());
+//        echo '</pre>';
+        //dd($sche_dule);
+
+        $sche_dule_arr =[
+            [
+                'date'=>"上午",
+                'monday'=>false,
+                'tuesday'=>false,
+                'wednesday'=>false,
+                'thursday'=>false,
+                'friday'=>false,
+                'saturday'=>false,
+                'sunday'=>false,
+            ],
+            [
+                'date'=>"下午",
+                'monday'=>false,
+                'tuesday'=>false,
+                'wednesday'=>false,
+                'thursday'=>false,
+                'friday'=>false,
+                'saturday'=>false,
+                'sunday'=>false,
+            ],
+            [
+                'date'=>"晚上",
+                'monday'=>false,
+                'tuesday'=>false,
+                'wednesday'=>false,
+                'thursday'=>false,
+                'friday'=>false,
+                'saturday'=>false,
+                'sunday'=>false,
+            ]
+        ];
+
+        //周字段映射
+        $week_arr = ['monday','tuesday','wednesday','thursday','friday','saturday','sunday'];
+
+        //时段区间id
+        $schedule_config = SystemConfig::get('docter_config');
+        $times[] = TimePeriod::where('start_time_period','>=',$schedule_config['morning_start'])->where('end_time_period','<=',$schedule_config['morning_end'])->pluck('id')->toArray();
+        $times[] = TimePeriod::where('start_time_period','>=',$schedule_config['afternoon_start'])->where('end_time_period','<=',$schedule_config['afternoon_end'])->pluck('id')->toArray();
+        $times[] = TimePeriod::where('start_time_period','>=',$schedule_config['evening_start'])->where('end_time_period','<=',$schedule_config['evening_end'])->pluck('id')->toArray();
+        if(empty($sche_dule)){
+            return ['status'=>200,'msg'=>'ok','data'=>['docter'=>$sche_dule_arr,'org_id'=>$org_id,'docter_id'=>$docter_id]];
+        }
+
+        $role = 2;
+        if($role == 1){
+            $ids = DocterOrganization::where(['organization_id'=>$org_id])->pluck('docter_id');
+            $list = Docter::whereIn('id',$ids)->get(['id as value','name as label'])->toArray();
+            $name = Organization::where('id',$docter_id)->value('name');
 
+            $user_id = $org_id;
+            for ($i = 1; $i<7; $i++){
+                $str_time =  date('Y-m-d',($first_day + $i * 86400));
+                for($j=0;$j<3;$j++){
+                    //检测上午
+                    $is_mo_have = SchedulePeriod::whereIn('schedule_id',$sche_dule)->where('schedule_date',$str_time)->whereIn('time_period_id',$times[$j])
+                        ->where('organization_id','!=',$org_id)->count();
+                    ['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',$times[$j])
+                        ->where('organization_id',$org_id)->count();
+
+                    if($is_self){
+                        $sche_dule_arr[$j][$week_arr[$i]] = true;
+                    }
+                    if($is_mo_have){
+                        $sche_dule_arr[$j][$week_arr[$i]] = 'other';
+                    }
+                }
+            }
+        } else {
+
+            $ids = DocterOrganization::where(['docter_id'=>$docter_id])->pluck('organization_id');
+            $list = Organization::whereIn('id',$ids)->get(['id as value','name as label'])->toArray();
+            $name = Docter::where('id',$docter_id)->value('name');
+            $user_id = $docter_id;
+            for ($i=0; $i<=6; $i++){
+                $str_time =  date('Y-m-d',($first_day + $i * 86400));
+                for($j=0;$j<=2;$j++){
+                    //检测上午
+                    $is_mo_have = SchedulePeriod::whereIn('schedule_id',$sche_dule)->where('schedule_date',$str_time)->whereIn('time_period_id',$times[$j])
+                        ->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',$times[$j])
+                        ->where('organization_id',$org_id)->where('docter_id',$docter_id)->count();
+//                    echo $i.'--'.$j.'is_self---'.$is_mo_self.'<br>';
+
+                    if($is_mo_self){
+                        $sche_dule_arr[$j][$week_arr[$i]] = true;
+                    }
+                    if($is_mo_have){
+                        $sche_dule_arr[$j][$week_arr[$i]] = 'other';
+                    }
+                }
+            }
+        }
+
+
+        //  "morning_start" => "09:00"
+        //  "morning_end" => "12:00"
+        //  "afternoon_start" => "13:00"
+        //  "afternoon_end" => "18:00"
+        //  "evening_start" => "19:00"
+        //  "evening_end" => "20:00"
+
+
+        $data['docter'] = $sche_dule_arr;
+        $data['name'] = $name;
+//        $data['list'] = $list;
+
+        $data['role'] = $role;
+        $data['user_id'] = $user_id;
+        return  (json_encode(['code'=>200,'msg'=>'ok','data'=>$data]));
+    }
+
+    //编辑排班
     public function setDocChedule()
     {
+        $docter_id = request('docter_id');
+        $org_id = request('org_id');
+        $set_time = request('time');
+        $data = request('schedulingtime');
+//        $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);
+        $schedule_id = Schedule::where(['organization_id'=>$org_id,'docter_id'=>$docter_id,'schedule_date'=>$all_time[0]])->value('id');
+        if(count($all_time) <2) {
+            return json_encode(['status'=>601,'msg'=>'缺少必要参数','data'=>'']);
+        }
+        $start_time  = intval(str_replace('-','',$all_time[0]));
+        $end_time  = intval(str_replace('-','',$all_time[1]));
+        $first_day = strtotime($start_time);
+        //周字段映射
+        $week_arr = ['monday','tuesday','wednesday','thursday','friday','saturday','sunday'];
+//        $data = [
+//            [
+//                'date'=>"上午",
+//                'monday'=>false,
+//                'tuesday'=>false,
+//                'wednesday'=>false,
+//                'thursday'=>true,
+//                'friday'=>false,
+//                'saturday'=>false,
+//                'sunday'=>false,
+//            ],
+//            [
+//                'date'=>"下午",
+//                'monday'=>false,
+//                'tuesday'=>true,
+//                'wednesday'=>false,
+//                'thursday'=>false,
+//                'friday'=>false,
+//                'saturday'=>false,
+//                'sunday'=>false,
+//            ],
+//            [
+//                'date'=>"晚上",
+//                'monday'=>false,
+//                'tuesday'=>false,
+//                'wednesday'=>true,
+//                'thursday'=>false,
+//                'friday'=>false,
+//                'saturday'=>false,
+//                'sunday'=>false,
+//            ]
+//        ];
+
+
+        //时段区间id
+        $schedule_config = SystemConfig::get('docter_config');
+        $times[1] = TimePeriod::where('start_time_period','>=',$schedule_config['morning_start'])
+            ->where('end_time_period','<=',$schedule_config['morning_end'])
+            ->pluck('id')->toArray();
+
+        $times[2] = TimePeriod::where('start_time_period','>=',$schedule_config['afternoon_start'])
+            ->where('end_time_period','<=',$schedule_config['afternoon_end'])
+            ->pluck('id')->toArray();
+
+        $times[3] = TimePeriod::where('start_time_period','>=',$schedule_config['evening_start'])
+            ->where('end_time_period','<=',$schedule_config['evening_end'])
+            ->pluck('id')->toArray();
+        foreach ($times as $val){
+            foreach ($val as $t){
+                $time_period[] = $t;
+            }
+        }
+
+        $data[0] = array_values(object_array(json_decode($data[0])));
+        $data[1] = array_values(object_array(json_decode($data[1])));
+        $data[2] = array_values(object_array(json_decode($data[2])));
+
+        $mo_schedule = array_values($data[0]);
+        $af_schedule = array_values($data[1]);
+        $ev_schedule = array_values($data[2]);
+
+
+        DB::beginTransaction();
+        try {
+            $schedule_insert = [
+                'organization_id'=>$org_id,
+                'docter_id'=>$docter_id,
+                'schedule_date'=>$all_time[0],
+                'schedule_day'=>$start_time,
+                'created_at'=>Carbon::now(),
+                'updated_at'=>Carbon::now(),
+            ];
+            if(!$schedule_id){
+                $schedule_id = Schedule::insertGetId($schedule_insert);
+            }
+            unset($schedule_insert['schedule_day']);
+            $schedule_insert['schedule_id'] =$schedule_id;
+            $info = [];
+            for ($i = 1 ;$i<=3;$i++){
+                $mo_schedule = array_values($data[$i-1]);
+                foreach ($mo_schedule as $key=>$val){
+                    if($key==0) continue;
+                    $schedule_date = $start_time + $key;
+                    $strtime = "$schedule_date";
+                    $time_insert = $schedule_insert;
+                    $time_insert['type'] = $i;
+
+                    $schedule_time = $times[$i];
+                    $real_time = date('Y-m-d',($first_day + ($key-1)*86400));
+                    $time_insert['schedule_date'] = $real_time;
+                    $time_insert['me_sure'] = 1;
+
+                    if($val == true){
+                        $data['schedule_date'] = $start_time ;
+
+                        foreach ($schedule_time as $time_id){
+                            $is_have = SchedulePeriod::where(['time_period_id'=>$time_id,'type'=>($i),'docter_id'=>$docter_id,'schedule_date'=>$real_time,'organization_id'=>$org_id,'docter_id'=>$docter_id,'schedule_id'=>$schedule_id])->value('id');
+                            if($is_have) break;
+                            $time_insert['time_period_id'] = $time_id;
+                            $info[] = $time_insert;
+                            SchedulePeriod::insert($time_insert);
+                        }
+                    } else {
+                        $data['schedule_date'] = $start_time;
+                        foreach ($schedule_time as $time_id){
+                            $is_have = SchedulePeriod::where(['time_period_id'=>$time_id,'type'=>($i),'docter_id'=>$docter_id,'schedule_date'=>$real_time,'organization_id'=>$org_id,'docter_id'=>$docter_id,'schedule_id'=>$schedule_id])->value('id');
+                            if($is_have)  SchedulePeriod::where(['time_period_id'=>$time_id,'type'=>($i),'docter_id'=>$docter_id,'schedule_date'=>$real_time,'organization_id'=>$org_id,'docter_id'=>$docter_id,'schedule_id'=>$schedule_id])->delete();
+                        }
+                    }
+                }
+            }
+            DB::commit();
+        } catch (Exception $e){
+            DB::rollBack();
+            Log::info($e->getMessage());
+        }
+        return json_encode(['status'=>200,'msg'=>'插入成功','data'=>count($info)]);
+    }
+
+    //获取用户信息
+    public function getScheduleInfo()
+    {
+
+        $user = Admin::user();
+        $org_id = $user->org_id;
+        $docter_id = $user->docter_id;
+
+        $is_docter = CdmsUsers::where('docter_id',$docter_id)->first();
+        if(empty($org_id) && empty($docter_id)){
+            return json_encode(['status'=>601,'msg'=>'缺少必要参数','data'=>'']);
+        }
+        $role = 1;
+        if($is_docter){
+            $role = 2;
+        }
+        $lists =[];
+        if($role == 1){
+            $ids = DocterOrganization::where(['organization_id'=>$org_id])->pluck('docter_id')->toArray();
+            $list = Docter::whereIn('id',$ids)->get(['id','name']);
+            foreach ($list as $val){
+                $lists[] = ['value'=>$val->id,'label'=>$val->name];
+            }
+            $name = Organization::where('id',$org_id)->value('name');
+            $user_id = $org_id;
+        } else {
+            $ids = DocterOrganization::where(['docter_id'=>$docter_id])->pluck('organization_id');
+            $list = Organization::whereIn('id',$ids)->get(['id','name']);
+            foreach ($list as $val){
+                $lists[] = ['value'=>$val->id,'label'=>$val->name];
+            }
+            $name = Docter::where('id',$docter_id)->value('name');
+            $user_id = $docter_id;
+        }
+        $data['user_id'] = $user_id;
+        $data['name'] = $name;
+        $data['role'] = $role;
+        $data['list'] = $lists;
+        return (json_encode(['code'=>200,'msg'=>'ok','data'=>$data]));
+    }
+
+    //获取图文订单
+    public function get_chat_order()
+    {
+        $org_id = 1;
+//        $docter_id = 1;
+        $docter_id = request('docter_id');
+        if(empty($docter_id)){
+            return json_encode(['status'=>601,'msg'=>'缺少必要参数','data'=>'']);
+
+        }
+
+        $list = Order::where(['organization_id'=>$org_id,'docter_id'=>$docter_id,'order_status'=>3])->with('orderUser')->distinct('user_id')->get('user_id');
+        $user_list = [];
+        foreach ($list as $val){
+            $user_list[] = [
+                'id'=>$val->user_id,
+                'avatar'=>$val->orderUser->avatar,
+                'name'=>$val->orderUser->nickname,
+            ];
+        }
+        $data['docter'] =  Docter::where('id',$docter_id)->first(['id','avatar','name']);
+        $data['order_list'] = $user_list;
+        return  (json_encode(['code'=>200,'msg'=>'ok','data'=>$data]));
+    }
+
+    public function updateOrder(){
+        $id = request('id');
+        $status = request('status');
+        if(empty($id) || empty($status)){
+            return json_encode(['status'=>601,'msg'=>'缺少必要参数','data'=>'']);
+        }
+        $data = Order::where('id',$id)->update(['order_status'=>$status]);
+        return  (json_encode(['code'=>200,'msg'=>'ok','data'=>$data]));
 
     }
 

app/Community/Controllers/DocterChatController.php

@@ -103,6 +103,8 @@ class DocterChatController extends AdminController
         $user = Admin::user();
         $org_id = $user->org_id;
         $docter_id = $user->docter_id;
+        Admin::js('jquery-3.5.1.min.js');
+
         $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>');
         $content->body('<iframe src="/cdms/chat_view?docter_id='.$docter_id.'" style="width: 100%;height:800px;border: none"></iframe>');

app/Community/Controllers/HomeController.php

@@ -93,6 +93,11 @@ class HomeController extends Controller
             return redirect('/cdms/docter_chats');
         }
         $data = Order::where('id',$id)->with('orderPatient')->first();
+        if(!empty($data->orderPatient->medical_imgs)){
+            $data->orderPatient->medical_imgs = object_array(json_decode($data->orderPatient->medical_imgs ));
+        } else {
+            $data->orderPatient->medical_imgs = [];
+        }
         $content = new Content();
         $status = Order::getStatus();
         $content->view('cdms.order_detail',compact('data','status'));

app/Community/Controllers/NurseController.php

@@ -18,7 +18,7 @@ class NurseController extends AdminController
      *
      * @var string
      */
-    protected $title = '用户管理';
+    protected $title = '儿保项目';
 
     /**
      * Make a grid builder.

app/Community/Controllers/OrderVaccinesController.php

@@ -15,7 +15,7 @@ class OrderVaccinesController extends AdminController
      *
      * @var string
      */
-    protected $title = '用户管理';
+    protected $title = '计免预约';
 
     /**
      * Make a grid builder.

app/Community/Controllers/ScheduleController.php

@@ -3,6 +3,7 @@
 namespace App\Community\Controllers;
 
 use App\Http\Controllers\Controller;
+use App\Models\CdmsUsers;
 use App\Models\Docter;
 use Encore\Admin\Controllers\AdminController;
 use Encore\Admin\Facades\Admin;
@@ -19,13 +20,17 @@ class ScheduleController extends AdminController
         $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>');
+        $id = $org_id;
+        if(empty($docter_id)){
+            $id = $docter_id;
+        }
+        $url = '/cdms/chat_view?id='.$docter_id;
+        $content->body('<iframe src="/cdms/schedule_view?id='.$id.'" style="width: 100%;height:800px;border: none"></iframe>');
         return $content;
     }
 
     public function schedule()
     {
-        return view('/cdms');
+        return view('cdms.schedule');
     }
 }

app/Community/Controllers/VaccineController.php

@@ -18,7 +18,7 @@ class VaccineController extends AdminController
      *
      * @var string
      */
-    protected $title = '用户管理';
+    protected $title = '疫苗';
 
     /**
      * Make a grid builder.
@@ -95,12 +95,12 @@ class VaccineController extends AdminController
     {
         $form = new Form(new Vaccine());
 
-        $form->select('type', __('类型'))->options([1=>'一类',2=>'二类']);
-        $form->select('org_id','机构')->options(Organization::pluck('name','id'));
-        $form->text('name', __('疫苗名称'));
-        $form->text('supplier', __('厂家'));
-        $form->number('price', __('价格'));
-        $form->number('stock', __('库存'));
+        $form->select('type', __('类型'))->options([1=>'一类',2=>'二类'])->default(1);
+        $form->select('org_id','机构')->options(Organization::pluck('name','id'))->rules('required',['requried'=>'请选择机构']);
+        $form->text('name', __('疫苗名称'))->rules('required',['requried'=>'请填写疫苗名称']);
+        $form->text('supplier', __('厂家'))->rules('required',['requried'=>'请填写厂家信息']);
+        $form->number('price', __('价格'))->rules('required',['requried'=>'请填写价格']);
+        $form->number('stock', __('库存'))->rules('required',['requried'=>'请填写库存']);
         $form->textarea('remark', __('备注'));
 
         return $form;

app/Community/Controllers/VaccineUserController.php

@@ -17,7 +17,7 @@ class VaccineUserController extends AdminController
      *
      * @var string
      */
-    protected $title = '用户列表';
+    protected $title = '计免用户';
 
     /**
      * Make a grid builder.
@@ -29,7 +29,6 @@ class VaccineUserController extends AdminController
         $grid = new Grid(new Order());
         $is_amdin = Admin::user()->isRole('administrator');
         $user = Admin::user();
-        dd($user);
         if(!$is_amdin){
             $grid->model()->where(['organization_id'=>$user->org_id,'product_type'=>4]);
         }

app/Community/routes.php

@@ -26,6 +26,10 @@ Route::get('notices', 'NoticeController@grid');
 
 //群发通知
 Route::resource('user_notices', UserNoticeController::class);
+Route::get('schedule', 'ScheduleController@index');
+Route::get('schedule_view', 'ScheduleController@schedule');
+
+//
 
 Route::get('send_notices', 'NoticeController@send');
 Route::resource('/docter_chats', DocterChatController::class);
@@ -36,7 +40,16 @@ Route::get('/order_detail', 'HomeController@order_detail');
 Route::get('/api/getDocter', 'ApiController@getDocter');
 Route::put('/api/paitent_remark', 'ApiController@paitent_remark');
 Route::get('/api/sendmsg', 'ApiController@sendmsg');
+Route::post('/api/update_order', 'ApiController@updateOrder');
+
+Route::get('/getComSchedule', 'ApiController@getComSchedule');
+Route::get('/getChatOrder', 'ApiController@get_chat_order');
+Route::get('/setDocChedule', 'ApiController@setDocChedule');
+Route::get('/getScheduleInfo', 'ApiController@getScheduleInfo');
+
 
+Route::get('/getComSchedule', 'ScheDuleController@getComSchedule');
+Route::get('/getChatOrder', 'ScheDuleController@get_chat_order');
 
 
 

app/Helpers/functions.php

@@ -343,3 +343,19 @@ if (!function_exists('generate_code')) {
         return rand($min, $max);
     }
 }
+
+if (!function_exists('object_array')) {
+    function object_array($array) {
+        if(is_object($array)) {
+            $array = (array)$array;
+        }
+        if(is_array($array)) {
+            foreach($array as $key=>$value) {
+                $array[$key] = object_array($value);
+            }
+        }
+        return $array;
+    }
+
+}
+

app/Http/Controllers/ScheDuleController.php

@@ -58,7 +58,7 @@ class ScheDuleController  extends Controller
 //        $set_time = '2020-11-30至2020-12-06';
 //        $org_id = 1;
 //        $docter_id = 47;
-        $role = 1;
+        $role = 2;
 
         if(empty($set_time) || empty($org_id) || empty($docter_id)){
             return json_encode(['status'=>601,'msg'=>'缺少必要参数','data'=>'']);
@@ -74,6 +74,7 @@ class ScheDuleController  extends Controller
 
         $start_time  = intval(str_replace('-','',$all_time[0]));
         $end_time  = intval(str_replace('-','',$all_time[1]));
+        $first_day = strtotime($all_time[0]);
 //        DB::enableQueryLog();
         $sche_dule = Schedule::whereBetween('schedule_day',[$start_time,$end_time])
                                 ->where(['docter_id'=>$docter_id])
@@ -122,11 +123,11 @@ class ScheDuleController  extends Controller
 
         //时段区间id
         $schedule_config = SystemConfig::get('docter_config');
-        $mo = TimePeriod::where('start_time_period','>=',$schedule_config['morning_start'])->where('end_time_period','<=',$schedule_config['morning_end'])->pluck('id')->toArray();
-        $af = TimePeriod::where('start_time_period','>=',$schedule_config['afternoon_start'])->where('end_time_period','<=',$schedule_config['afternoon_end'])->pluck('id')->toArray();
-        $ev = TimePeriod::where('start_time_period','>=',$schedule_config['evening_start'])->where('end_time_period','<=',$schedule_config['evening_end'])->pluck('id')->toArray();
+        $times[] = TimePeriod::where('start_time_period','>=',$schedule_config['morning_start'])->where('end_time_period','<=',$schedule_config['morning_end'])->pluck('id')->toArray();
+        $times[] = TimePeriod::where('start_time_period','>=',$schedule_config['afternoon_start'])->where('end_time_period','<=',$schedule_config['afternoon_end'])->pluck('id')->toArray();
+        $times[] = TimePeriod::where('start_time_period','>=',$schedule_config['evening_start'])->where('end_time_period','<=',$schedule_config['evening_end'])->pluck('id')->toArray();
         if(empty($sche_dule)){
-            return ['status'=>200,'msg'=>'ok','data'=>['schedule'=>$sche_dule_arr,'org_id'=>$org_id,'docter_id'=>$docter_id]];
+            return ['status'=>200,'msg'=>'ok','data'=>['docter'=>$sche_dule_arr,'org_id'=>$org_id,'docter_id'=>$docter_id]];
         }
 
         $role = 2;
@@ -136,96 +137,47 @@ class ScheDuleController  extends Controller
             $name = Organization::where('id',$docter_id)->value('name');
 
             $user_id = $org_id;
-
-            for ($i = $start_time; $i<=$end_time; $i++){
-                $j = 0;
-                $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();
-                ['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;
-                }
-                if($is_mo_have){
-                    $sche_dule_arr[0][$week_arr[$j]] = 'other';
-                }
-                //检测下午
-                $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::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;
-                }
-                if($is_af_have){
-                    $sche_dule_arr[1][$week_arr[$j]] = 'other';
-                }
-
-                //检测晚上
-                $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::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;
-                }
-                if($is_ev_have){
-                    $sche_dule_arr[2][$week_arr[$j]] = 'other';
+            for ($i = 1; $i<7; $i++){
+                $str_time =  date('Y-m-d',($first_day + $i * 86400));
+                for($j=0;$j<3;$j++){
+                    //检测上午
+                    $is_mo_have = SchedulePeriod::whereIn('schedule_id',$sche_dule)->where('schedule_date',$str_time)->whereIn('time_period_id',$times[$j])
+                        ->where('organization_id','!=',$org_id)->count();
+                    ['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',$times[$j])
+                        ->where('organization_id',$org_id)->count();
+
+                    if($is_self){
+                        $sche_dule_arr[$j][$week_arr[$i]] = true;
+                    }
+                    if($is_mo_have){
+                        $sche_dule_arr[$j][$week_arr[$i]] = 'other';
+                    }
                 }
             }
-
         } else {
+
             $ids = DocterOrganization::where(['docter_id'=>$docter_id])->pluck('organization_id');
             $list = Organization::whereIn('id',$ids)->get(['id as value','name as label'])->toArray();
             $name = Docter::where('id',$docter_id)->value('name');
             $user_id = $docter_id;
-
-            for ($i = $start_time; $i<=$end_time; $i++){
-                $j = 0;
-                $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();
-
-                $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();
-                if($is_mo_self){
-                    $sche_dule_arr[0][$week_arr[$j]] = true;
-                }
-                if($is_mo_have){
-                    $sche_dule_arr[0][$week_arr[$j]] = 'other';
-                }
-                //检测下午
-                $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();
-                $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();
-                if($is_af_self){
-                    $sche_dule_arr[1][$week_arr[$j]] = true;
-                }
-                if($is_af_have){
-                    $sche_dule_arr[1][$week_arr[$j]] = 'other';
-                }
-
-                //检测晚上
-                $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();
-                $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();
-                if($is_ev_self){
-                    $sche_dule_arr[2][$week_arr[$j]] = true;
-                }
-                if($is_ev_have){
-                    $sche_dule_arr[2][$week_arr[$j]] = 'other';
+            for ($i=0; $i<=6; $i++){
+                $str_time =  date('Y-m-d',($first_day + $i * 86400));
+                for($j=0;$j<=2;$j++){
+                    //检测上午
+                    $is_mo_have = SchedulePeriod::whereIn('schedule_id',$sche_dule)->where('schedule_date',$str_time)->whereIn('time_period_id',$times[$j])
+                        ->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',$times[$j])
+                        ->where('organization_id',$org_id)->where('docter_id',$docter_id)->count();
+//                    echo $i.'--'.$j.'is_self---'.$is_mo_self.'<br>';
+
+                    if($is_mo_self){
+                        $sche_dule_arr[$j][$week_arr[$i]] = true;
+                    }
+                    if($is_mo_have){
+                        $sche_dule_arr[$j][$week_arr[$i]] = 'other';
+                    }
                 }
             }
         }
@@ -255,113 +207,129 @@ class ScheDuleController  extends Controller
         $org_id = request('org_id');
         $set_time = request('time');
         $data = request('schedulingtime');
-        $shcdule_id = request('schdule_id');
-        $set_time = '2020-12-07至2020-12-13';
+//        $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);
+        $schedule_id = Schedule::where(['organization_id'=>$org_id,'docter_id'=>$docter_id,'schedule_date'=>$all_time[0]])->value('id');
         if(count($all_time) <2) {
             return json_encode(['status'=>601,'msg'=>'缺少必要参数','data'=>'']);
         }
         $start_time  = intval(str_replace('-','',$all_time[0]));
         $end_time  = intval(str_replace('-','',$all_time[1]));
+        $first_day = strtotime($start_time);
         //周字段映射
         $week_arr = ['monday','tuesday','wednesday','thursday','friday','saturday','sunday'];
-
-        $data = [
-            [
-                'date'=>"上午",
-                'monday'=>false,
-                'tuesday'=>false,
-                'wednesday'=>false,
-                'thursday'=>true,
-                'friday'=>false,
-                'saturday'=>false,
-                'sunday'=>false,
-            ],
-            [
-                'date'=>"下午",
-                'monday'=>false,
-                'tuesday'=>true,
-                'wednesday'=>false,
-                'thursday'=>false,
-                'friday'=>false,
-                'saturday'=>false,
-                'sunday'=>false,
-            ],
-            [
-                'date'=>"晚上",
-                'monday'=>false,
-                'tuesday'=>false,
-                'wednesday'=>true,
-                'thursday'=>false,
-                'friday'=>false,
-                'saturday'=>false,
-                'sunday'=>false,
-            ]
-        ];
+//        $data = [
+//            [
+//                'date'=>"上午",
+//                'monday'=>false,
+//                'tuesday'=>false,
+//                'wednesday'=>false,
+//                'thursday'=>true,
+//                'friday'=>false,
+//                'saturday'=>false,
+//                'sunday'=>false,
+//            ],
+//            [
+//                'date'=>"下午",
+//                'monday'=>false,
+//                'tuesday'=>true,
+//                'wednesday'=>false,
+//                'thursday'=>false,
+//                'friday'=>false,
+//                'saturday'=>false,
+//                'sunday'=>false,
+//            ],
+//            [
+//                'date'=>"晚上",
+//                'monday'=>false,
+//                'tuesday'=>false,
+//                'wednesday'=>true,
+//                'thursday'=>false,
+//                'friday'=>false,
+//                'saturday'=>false,
+//                'sunday'=>false,
+//            ]
+//        ];
 
 
         //时段区间id
         $schedule_config = SystemConfig::get('docter_config');
-        $mo = TimePeriod::where('start_time_period','>=',$schedule_config['morning_start'])
+        $times[1] = TimePeriod::where('start_time_period','>=',$schedule_config['morning_start'])
                         ->where('end_time_period','<=',$schedule_config['morning_end'])
                         ->pluck('id')->toArray();
-        $af = TimePeriod::where('start_time_period','>=',$schedule_config['afternoon_start'])
+
+        $times[2] = TimePeriod::where('start_time_period','>=',$schedule_config['afternoon_start'])
                         ->where('end_time_period','<=',$schedule_config['afternoon_end'])
                         ->pluck('id')->toArray();
-        $ev = TimePeriod::where('start_time_period','>=',$schedule_config['evening_start'])
+
+        $times[3] = TimePeriod::where('start_time_period','>=',$schedule_config['evening_start'])
                         ->where('end_time_period','<=',$schedule_config['evening_end'])
                         ->pluck('id')->toArray();
+        foreach ($times as $val){
+            foreach ($val as $t){
+                $time_period[] = $t;
+            }
+        }
 
+        $data[0] = array_values(object_array(json_decode($data[0])));
+        $data[1] = array_values(object_array(json_decode($data[1])));
+        $data[2] = array_values(object_array(json_decode($data[2])));
 
         $mo_schedule = array_values($data[0]);
         $af_schedule = array_values($data[1]);
         $ev_schedule = array_values($data[2]);
 
-        $org_id = 1;
-        $docter_id = 47;
 
         DB::beginTransaction();
         try {
-            if(!$shcdule_id){
-                $schedule_insert = [
-                    'organization_id'=>$org_id,
-                    'docter_id'=>$docter_id,
-                    'schedule_date'=>$all_time[0],
-                    'schedule_day'=>$start_time,
-                    'created_at'=>Carbon::now(),
-                    'updated_at'=>Carbon::now(),
-                ];
-                $shcdule_id = Schedule::insertGetId($schedule_insert);
+            $schedule_insert = [
+                'organization_id'=>$org_id,
+                'docter_id'=>$docter_id,
+                'schedule_date'=>$all_time[0],
+                'schedule_day'=>$start_time,
+                'created_at'=>Carbon::now(),
+                'updated_at'=>Carbon::now(),
+            ];
+            if(!$schedule_id){
+                $schedule_id = Schedule::insertGetId($schedule_insert);
             }
-
             unset($schedule_insert['schedule_day']);
-
-            $schedule_insert['schedule_id'] =$shcdule_id;
+            $schedule_insert['schedule_id'] =$schedule_id;
             $info = [];
-            for ($i = 0 ;$i<=2;$i++){
-                $mo_schedule = array_values($data[$i]);
+            for ($i = 1 ;$i<=3;$i++){
+                $mo_schedule = array_values($data[$i-1]);
                 foreach ($mo_schedule as $key=>$val){
                     if($key==0) continue;
                     $schedule_date = $start_time + $key;
                     $strtime = "$schedule_date";
-                    $first_day = strtotime('this week');
                     $time_insert = $schedule_insert;
-                    $time_insert['type'] = $i+1;
+                    $time_insert['type'] = $i;
+
+                    $schedule_time = $times[$i];
                     $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'=>($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){
+
+                    if($val == true){
                         $data['schedule_date'] = $start_time ;
+
+                        foreach ($schedule_time as $time_id){
+                            $is_have = SchedulePeriod::where(['time_period_id'=>$time_id,'type'=>($i),'docter_id'=>$docter_id,'schedule_date'=>$real_time,'organization_id'=>$org_id,'docter_id'=>$docter_id,'schedule_id'=>$schedule_id])->value('id');
+                            if($is_have) break;
+                            $time_insert['time_period_id'] = $time_id;
+                            $info[] = $time_insert;
+                            SchedulePeriod::insert($time_insert);
+                        }
+                    } else {
+                        $data['schedule_date'] = $start_time;
+                        foreach ($schedule_time as $time_id){
+                            $is_have = SchedulePeriod::where(['time_period_id'=>$time_id,'type'=>($i),'docter_id'=>$docter_id,'schedule_date'=>$real_time,'organization_id'=>$org_id,'docter_id'=>$docter_id,'schedule_id'=>$schedule_id])->value('id');
+                            if($is_have)  SchedulePeriod::where(['time_period_id'=>$time_id,'type'=>($i),'docter_id'=>$docter_id,'schedule_date'=>$real_time,'organization_id'=>$org_id,'docter_id'=>$docter_id,'schedule_id'=>$schedule_id])->delete();
+                        }
                     }
                 }
             }
@@ -376,31 +344,38 @@ class ScheDuleController  extends Controller
     //获取用户信息
     public function getScheduleInfo()
     {
-        $docter_id = request('docter_id');
+        $docter_id = request('id');
         $org_id = request('org_id');
-        $is_docter = CdmsUsers::where('docter_id',$docter_id);
-        $role = 1;
+        $is_docter = CdmsUsers::where('docter_id',$docter_id)->first();
         if(empty($org_id) && empty($docter_id)){
             return json_encode(['status'=>601,'msg'=>'缺少必要参数','data'=>'']);
         }
+        $role = 1;
         if($is_docter){
             $role = 2;
         }
+        $lists =[];
         if($role == 1){
-            $ids = DocterOrganization::where(['docter_id'=>$docter_id])->pluck('organization_id');
-            $list = Organization::whereIn('id',$ids)->get(['id as value','name as label'])->toArray();
+            $ids = DocterOrganization::where(['organization_id'=>$org_id])->pluck('docter_id')->toArray();
+            $list = Docter::whereIn('id',$ids)->get(['id','name']);
+            foreach ($list as $val){
+                $lists[] = ['value'=>$val->id,'label'=>$val->name];
+            }
             $name = Organization::where('id',$org_id)->value('name');
             $user_id = $org_id;
         } else {
             $ids = DocterOrganization::where(['docter_id'=>$docter_id])->pluck('organization_id');
-            $list = Organization::whereIn('id',$ids)->get(['id as value','name as label'])->toArray();
+            $list = Organization::whereIn('id',$ids)->get(['id','name']);
+            foreach ($list as $val){
+                $lists[] = ['value'=>$val->id,'label'=>$val->name];
+            }
             $name = Docter::where('id',$docter_id)->value('name');
             $user_id = $docter_id;
         }
         $data['user_id'] = $user_id;
         $data['name'] = $name;
         $data['role'] = $role;
-        $data['list'] = $list;
+        $data['list'] = $lists;
         return (json_encode(['code'=>200,'msg'=>'ok','data'=>$data]));
     }
 

app/Models/Order.php

@@ -12,9 +12,10 @@ class Order extends BaseModel
 {
     protected $appends = ['is_evaluate', 'order_duration'];
 
-    CONST UNPAID = 1, ISING = 2, FINISHED = 3,CANCELED=4; //订单状态(1.未支付 2.进行中 3.已完成 4.已取消)
+    CONST UNPAID = 1, NOTACCEPT = 2, ISING = 3, FINISHED = 4,CANCELED=5; //订单状态(1.未支付 2.进行中 3.已完成 4.已取消)
     public static  $_order_status = [
         self::UNPAID=>'未支付',
+        self::NOTACCEPT=>'待支付',
         self::ISING=>'进行中',
         self::FINISHED=>'已完成',
         self::CANCELED=>'已取消',

resources/views/cdms/order_detail.blade.php

@@ -27,26 +27,35 @@
         display: block;
     }
 
+    .imgs{
+        height: 500px;
+        display: block;
+    }
 </style>
 
 <div class="contet">
     <div class="center">
         <h2 style="display: inline-block">订单详情</h2>
         @if($data->orderPatient)
+            @if($data->order_status == 3)
             <a class = "a_btn m-l-30" href="/cdms/chats">会话</a>
-            <a class = "a_btn m-l-30" href="javascript:void(0)">完成</a>
+            <a class = "a_btn complet m-l-30" href="javascript:void(0)">完成</a>
+            @endif
         @endif
     </div>
     <div class="center">
         <span>订单号:{{$data->order_sn}}</span>
         @if(!empty($data->orderPatient))
-            <span>患者:{{$data->orderPatient->name}}</span>
-            <span>年龄:{{birthday_to_age($data->orderPatient->birthday)}}</span>
-            <span>身份证号:{{$data->orderPatient->card_number}}</span>
-            <span>下单时间:{{$data->orderPatient->created_at}}</span>
-            <span>订单状态:{{$status[$data->order_status]}}接单</span>
-            <span>病情描述:{{$data->orderPatient->symptoms}}</span>
-            <span>图片:{{$data->orderPatient->medical_imgs}}</span>
+            <span>患者:  {{$data->orderPatient->name}}</span>
+            <span>年龄:  {{birthday_to_age($data->orderPatient->birthday)}}</span>
+            <span>身份证号:  {{$data->orderPatient->card_number}}</span>
+            <span>下单时间:  {{$data->orderPatient->created_at}}</span>
+            <span>订单状态:  {{$status[$data->order_status]}}@if($data->order_status == 2)  <a class = "a_btn add m-l-30" href="javascript:void(0)">接单</a> @endif </span>
+            <span>病情描述:  {{$data->orderPatient->symptoms}}</span>
+            <span>图片: </span>
+            @foreach($data->orderPatient->medical_imgs as $img)
+                <img class="imgs" src="{{$img}}" alt="">
+            @endforeach
         @else
             <span>患者:</span>
             <span>年龄:</span>
@@ -58,7 +67,27 @@
         @endif
     </div>
 </div>
-
+<script src="/jquery-3.5.1.min.js"></script>
 <script>
-
+    var id = {{$data->id}}
+    $('.complet').click(function () {
+        $.post('/cdms/api/update_order',{'id':id,'status':4},function (res) {
+            if(res.code == 200){
+                alert('操作成功')
+                location.reload();
+            } else{
+                alert(res.msg)
+            }
+        });
+    })
+    $('.add').click(function () {
+        $.post('/cdms/api/update_order',{'id':id,'status':3},function (res) {
+            if(res.code == 200){
+                alert('接单成功')
+                location.reload();
+            } else{
+                alert(res.msg)
+            }
+        });
+    })
 </script>

resources/views/cdms/schedule.blade.php

@@ -1 +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>
+<!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.426d1eed.js" rel="preload" as="script"><link href="static/js/chunk-vendors.e71f87b8.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.e71f87b8.js"></script><script src="static/js/app.426d1eed.js"></script></body></html>

routes/web.php

@@ -17,8 +17,11 @@ Route::get('/', function () {
 
 
 Route::get('/api/getComSchedule', 'ScheDuleController@getComSchedule');
+Route::get('/getComSchedule', 'ScheDuleController@getComSchedule');
 Route::get('/getChatOrder', 'ScheDuleController@get_chat_order');
 Route::get('/api/setDocChedule', 'ScheDuleController@setDocChedule');
+Route::get('/setDocChedule', 'ScheDuleController@setDocChedule');
 //用户信息
 Route::get('/api/getScheduleInfo', 'ScheDuleController@getScheduleInfo');
+Route::get('/getScheduleInfo', 'ScheDuleController@getScheduleInfo');