群发通知

app/Community/Actions/Vaccine/FasteOrder.php

@@ -40,7 +40,7 @@ class FasteOrder extends Action
                 'product_type'=>4,
                 'total_amount'=>$orgVaccine['price'],
                 'is_faster'=>1,
-                'order_status'=>2,
+                'order_status'=>7,
                 'payment_status'=>2,
             ];
 

app/Community/Controllers/UserNoticeController.php

@@ -46,7 +46,7 @@ class UserNoticeController extends AdminController
 
         $grid->filter(function ($flter){
             $flter->like('name','请输入患者姓名');
-            $flter->like('nickname','请输入监护人姓名');
+            $flter->like('user.nickname','请输入监护人姓名');
             $flter->between('birthday','生日')->datetime();
             $flter->between('orderpatient.appoint_start_time','预约时间')->datetime();
             $flter->equal('order.product_type','用户类型')->select([4=>'计免',5=>'儿保']);

app/Models/Order.php

@@ -12,14 +12,15 @@ class Order extends BaseModel
 {
     protected $appends = ['is_evaluate', 'consult_duration', 'callback_phone'];
 
-    CONST UNPAID = 1, NOTACCEPT = 2, ISING = 3, FINISHED = 4,CANCELED=5,ISOUT=6; //订单状态(1.未支付 2.进行中 3.已完成 4.已取消)
+    CONST UNPAID = 1, NOTACCEPT = 2, ISING = 3, FINISHED = 4,CANCELED=5,ISOUT=6,ISACCEPT=7;//订单状态(1.未支付 2.进行中 3.已完成 4.已取消)
     public static  $_order_status = [
         self::UNPAID=>'未支付',
         self::NOTACCEPT=>'待支付',
         self::ISING=>'进行中',
         self::FINISHED=>'已完成',
         self::CANCELED=>'已取消',
-        self::ISOUT=>'已超时'
+        self::ISOUT=>'已超时',
+        self::ISACCEPT=>'已预约'
     ];
 
 

app/Models/Patient.php

@@ -56,5 +56,8 @@ class Patient extends BaseModel
     public function user(){
         return $this->hasOne(User::class,'id','user_id');
     }
-    
+
+    public function orderPatient(){
+        return $this->hasOne(OrderPatient::class,'patient_id','id');
+    }
 }

config/tenancy.php

@@ -11,7 +11,7 @@ return [
     | login page.
     |
     */
-    'name' => '超级妈力社区管理平台',
+    'name' => '熙宝HMO社区管理平台',
 
     /*
     |--------------------------------------------------------------------------