数据中心与群发消息优化

app/Community/Controllers/DocterAccountController.php

@@ -46,16 +46,16 @@ class DocterAccountController extends  AdminController
 
         $form->hidden('org_id')->value(request('org_id'));
         $form->hidden('docter_id')->value(request('docter_id'));
-//        if($form->isEditing()){
-//            $reoute = request()->route()->parameters();
-//            $id = intval($reoute['docter_account']);
-//            $org_id = CdmsUsers::where(['id'=>$id])->value('org_id');
-//            $form->multipleSelect('roles', trans('tenancy.roles'))->options($roleModel::where('org_id',$org_id)->get()->pluck('name', 'id'));
-//        } else {
-//            $form->multipleSelect('roles', trans('tenancy.roles'))->options($roleModel::where('org_id',$org_id)->get()->pluck('name', 'id'));
-//        }
-
-        $form->multipleSelect('roles', trans('tenancy.roles'))->options($roleModel::whereIn('name',['门诊医生','儿保医生','计免医生','图文咨询','所有医生'])->get()->pluck('name', 'id'));
+        if($form->isEditing()){
+            $reoute = request()->route()->parameters();
+            $id = intval($reoute['docter_account']);
+            $org_id = CdmsUsers::where(['id'=>$id])->value('org_id');
+            $form->multipleSelect('roles', trans('tenancy.roles'))->options($roleModel::where('org_id',$org_id)->get()->pluck('name', 'id'));
+        } else {
+            $form->multipleSelect('roles', trans('tenancy.roles'))->options($roleModel::where('org_id',$org_id)->get()->pluck('name', 'id'));
+        }
+
+//        $form->multipleSelect('roles', trans('tenancy.roles'))->options($roleModel::whereIn('name',['门诊医生','儿保医生','计免医生','图文咨询','所有医生'])->get()->pluck('name', 'id'));
 
         $form->display('created_at', trans('tenancy.created_at'));
         $form->display('updated_at', trans('tenancy.updated_at'));

app/Community/Controllers/HomeController.php

@@ -31,9 +31,9 @@ class HomeController extends Controller
             })
             ->row(function (Row $row){
                 $data = StatController::orderTotal();
-                $row->column(3,new InfoBox('门诊订单总数(个)', 'users', 'aqua', '/cdms/home', $data[0]));
-                $row->column(3,new InfoBox('儿保订单总数(个)', 'calendar-check-o', 'aqua', '/cdms/home', $data[1]));
-                $row->column(3,new InfoBox('计免订单总数(个)', 'user', 'aqua', '/cdms/home', $data[2]));
+                $row->column(3,new InfoBox('门诊订单总数(个)', 'users', 'aqua', '/cdms/orders', $data[0]));
+                $row->column(3,new InfoBox('儿保订单总数(个)', 'calendar-check-o', 'aqua', '/cdms/nurse_users', $data[1]));
+                $row->column(3,new InfoBox('计免订单总数(个)', 'user', 'aqua', '/cdms/order_vaccines', $data[2]));
                 $row->column(3,new InfoBox('服务患者次数(次)', 'user', 'aqua', '/cdms/home', $data[3]));
             })
             ->row(function (Row $row){
@@ -41,12 +41,13 @@ class HomeController extends Controller
             })
             ->row(function (Row $row){
                 $data = StatController::clinc();
-
-                $row->column(3,new InfoBox('今日预约数量(人)', 'users', 'aqua', '/cdms/home', $data['today']));
+                $today = 'orderPatient[appoint_start_time][start]='.date('Y-m-d 00:00:00',time()).'&orderPatient[appoint_start_time][end]='.date('Y-m-d 00:00:00', strtotime('+1days'));
+                $yersterday = 'orderPatient[appoint_start_time][start]='.date('Y-m-d 00:00:00',strtotime('-1 days')).'&orderPatient[appoint_start_time][end]='.date('Y-m-d 00:00:00', time());
+                $row->column(3,new InfoBox('今日预约数量(人)', 'users', 'aqua', '/cdms/orders?'.$today, $data['today']));
 //                $row->column(3,new InfoBox('疫苗种类(种)', 'eyedropper', 'aqua', '/cdms/home', $data['sum_num']));
-                $row->column(3,new InfoBox('今日排班人数（人)', 'home', 'aqua', '/cdms/home', $data['docters']));
-                $row->column(3,new InfoBox('昨日预约数量(人)', 'genderless', 'aqua', '/cdms/home', $data['yesterday']));
-                $row->column(3,new InfoBox('昨日接诊人数(人)', 'genderless', 'aqua', '/cdms/home', $data['people']));
+                $row->column(3,new InfoBox('今日排班人数（人)', 'user', 'aqua', '/cdms/total_schedule?t=1', $data['docters']));
+                $row->column(3,new InfoBox('昨日预约数量(人)', 'user', 'aqua', '/cdms/orders?'.$yersterday, $data['yesterday']));
+                $row->column(3,new InfoBox('昨日接诊人数(人)', 'user', 'aqua', '#', $data['people']));
 
             })
             ->row(function (Row $row){
@@ -54,31 +55,45 @@ class HomeController extends Controller
             })
             ->row(function (Row $row){
                 $data = StatController::nurse();
+                $today = 'orderPatient[appoint_start_time][start]='.date('Y-m-d 00:00:00',time()).'&orderPatient[appoint_start_time][end]='.date('Y-m-d 00:00:00', strtotime('+1days'));
+                $yersterday = 'orderPatient[appoint_start_time][start]='.date('Y-m-d 00:00:00',strtotime('-1 days'))
+                    .'&orderPatient[appoint_start_time][end]='.date('Y-m-d 00:00:00', time());
+                $tommrow = 'orderPatient[appoint_start_time][start]='.date('Y-m-d 00:00:00',strtotime('+1 days'))
+                    .'&orderPatient[appoint_start_time][end]='.date('Y-m-d 00:00:00', strtotime('+2 days'));
+
 
-                $row->column(3,new InfoBox('今日预约数量(人)', 'first-order', 'aqua', '/cdms/home', $data['today']));
-                $row->column(3,new InfoBox('昨日预约数量(人)', 'first-order', 'aqua', '/cdms/home', $data['yesterday']));
-                $row->column(3,new InfoBox('昨日接种人数(人)', 'first-order', 'aqua', '/cdms/home', $data['people']));
-                $row->column(3,new InfoBox('明日预约数量(人)', 'first-order', 'aqua', '/cdms/home', $data['tomorrow']));
+                $row->column(3,new InfoBox('今日预约数量(人)', 'users', 'aqua', '/cdms/order_vaccines?'.$today, $data['today']));
+                $row->column(3,new InfoBox('昨日预约数量(人)', 'user', 'aqua', '/cdms/order_vaccines?'.$yersterday, $data['yesterday']));
+                $row->column(3,new InfoBox('昨日接种人数(人)', 'user', 'aqua', '/cdms/order_vaccines?status=4&'.$yersterday, $data['people']));
+                $row->column(3,new InfoBox('明日预约数量(人)', 'user', 'aqua', '/cdms/order_vaccines?'.$tommrow, $data['tomorrow']));
             })
             ->row(function (Row $row){
                 return $row->column(12,'<p style="font-family:Arial,Helvetica,sans-serif; font-size:1.2em; margin-top20px;vertical-align:middle; font-weight:normal ">儿保预约</p>');
             })
             ->row(function (Row $row){
                 $data = StatController::nurse();
-                $row->column(3,new InfoBox('今日预约数量(人)', 'first-order', 'aqua', '/cdms/home', $data['today']));
-                $row->column(3,new InfoBox('昨日预约数量(人)', 'first-order', 'aqua', '/cdms/home', $data['yesterday']));
-                $row->column(3,new InfoBox('昨日接种人数(人)', 'first-order', 'aqua', '/cdms/home', $data['people']));
-                $row->column(3,new InfoBox('明日预约数量(人)', 'first-order', 'aqua', '/cdms/home', $data['tomorrow']));
+                $today = 'patients[appoint_start_time][start]='.date('Y-m-d 00:00:00',time()).'&patients[appoint_start_time][end]='.date('Y-m-d 00:00:00', strtotime('+1days'));
+                $yersterday = 'patients[appoint_start_time][start]='.date('Y-m-d 00:00:00',strtotime('-1 days'))
+                    .'&patients[appoint_start_time][end]='.date('Y-m-d 00:00:00', time());
+                $tommrow = 'patients[appoint_start_time][start]='.date('Y-m-d 00:00:00',strtotime('+1 days'))
+                    .'&patients[appoint_start_time][end]='.date('Y-m-d 00:00:00', strtotime('+2 days'));
+
+                $row->column(3,new InfoBox('今日预约数量(人)', 'users', 'aqua', '/cdms/order_nurses?'.$today, $data['today']));
+                $row->column(3,new InfoBox('昨日预约数量(人)', 'user', 'aqua', '/cdms/order_nurses?'.$yersterday, $data['yesterday']));
+                $row->column(3,new InfoBox('昨日接种人数(人)', 'user', 'aqua', '/cdms/order_nurses?orders[order_status]=4&'.$yersterday, $data['people']));
+                $row->column(3,new InfoBox('明日预约数量(人)', 'user', 'aqua', '/cdms/order_nurses?'.$tommrow, $data['tomorrow']));
             })
             ->row(function (Row $row){
                 return $row->column(12,'<p style="font-family:Arial,Helvetica,sans-serif; font-size:1.2em; margin-top20px;vertical-align:middle; font-weight:normal ">疫苗库存概况</p>');
             })
             ->row(function (Row $row){
                 $data = StatController::vaccineToal();
+                $yersterday = 'orderPatient[appoint_start_time][start]='.date('Y-m-d 00:00:00',strtotime('-1 days'))
+                    .'&orderPatient[appoint_start_time][end]='.date('Y-m-d 00:00:00', time());
 
-                $row->column(3,new InfoBox('疫苗总库存(支)', 'first-order', 'aqua', '/cdms/home', $data['have_num']));
-                $row->column(3,new InfoBox('疫苗库存告急(中)', 'first-order', 'aqua', '/cdms/home', $data['less_num']));
-                $row->column(3,new InfoBox('昨日接种消耗(支)', 'first-order', 'aqua', '/cdms/home', $data['yesterday']));
+                $row->column(3,new InfoBox('疫苗总库存(支)', 'first-order', 'aqua', '/cdms/vaccines', $data['have_num']));
+                $row->column(3,new InfoBox('疫苗库存告急(中)', 'first-order', 'aqua', '/cdms/vaccines', $data['less_num']));
+                $row->column(3,new InfoBox('昨日接种消耗(支)', 'first-order', 'aqua', '/cdms/order_vaccines?order_status=4&'.$yersterday, $data['yesterday']));
             });
     }
 

app/Community/Controllers/OrderVaccinesController.php

@@ -79,7 +79,7 @@ class OrderVaccinesController extends AdminController
             $filter->column(1/2, function ($filter) {
                 $filter->equal('docter.id','排班医生')->select('/cdms/api/getDocter');
                 $filter->equal('order_status','订单状态')->select(Order::$_order_status);
-                $filter->between('patients.appoint_start_time','预约时间')->datetime();
+                $filter->between('orderPatient.appoint_start_time','预约时间')->datetime();
             });
         });
         $grid->tools(function ($tools) {

app/Community/Controllers/PermissionController.php

@@ -86,7 +86,7 @@ class  PermissionController extends AdminController
         $form->text('name', '名称')
             ->creationRules(['required', "unique:cdms_roles"])
             ->updateRules(['required', "unique:cdms_roles,name,{{id}}"]);
-        $form->listbox('permissions', trans('admin.permissions'))->options(CdmsPermissions::all()->pluck('name', 'id'));
+        $form->listbox('permissions', trans('admin.permissions'))->options(CdmsPermissions::whereNotIN('id',[1,4,5,9,10])->pluck('name','id'));
 
         return $form;
     }

app/Community/Controllers/UserNoticeController.php

@@ -51,6 +51,7 @@ class UserNoticeController extends AdminController
             $flter->like('orderPatient.name','请输入用户姓名');
             $flter->like('orderUser.nickname','请输入监护人姓名');
             $flter->between('orderUser.birthday','生日')->datetime();
+            $flter->between('orderPatient.appoint_start_time','预约时间')->datetime();
             $flter->equal('product_type','用户类型')->select([4=>'计免',5=>'儿保']);
         });