优化

app/Community/Controllers/ApiController.php

@@ -121,7 +121,7 @@ class ApiController extends Controller
         $is_docter = CdmsUsers::where('docter_id',$doc_id)->where('docter_id','!=','')->first();
 
         if(empty($set_time)){
-            return json_encode(['status'=>601,'msg'=>'缺少必要参数','data'=>'']);
+            return json_encode(['code'=>601,'msg'=>'缺少必要参数','data'=>'']);
         }
 
         if($is_docter){
@@ -130,7 +130,7 @@ class ApiController extends Controller
 
         $all_time = explode('至',$set_time);
         if(count($all_time) <2){
-            return json_encode(['status'=>601,'msg'=>'缺少必要参数','data'=>'']);
+            return json_encode(['code'=>601,'msg'=>'缺少必要参数','data'=>'']);
         }
 
         $start_time  = intval(str_replace('-','',$all_time[0]));
@@ -188,7 +188,7 @@ class ApiController extends Controller
         $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]];
+            return ['code'=>200,'msg'=>'ok','data'=>['docter'=>$sche_dule_arr,'org_id'=>$org_id,'docter_id'=>$docter_id]];
         }
         if($role == 1){
             $ids = DocterOrganization::where(['organization_id'=>$org_id])->pluck('docter_id');
@@ -400,7 +400,7 @@ class ApiController extends Controller
 
         $is_docter = CdmsUsers::where('docter_id',$docter_id)->where('docter_id','!=','')->first();
         if(empty($org_id) && empty($docter_id)){
-            return json_encode(['status'=>601,'msg'=>'缺少必要参数','data'=>'']);
+            return json_encode(['code'=>601,'msg'=>'缺少必要参数','data'=>'']);
         }
         $role = 1;
         if($is_docter){
@@ -437,7 +437,7 @@ class ApiController extends Controller
         $org_id = 1;
         $docter_id = request('docter_id');
         if(empty($docter_id)){
-            return json_encode(['status'=>601,'msg'=>'缺少必要参数','data'=>'']);
+            return json_encode(['code'=>601,'msg'=>'缺少必要参数','data'=>'']);
 
         }
 
@@ -459,7 +459,7 @@ class ApiController extends Controller
         $id = request('id');
         $status = request('status');
         if(empty($id) || empty($status)){
-            return json_encode(['status'=>601,'msg'=>'缺少必要参数','data'=>'']);
+            return json_encode(['code'=>601,'msg'=>'缺少必要参数','data'=>'']);
         }
         $data = Order::where('id',$id)->update(['order_status'=>$status]);
         return  (json_encode(['code'=>200,'msg'=>'ok','data'=>$data]));

app/Community/Controllers/HomeController.php

@@ -4,8 +4,10 @@ namespace App\Community\Controllers;
 
 use App\Http\Controllers\Controller;
 use App\Models\Order;
+use App\Models\Schedule;
 use App\Models\SchedulePeriod;
 use Encore\Admin\Controllers\Dashboard;
+use Encore\Admin\Facades\Admin;
 use Encore\Admin\Layout\Column;
 use Encore\Admin\Layout\Content;
 use Encore\Admin\Layout\Row;
@@ -106,4 +108,24 @@ class HomeController extends Controller
 
         return $content;
     }
+
+    public function schedule(){
+        $time = redirect('time');
+        $time = '2020-12-07至2020-12-13';
+
+        $data = sechedule_timeperiod();
+        $org_id = Admin::user()->org_id;
+        $where = [];
+        if($org_id){
+            $where['organization_id'] = $org_id;
+        }
+
+        if($time){
+
+        } else {
+            $where['schedule_date']=date('Y-m-d',strtotime('this week'));
+        }
+
+        Schedule::where($where)->pluck('id');
+    }
 }

app/Community/Controllers/OrderController.php

@@ -33,7 +33,7 @@ class OrderController extends AdminController
         $is_docter = $user->isRole('opc');
         if(!$is_admin){
             $org_id = $user->org_id;
-            $where = ['product_type'=>1,'organization_id'=>$org_id];
+            $where = ['product_type'=>3,'organization_id'=>$org_id];
             if($is_docter) {
                 $where['docter_id'] = Docter::where(['cmds_id'=>$user->id])->value('id');
             }

app/Community/routes.php

@@ -2,6 +2,7 @@
 //常规路由
 Route::get('/', 'HomeController@index');
 Route::get('/home', 'HomeController@home');
+Route::get('/total_schedule', 'HomeController@schedule');
 Route::resource('nurses', NurseController::class);
 Route::resource('nurse_users', NurseUserController::class);
 Route::resource('order_nurses', OrderNurseController::class);

app/Helpers/functions.php

@@ -7,6 +7,8 @@
  */
 
 use App\Exceptions\ExitOutException;
+use App\Models\SystemConfig;
+use App\Models\TimePeriod;
 
 //统一输出格式话的json数据
 if (!function_exists('out')) {
@@ -356,6 +358,18 @@ if (!function_exists('object_array')) {
         }
         return $array;
     }
+}
+
+if (!function_exists('sechedule_timeperiod')) {
+    function sechedule_timeperiod()
+    {
+        $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();
 
+        return $times;
+    }
 }
 
+

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.215f8c27.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.215f8c27.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.306dc37f.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.306dc37f.js"></script></body></html>