Merge branch 'develop' of ssh://git.9026.com:2212/swdz-WangHaijun/BaoMa into develop

app/Community/Controllers/OrderController.php

@@ -76,12 +76,9 @@ class OrderController extends AdminController
 //            if(empty($w)) return '';
 //            return date('Y-m-d H:i',$w);
 //        });
-        $grid->column('orderPatient.phone', __('电话号码'))->display(function ($p){
-            if(empty($p))  return $this->user->phone;
-            return $p;
-        });
+        $grid->column('patient.phone', __('电话号码'));
 
-        $grid->column('orderPatient.name', __('预约患者'));
+        $grid->column('patient.name', __('预约患者'));
         $grid->column('orderPatient.sex', __('患者性别'))->display(function ($w){
             return $w==1?'男':'女';
         });
@@ -109,12 +106,6 @@ class OrderController extends AdminController
 //        $grid->column('payment_status', __('支付状态'))->using([1=>'待付款',2=>'已付款',3=>'退款中',4=>'已退款']);
         $grid->column('payment_status', __('支付状态'))->using(Order::getPayStatus())->label([1=>'warning',2=>'success',3=>'info',4=>'danger',5=>'default']);
 
-        //查询
-        $grid->quickSearch(function ($model, $query) {
-            $model->whereHas('patients',function ($model) use ($query) {
-                $model->where('name', 'like', "{$query}%");
-            });
-        })->placeholder('请输入用户姓名');
         $grid->actions(function ($actions) {
 //            if(!empty($actions->row->order_status) && $actions->row->order_status < 2){
 //                $actions->add(new Reserved());
@@ -127,10 +118,17 @@ class OrderController extends AdminController
             $actions->disableEdit();
             $actions->disableDelete();
         });
+//        $grid->quickSearch(function ($model, $query) {
+//            $model->whereHas('patient',function ($model) use ($query) {
+//                $model->where('name', 'like', "%{$query}%");
+//            });
+//        })->placeholder('请输入患者姓名');
         $grid->filter(function (Grid\Filter $filter)  {
             $filter->disableIdFilter();
             $filter->column(1/2, function ($filter)   {
                 $filter->equal('docter_id','排班医生')->select('/cdms/api/getDocter');
+                $filter->like('patient.phone','电话');
+                $filter->like('patient.name','患者名称');
                 $filter->equal('order_status','订单状态')->select(Order::$_order_status);
                 $filter->timestampBetween('orderPatient.appoint_start_time','预约时间')->datetime();
             });

app/Community/Controllers/OrderNurseController.php

@@ -69,14 +69,8 @@ class OrderNurseController extends AdminController
             return date('Y-m-d H:i',$w).'~'.date('H:i',$w);
         });
 
-        $grid->column('orderPatient.name', __('儿保患者'));
-        $grid->column('orderPatient.phoe', __('电话'))->display(function ($w){
-            if(empty($w)) {
-                if(empty($this->orderUser->phone)) return '';
-                return $this->orderUser->phone;
-            }
-            return $w;
-        });
+        $grid->column('patient.name', __('儿保患者'));
+        $grid->column('patient.phone', __('电话'));
         $grid->column('orderPatient.sex', __('患者性别'))->display(function ($w){
             return $w==1?'男':'女';
         });
@@ -104,16 +98,17 @@ class OrderNurseController extends AdminController
         });
         $grid->column('payment_status', __('支付状态'))->using(Order::getPayStatus())->label([1=>'warring',2=>'success',3=>'info',4=>'danger',5=>'default']);
         //查询
-        $grid->quickSearch(function ($model, $query) {
-            $model->whereHas('patients',function ($model) use ($query) {
-                $model->where('name', 'like', "{$query}%");
-            });
-        })->placeholder('请输入用户姓名');
+//        $grid->quickSearch(function ($model, $query) {
+//            $model->whereHas('patient',function ($model) use ($query) {
+//                $model->where('name', 'like', "{$query}%");
+//            });
+//        })->placeholder('请输入患者姓名');
 
         $grid->filter(function (Grid\Filter $filter){
             $filter->disableIdFilter();
             $filter->column(1/2, function ($filter) {
-//                $filter->equal('orders.docter_id','排班医生')->select('/cdms/api/getDocter');
+                $filter->like('patient.phone','电话');
+                $filter->like('patient.name','患者名称');
                 $filter->equal('order_status','订单状态')->select(Order::$_order_status);
                 $filter->timestampBetween('orderPatient.appoint_start_time','预约时间')->datetime();
             });

app/Community/Controllers/OrderVaccinesController.php

@@ -63,11 +63,12 @@ class OrderVaccinesController extends AdminController
 
         $grid->column('id', __('Id'));
         $grid->column('user.nickname', __('预约用户'));
-        $grid->column('orderPatient.phoe', __('电话'))->display(function ($w){
-            if(empty($w)) {
-                if(empty($this->orderUser->phone)) return '';
-                return $this->orderUser->phone;
-            }
+        $grid->column('patient.phone', __('电话'))->display(function ($w){
+//            dd($this->orderPatient);
+//            if(empty($w)) {
+//                if(empty($this->orderUser->phone)) return '';
+//                return $this->orderUser->phone;
+//            }
             return $w;
         });
         $grid->column('appoint_start_time', __('预约时间'))->display(function ($w){
@@ -79,7 +80,7 @@ class OrderVaccinesController extends AdminController
             if(empty($w)) return '';
             return date('Y-m-d',$w);
         });
-        $grid->column('orderPatient.name', __('接种患者'));
+        $grid->column('patient.name', __('接种患者'));
         $grid->column('orderPatient.sex', __('患者性别'))->display(function ($w){
             return $w==1?'男':'女';
         });
@@ -114,6 +115,8 @@ class OrderVaccinesController extends AdminController
         $grid->filter(function ($filter)  {
             $filter->column(1/2, function ($filter) {
 //                $filter->equal('docter.id','排班医生')->select('https://wechat.fresherbaby.com/api/getAppiontInfo?telphone=13808729518&sig=d7d875f10af1c341b8ba3d9e433e88aa&SecretKey=2018&st=2018&id=11&barcode=&area=12');
+                $filter->like('patient.phone','电话');
+                $filter->like('patient.name','患者名称');
                 $filter->equal('order_status','订单状态')->select(Order::$_order_status);
                 $filter->timestampBetween('orderPatient.appoint_start_time','预约时间')->datetime();
             });

app/Http/Controllers/Api/V2/PatientController.php

@@ -758,11 +758,11 @@ class PatientController extends AuthController
                     $catNewIds[$k] = $v['id'];
                     $this->ReceivingReminderOK($v['id']);
                 }
-            }else if($v['product_type']==3){
-                if ((time()-$v['receiving_time'])>=(1*60*60*24)){
-                    $menNewIds[$k] = $v['id'];
-                    $this->AppointReminder($v['id']);
-                }
+            }else if($v['product_type']==3 || $v['product_type']==4 || $v['product_type']==5){
+//                if ((time()-$v['receiving_time'])>=(1*60*60*24)){
+                $menNewIds[$k] = $v['id'];
+                $this->AppointReminder($v['id']);
+//                }
             }
 
         }

app/Http/Controllers/AppiontController.php

@@ -30,7 +30,7 @@ class AppiontController extends Controller
 
     }
 
-   public function getAppiontInfo()
+    public function getAppiontInfo()
    {
        // 允许 $originarr 数组内的 域名跨域访问
        header('Access-Control-Allow-Origin:*');
@@ -115,7 +115,7 @@ class AppiontController extends Controller
 
            if($data['st']){
                $order = $order->whereHas('orderPatient',function ($query) use ($data){
-                   $query->where('appoint_end_time','>=',time());
+                   $query->whereBetween('appoint_end_time',[time(),strtotime('tomorrow')]);
                });
            }
 
@@ -155,4 +155,22 @@ class AppiontController extends Controller
        }
 
    }
+
+    public function orverTime()
+    {
+        $st = strtotime('2021-02-25 18:00:00');
+        $orders = Order::select('id')
+            ->where(['product_type'=>4,'order_status'=>7])
+            ->where('appoint_end_time','<',$st)->get();
+//        DB::enableQueryLog();
+//        $orders = Order::leftjoin('order_patients','order_patients.order_id','=','orders.id')->where(['orders.product_type'=>4,'orders.order_status'=>7])->where('order_patients.appoint_end_time','<',$st)->get(['orders.id']);
+//        dd(DB::getQueryLog());
+        if(request('c') && !empty($orders)) return count($orders->toArray());
+        if(request('b') && !empty($orders)) dd($orders->toArray());
+        foreach ($orders as $order){
+            Order::where('id',$order->id)->update(['order_status'=>6]);
+        }
+    }
+
+
 }

routes/web.php

@@ -38,6 +38,7 @@ Route::get('/test', 'IndexController@test');
 
 //用户信息
 Route::get('/api/getScheduleInfo', 'ScheDuleController@getScheduleInfo');
+Route::get('/api/orverTime', 'AppiontController@orverTime');
 Route::options('/api/getAppiontInfo', 'AppiontController@getAppiontInfo');
 Route::post('/api/getAppiontInfo', 'AppiontController@getAppiontInfo');
 Route::get('/api/getAppiontInfo', 'AppiontController@getAppiontInfo');