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

# Conflicts:
#	app/Admin/routes.php

app/Admin/Actions/Service/ApplysAction.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Admin\Actions\Service;
+
+use App\Models\Docter;
+use Encore\Admin\Actions\RowAction;
+use App\Models\Serviceapplys;
+use Illuminate\Database\Eloquent\Model;
+use PHPUnit\Util\Filter;
+
+class ApplysAction extends RowAction
+{
+    public $name = '通过';
+
+    public function handle(Model $model)
+    {
+        // $model ...
+        Serviceapplys::where('id',$model->id)->update(['status'=>2]);
+        $filter = [1=>'is_chat',2=>'is_phone',3=>'is_appoint'];
+
+        Docter::where('id',$model->docter_id)->upd3ate([$filter[$model->service_type]=>1]);
+
+        return $this->response()->success('审核通过')->refresh();
+    }
+
+}

app/Admin/Actions/Service/RefuseAction.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Admin\Actions\Service;
+
+use App\Models\Serviceapplys;
+use Encore\Admin\Actions\RowAction;
+use Illuminate\Database\Eloquent\Model;
+
+class RefuseAction extends RowAction
+{
+    public $name = '驳回';
+
+    public function handle(Model $model)
+    {
+        // $model ...
+        Serviceapplys::where('id',$model->id)->update(['status'=>3]);
+        return $this->response()->success('拒绝通过')->refresh();
+    }
+
+}

app/Admin/Actions/UpdateCdms.php

@@ -18,4 +18,9 @@ class UpdateCdms extends RowAction
         }
         return "/admin/cdms_user/".$cmds_id."/edit";
     }
+
+    public function form()
+    {
+        $this->display('')->image();
+    }
 }

app/Admin/Actions/backstage/Docters/SignUp.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Admin\Actions\backstage\Docters;
+
+use Encore\Admin\Actions\RowAction;
+use Illuminate\Database\Eloquent\Model;
+
+class SignUp extends RowAction
+{
+    public $name = '签约管理';
+
+    public function handle(Model $model)
+    {
+        // $model ...
+        return $this->response()->success('跳转档案库成功')->redirect('/admin/sign_up?docter_id='.$this->row->id.'');
+    }
+
+}

app/Admin/Actions/backstage/Evaluate/Ignore.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Admin\Actions\backstage\Evaluate;
+
+use App\Models\Evaluate;
+use Encore\Admin\Actions\RowAction;
+use Illuminate\Database\Eloquent\Model;
+
+class Ignore extends RowAction
+{
+    public $name = '忽略';
+
+    public function handle(Model $model)
+    {
+        // $model ...
+        Evaluate::where('order_id',$model->order_id)->update(['status'=>3]);
+        return $this->response()->success('忽略成功')->refresh();
+    }
+
+}

app/Admin/Actions/backstage/Evaluate/Pass.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Admin\Actions\backstage\Evaluate;
+
+use App\Models\Evaluate;
+use Encore\Admin\Actions\RowAction;
+use Illuminate\Database\Eloquent\Model;
+
+class Pass extends RowAction
+{
+    public $name = '审核通过';
+
+    public function handle(Model $model)
+    {
+        // $model ...
+        Evaluate::where('order_id',$model->order_id)->update(['status'=>2]);
+        return $this->response()->success('审核通过.')->refresh();
+    }
+
+}

app/Admin/Actions/backstage/User/Insurance.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Admin\Actions\backstage\User;
+
+use App\Models\Order;
+use App\Models\OrderPack;
+use Encore\Admin\Actions\RowAction;
+use Illuminate\Database\Eloquent\Model;
+
+class Insurance extends RowAction
+{
+    public $name = '保险单链接';
+
+//    public function handle(Model $model)
+//    {
+//        // $model ...
+//
+//        return $this->response()->success('Success message.')->refresh();
+//    }
+    public function form(Model $model)
+    {
+//        dd($model);
+//        $order_id = Order::where('patient_id',$model->id)->where('product_type','6')->value('id');
+        $val = OrderPack::where('order_id',$model->id)->value('insurance_img_url');
+        $this->image('name')->value($val);
+    }
+
+}

app/Admin/Actions/backstage/User/MapDepot.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Admin\Actions\backstage\User;
+
+use App\Models\OrderPatient;
+use Encore\Admin\Actions\RowAction;
+use Illuminate\Database\Eloquent\Model;
+
+class MapDepot extends RowAction
+{
+    public $name = '病例图库';
+
+    public function form(Model $model)
+    {
+        $imgs = OrderPatient::where('patient_id',$model->id)->get('medical_imgs');
+        $all = json_decode($imgs,true);
+        $i =1;
+        $all1 =  array_column($all,'medical_imgs');
+//        dd($all1);
+        foreach ($all1 as $val)
+        {
+//            dd($val);
+            if (is_array($val) || is_object($val))
+            {
+                foreach ($val as $value1){
+//                dd($value1);
+                    $this->image('name'.$i)->value($value1);
+                    $i++;
+//                echo $value1."<br>";
+                }
+            }
+
+//            dd($value1);
+        }
+    }
+
+}

app/Admin/Actions/backstage/User/Suggests.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Admin\Actions\backstage\User;
+
+use Encore\Admin\Actions\RowAction;
+use Illuminate\Database\Eloquent\Model;
+
+class Suggests extends RowAction
+{
+    public $name = '病例意见单';
+
+    public function handle(Model $model)
+    {
+        // $model ...
+        return $this->response()->success('跳转病例意见单成功')->redirect('/admin/user_suggests?patient_id='.$this->row->id.'');
+    }
+
+}

app/Admin/Actions/backstage/User/archives.php

@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class archives extends RowAction
 {
-    public $name = '档案';
+    public $name = '查看患者档案';
 
     public function handle(Model $model)
     {

app/Admin/Actions/backstage/User/coupons.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Admin\Actions\backstage\User;
+
+use Encore\Admin\Actions\RowAction;
+use Illuminate\Database\Eloquent\Model;
+
+class coupons extends RowAction
+{
+    public $name = '优惠券管理';
+
+    public function handle(Model $model)
+    {
+        // $model ...
+
+        return $this->response()->success('跳转优惠券库成功')->redirect('/admin/user_coupons?user_id='.$this->row->id.'');
+    }
+
+}

app/Admin/Actions/backstage/User/service.php

@@ -7,13 +7,12 @@ use Illuminate\Database\Eloquent\Model;
 
 class service extends RowAction
 {
-    public $name = '服务包-保单';
+    public $name = '服务包';
 
     public function handle(Model $model)
     {
         // $model ...
-
-        return $this->response()->success('跳转订单库成功')->redirect('/admin/user_orders?user_id='.$this->row->id.'&product_type=6');
+        return $this->response()->success('跳转服务包库成功')->redirect('/admin/user_orders?patient_id='.$this->row->id.'&product_type=6');
 
     }
 

app/Admin/Controllers/ArticleController.php

@@ -27,7 +27,7 @@ class ArticleController extends AdminController
         $grid = new Grid(new Article());
 
         $grid->column('id', __('Id'));
-        $grid->column('type', __('分类'))->using([1=>'没',2=>'有',3=>'分',4=>'类']);
+        $grid->column('type', __('分类'))->using([1=>'健康科普',2=>'疫苗科普']);
         $grid->column('title', __('标题'))->limit(10,'...')->width(100);
         $grid->column('content', __('内容'))->limit(20,'...')->width(200);
         $grid->column('banner_url', __('图片'))->image('',50,50);

app/Admin/Controllers/DoctorManagementController.php

@@ -0,0 +1,128 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Admin\Actions\backstage\Docters\SignUp;
+use App\Models\Docter;
+use App\Models\DocterOrganization;
+use App\Models\Organization;
+use App\Models\User;
+use Encore\Admin\Controllers\AdminController;
+use Encore\Admin\Form;
+use Encore\Admin\Grid;
+use Encore\Admin\Show;
+
+class DoctorManagementController extends AdminController
+{
+    /**
+     * Title for current resource.
+     *
+     * @var string
+     */
+    protected $title = '医生列表';
+
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        $grid = new Grid(new Docter());
+
+        $grid->filter(function ($filter){
+            $filter->disableIdFilter();
+            $filter->like('name','昵称');
+            $filter->equal('status','工作状态')->select([
+                0    => '禁用',
+                1    => '启用',
+            ]);
+
+        });
+
+        $grid->actions(function ($actions) {
+            // 去掉编辑
+            $actions->disableEdit();
+            // 去掉查看
+            $actions->disableView();
+            $actions->add(new SignUp());
+        });
+
+        $grid->column('id', __('Id'))->sortable();
+        $grid->column('name', __('姓名'));
+        $grid->column('avatar', __('头像'))->image('',50,50);
+        $grid->column('score', __('评分'));
+        $grid->column('service_persons', __('服务人数'));
+        $states = [
+            'on'  => ['value' => 1, 'text' => '启用', 'color' => 'primary'],
+            'off' => ['value' => 0, 'text' => '禁用', 'color' => 'danger'],
+        ];
+        $grid->column('status', __('工作状态'))->switch($states);
+        $grid->column('is_then', __('认证状态'))->using([0=>'未认证',1=>'已认证']);
+        $grid->column('label', __('标签'))->label('info');
+        return $grid;
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        $show = new Show(Docter::findOrFail($id));
+
+        $show->field('id', __('Id'));
+        $show->field('type', __('Type'));
+        $show->field('name', __('Name'));
+        $show->field('phone', __('Phone'));
+        $show->field('sex', __('Sex'));
+        $show->field('birthday', __('Birthday'));
+        $show->field('avatar', __('Avatar'));
+        $show->field('status', __('Status'));
+        $show->field('label', __('Label'));
+        $show->field('sign', __('Sign'));
+        $show->field('intro', __('Intro'));
+        $show->field('office_id', __('Office id'));
+        $show->field('qualification_id', __('Qualification id'));
+        $show->field('score', __('Score'));
+        $show->field('service_persons', __('Service persons'));
+        $show->field('eva_num', __('Eva num'));
+        $show->field('service_days', __('Service days'));
+        $show->field('phone_minutes', __('Phone minutes'));
+        $show->field('chat_price', __('Chat price'));
+        $show->field('phone_price', __('Phone price'));
+        $show->field('appoint_price', __('Appoint price'));
+        $show->field('is_chat', __('Is chat'));
+        $show->field('is_phone', __('Is phone'));
+        $show->field('is_appoint', __('Is appoint'));
+        $show->field('latitude', __('Latitude'));
+        $show->field('longitude', __('Longitude'));
+        $show->field('created_at', __('Created at'));
+        $show->field('updated_at', __('Updated at'));
+        $show->field('user_id', __('User id'));
+        $show->field('password', __('Password'));
+        $show->field('is_then', __('Is then'));
+        $show->field('practice', __('Practice'));
+        $show->field('card_photo', __('Card photo'));
+        $show->field('is_quail', __('Is quail'));
+        $show->field('card_id', __('Card id'));
+        $show->field('receiving_time', __('Receiving time'));
+
+        return $show;
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        $form = new Form(new Docter());
+
+        $form->switch('status', __('状态'));
+        return $form;
+    }
+}

app/Admin/Controllers/OutpatientServiceCCController.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Admin\Actions\Service\ApplysAction;
+use App\Admin\Actions\Service\RefuseAction;
+use App\Models\Serviceapplys;
+use Encore\Admin\Controllers\AdminController;
+use Encore\Admin\Form;
+use Encore\Admin\Grid;
+use Encore\Admin\Show;
+
+class OutpatientServiceCCController extends AdminController
+{
+    /**
+     * Title for current resource.
+     *
+     * @var string
+     */
+    protected $title = '门诊咨询认证';
+
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        $grid = new Grid(new Serviceapplys());
+
+        $grid->model()->where('service_type','3');
+        $grid->column('id', __('Id'));
+        $grid->column('docter.avatar', __('头像'))->image('',50,50);
+        $grid->column('docter.id', __('医生ID'));
+        $grid->column('docter.name','医生名称');
+        $grid->column('docter.sex','性别')->using([1=>'男',2=>'女']);
+        $grid->column('docter.DocterOrganization', __('所属机构'));
+//        $grid->column('docter.label', __('标签'))->map('ucwords')->implode('-');
+        $grid->column('docter.label', __('标签'))->label('info');
+
+        //$grid->column('service_type', __('服务类型'));
+
+        $grid->column('status', __('状态'))->using([1=>'审核',2=>'已通过',3=>'已拒绝'])->label([
+            1 => 'warning',
+            2 => 'success',
+            3 => 'default'
+        ]);
+        $grid->column('created_at', __('创建时间'));
+        $grid->column('updated_at', __('更新时间'));
+//        $grid->column('service_type','123')->hide();
+
+        $grid->actions(function ($actions) {
+            // 去掉删除
+            $actions->disableDelete();
+            // 去掉编辑
+            $actions->disableEdit();
+            // 去掉查看
+            $actions->disableView();
+
+            $actions->add(new ApplysAction());
+            $actions->add(new RefuseAction());
+        });
+        return $grid;
+    }
+}

app/Admin/Controllers/PhoneServiceCCController.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Admin\Actions\Service\ApplysAction;
+use App\Admin\Actions\Service\RefuseAction;
+use App\Models\Serviceapplys;
+use Encore\Admin\Controllers\AdminController;
+use Encore\Admin\Form;
+use Encore\Admin\Grid;
+use Encore\Admin\Show;
+
+class PhoneServiceCCController extends AdminController
+{
+    /**
+     * Title for current resource.
+     *
+     * @var string
+     */
+    protected $title = '电话咨询认证';
+
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        $grid = new Grid(new Serviceapplys());
+
+        $grid->model()->where('service_type','2');
+        $grid->column('id', __('Id'));
+        $grid->column('docter.avatar', __('头像'))->image('',50,50);
+        $grid->column('docter.id', __('医生ID'));
+        $grid->column('docter.name','医生名称');
+        $grid->column('docter.sex','性别')->using([1=>'男',2=>'女']);
+        $grid->column('docter.DocterOrganization', __('所属机构'));
+//        $grid->column('docter.label', __('标签'))->map('ucwords')->implode('-');
+        $grid->column('docter.label', __('标签'))->label('info');
+
+        //$grid->column('service_type', __('服务类型'));
+
+        $grid->column('status', __('状态'))->using([1=>'审核',2=>'已通过',3=>'已拒绝'])->label([
+            1 => 'warning',
+            2 => 'success',
+            3 => 'default'
+        ]);
+        $grid->column('created_at', __('创建时间'));
+        $grid->column('updated_at', __('更新时间'));
+
+        $grid->actions(function ($actions) {
+            // 去掉删除
+            $actions->disableDelete();
+            // 去掉编辑
+            $actions->disableEdit();
+            // 去掉查看
+            $actions->disableView();
+
+
+            $actions->add(new ApplysAction());
+            $actions->add(new RefuseAction());
+        });
+
+
+
+        return $grid;
+    }
+}
+
+

app/Admin/Controllers/QualificationController.php

@@ -1,64 +0,0 @@
-<?php
-
-namespace App\Admin\Controllers;
-
-use App\Models\Qualification;
-use Encore\Admin\Controllers\AdminController;
-use Encore\Admin\Form;
-use Encore\Admin\Grid;
-use Encore\Admin\Show;
-
-class QualificationController extends AdminController
-{
-    /**
-     * Title for current resource.
-     *
-     * @var string
-     */
-    protected $title = '资质列表';
-
-    /**
-     * Make a grid builder.
-     *
-     * @return Grid
-     */
-    protected function grid()
-    {
-        $grid = new Grid(new Qualification());
-
-        $grid->column('id', __('ID'));
-        $grid->column('name', __('资质名称'));
-        $grid->column('created_at', __('创建时间'));
-        $grid->column('updated_at', __('更新时间'));
-
-        return $grid;
-    }
-
-    /**
-     * Make a show builder.
-     *
-     * @param mixed $id
-     * @return Show
-     */
-    protected function detail($id)
-    {
-        $show = new Show(Qualification::findOrFail($id));
-
-
-        return $show;
-    }
-
-    /**
-     * Make a form builder.
-     *
-     * @return Form
-     */
-    protected function form()
-    {
-        $form = new Form(new Qualification());
-
-        $form->text('name', __('资质名称'));
-
-        return $form;
-    }
-}

app/Admin/Controllers/QualificationsController.php

@@ -0,0 +1,99 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Models\Qualification;
+use Encore\Admin\Controllers\AdminController;
+use Encore\Admin\Form;
+use Encore\Admin\Grid;
+use Encore\Admin\Show;
+
+class QualificationsController extends AdminController
+{
+    /**
+     * Title for current resource.
+     *
+     * @var string
+     */
+    protected $title = '职称类别';
+
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        $grid = new Grid(new Qualification());
+
+        $grid->actions(function ($actions) {
+            // 去掉编辑
+            $actions->disableEdit();
+            // 去掉查看
+            $actions->disableView();
+        });
+
+        $grid->filter(function ($filter){
+            $filter->disableIdFilter();
+            $filter->like('name','职称名称');
+            $filter->equal('status','状态')->select([
+                0    => '禁用',
+                1    => '启用',
+            ]);
+        });
+
+        $grid->column('id', __('Id'));
+        $grid->column('name', __('职称名称'));
+        $states = [
+            'on'  => ['value' => 1, 'text' => '启用', 'color' => 'primary'],
+            'off' => ['value' => 0, 'text' => '禁用', 'color' => 'danger'],
+        ];
+        $grid->column('status', __('状态'))->switch($states);
+        $grid->column('created_at', __('创建时间'));
+        $grid->column('updated_at', __('更新时间'));
+
+        return $grid;
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        $show = new Show(Qualification::findOrFail($id));
+
+        $show->field('id', __('Id'));
+        $show->field('name', __('Name'));
+        $show->field('status', __('Status'));
+        $show->field('created_at', __('Created at'));
+        $show->field('updated_at', __('Updated at'));
+
+        return $show;
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        $form = new Form(new Qualification());
+
+        $form->text('name', __('职称名称'));
+        $form->switch('status', __('状态'))->default(1);
+        $form->footer(function ($footer) {
+            // 去掉`查看`checkbox
+            $footer->disableViewCheck();
+            // 去掉`继续编辑`checkbox
+            $footer->disableEditingCheck();
+            // 去掉`继续创建`checkbox
+            $footer->disableCreatingCheck();
+        });
+
+        return $form;
+    }
+}

app/Admin/Controllers/ReplySevriceCCController.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Admin\Actions\Service\ApplysAction;
+use App\Admin\Actions\Service\RefuseAction;
+use App\Models\Serviceapplys;
+use Encore\Admin\Controllers\AdminController;
+use Encore\Admin\Form;
+use Encore\Admin\Grid;
+use Encore\Admin\Show;
+
+class ReplySevriceCCController extends AdminController
+{
+    /**
+     * Title for current resource.
+     *
+     * @var string
+     */
+    protected $title = '图文咨询认证';
+
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        $grid = new Grid(new Serviceapplys());
+
+        $grid->model()->where('service_type','1');
+        $grid->column('id', __('Id'));
+        $grid->column('docter.avatar', __('头像'))->image('',50,50);
+        $grid->column('docter.id', __('医生ID'));
+        $grid->column('docter.name','医生名称');
+        $grid->column('docter.sex','性别')->using([1=>'男',2=>'女']);
+        $grid->column('docter.DocterOrganization', __('所属机构'));
+//        $grid->column('docter.label', __('标签'))->map('ucwords')->implode('-');
+        $grid->column('docter.label', __('标签'))->label('info');
+
+        //$grid->column('service_type', __('服务类型'));
+
+        $grid->column('status', __('状态'))->using([1=>'审核',2=>'已通过',3=>'已拒绝'])->label([
+            1 => 'warning',
+            2 => 'success',
+            3 => 'default'
+        ]);
+        $grid->column('created_at', __('创建时间'));
+        $grid->column('updated_at', __('更新时间'));
+
+        $grid->actions(function ($actions) {
+            // 去掉删除
+            $actions->disableDelete();
+            // 去掉编辑
+            $actions->disableEdit();
+            // 去掉查看
+            $actions->disableView();
+
+
+            $actions->add(new ApplysAction());
+            $actions->add(new RefuseAction());
+        });
+
+
+
+        return $grid;
+    }
+}

app/Admin/Controllers/SignUpController.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Models\DocterOrganization;
+use Encore\Admin\Controllers\AdminController;
+use Encore\Admin\Form;
+use Encore\Admin\Grid;
+use Encore\Admin\Show;
+
+class SignUpController extends AdminController
+{
+    /**
+     * Title for current resource.
+     *
+     * @var string
+     */
+    protected $title = '签约管理';
+
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        $grid = new Grid(new DocterOrganization());
+        $docter_id = \request('docter_id');
+        $grid->filter(function ($filter){
+            $filter->disableIdFilter();
+            $filter->equal('docter_id','医生');
+        });
+        $grid->column('id', __('Id'));
+        $grid->column('docter_id', __('医生id'));
+        $grid->column('docter.name', __('医生姓名'));
+        $grid->column('organization_id', __('机构id'));
+        $grid->column('organization.name', __('机构名字'));
+        $grid->column('state', __('审核状态'))->using([0=>'待审核',1=>'审核通过',2=>'审核拒绝']);
+        $grid->column('created_at', __('创建时间'));
+        $grid->column('updated_at', __('更新时间'));
+
+        return $grid;
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        $show = new Show(DocterOrganization::findOrFail($id));
+
+        $show->field('id', __('Id'));
+        $show->field('docter_id', __('Docter id'));
+        $show->field('organization_id', __('Organization id'));
+        $show->field('offices_id', __('Offices id'));
+        $show->field('qualifications_id', __('Qualifications id'));
+        $show->field('state', __('State'));
+        $show->field('created_at', __('Created at'));
+        $show->field('updated_at', __('Updated at'));
+
+        return $show;
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        $form = new Form(new DocterOrganization());
+
+        $form->number('docter_id', __('Docter id'));
+        $form->number('organization_id', __('Organization id'));
+        $form->number('offices_id', __('Offices id'));
+        $form->number('qualifications_id', __('Qualifications id'));
+        $form->number('state', __('State'));
+
+        return $form;
+    }
+}

app/Admin/Controllers/UserCouponsController.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Models\UserCoupon;
+use Encore\Admin\Controllers\AdminController;
+use Encore\Admin\Form;
+use Encore\Admin\Grid;
+use Encore\Admin\Show;
+
+class UserCouponsController extends AdminController
+{
+    /**
+     * Title for current resource.
+     *
+     * @var string
+     */
+    protected $title = '优惠券列表';
+
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        $grid = new Grid(new UserCoupon());
+        $uesr_id = \request('user_id');
+        $grid->filter(function ($filter){
+            $filter->disableIdFilter();
+            $filter->equal('user_id','用户id');
+        });
+        $grid->disableActions();
+        $grid->column('id', __('Id'));
+        $grid->column('user_id', __('用户ID'));
+        $grid->column('order_id', __('订单'));
+        $grid->column('coupon_id', __('优惠券ID'));
+        $grid->column('name', __('券名称'));
+        $grid->column('title', __('券标题'));
+        $grid->column('desc', __('使用说明'));
+        $grid->column('rules', __('使用规则'));
+        $grid->column('icon', __('券图标'))->image();
+        $grid->column('status', __('状态'))->using([1=>'可用',2=>'已用',3=>'已过期']);
+        $grid->column('type', __('类型'))->using([1=>'满减券',2=>'折扣券']);
+        $grid->column('usable_type', __('可用类型'))->using([1=>'全部产品通用',2=>'部分产品可用']);
+        $grid->column('money', __('满减券的优惠钱数'))->display(function ($money){
+            return $money/100;
+        });
+        $grid->column('discount', __('折扣'));
+        $grid->column('min_consume_amount', __('最低消费金额'))->display(function ($money){
+            return $money/100;
+        });
+        $grid->column('max_reduce_amount', __('折扣券的最大抵扣金额'))->display(function ($money){
+            return $money/100;
+        });
+        $grid->column('expire_type', __('过期类型'))->using([1=>'领取N天过期',2=>'设置固定过期时间']);
+        $grid->column('effective_days', __('有效天数'));
+        $grid->column('start_time', __('有效期开始时间'))->display(function ($time){
+            return date("Y-m-d H:i",$time);
+        });
+        $grid->column('end_time', __('有效期结束时间'))->display(function ($time){
+            return date("Y-m-d H:i",$time);
+        });
+        $grid->column('expire_time', __('过期时间'))->display(function ($time){
+            return date("Y-m-d H:i",$time);
+        });
+        $grid->column('use_time', __('使用时间'));
+        $grid->column('coupons_num', __('优惠券数'));
+        $grid->column('created_at', __('创建时间'));
+        $grid->column('updated_at', __('更新时间'));
+
+        return $grid;
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        $show = new Show(UserCoupon::findOrFail($id));
+        return $show;
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        $form = new Form(new UserCoupon());
+        return $form;
+    }
+}

app/Admin/Controllers/UserEvaluatesController.php

@@ -0,0 +1,114 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Admin\Actions\backstage\Evaluate\Ignore;
+use App\Admin\Actions\backstage\Evaluate\Pass;
+use App\Models\Evaluate;
+use Encore\Admin\Controllers\AdminController;
+use Encore\Admin\Form;
+use Encore\Admin\Grid;
+use Encore\Admin\Show;
+
+class UserEvaluatesController extends AdminController
+{
+    /**
+     * Title for current resource.
+     *
+     * @var string
+     */
+    protected $title = '评价管理';
+
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        $grid = new Grid(new Evaluate());
+        $grid->actions(function ($actions) {
+            // 去掉删除
+            $actions->disableDelete();
+            // 去掉编辑
+            $actions->disableEdit();
+            //去掉查看
+            $actions->disableView();
+            //审核通过
+            $actions->add(new Pass());
+            //忽略
+            $actions->add(new Ignore());
+        });
+
+        $grid->filter(function ($filter){
+            $filter->disableIdFilter();
+            $filter->like('user.nickname','用户名字');
+            $filter->like('docter.name','医生名字');
+            $filter->like('content','评价内容');
+            $filter->equal('status','审核状态')->select([
+                1   => '待审核',
+                2    => '审核通过',
+                3    => '忽略',
+            ]);
+        });
+
+        $grid->column('id', __('Id'));
+        $grid->column('order_id', __('订单ID'));
+        $grid->column('user.nickname', __('用户姓名'));
+        $grid->column('docter.name', __('医生名称'));
+        $grid->column('content', __('评价内容'));
+        $grid->column('score', __('评分'));
+        $grid->column('status', __('状态'))->using([1=>'待审核',2=>'审核通过',3=>'忽略']);
+        $grid->column('audit_time', __('审核时间'))->display(function ($time){
+            return date('Y-m-d H:i:s',$time);
+        });
+        $grid->column('created_at', __('创建时间'));
+        $grid->column('updated_at', __('更新时间'));
+
+        return $grid;
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        $show = new Show(Evaluate::findOrFail($id));
+
+        $show->field('id', __('Id'));
+        $show->field('user_id', __('User id'));
+        $show->field('order_id', __('Order id'));
+        $show->field('docter_id', __('Docter id'));
+        $show->field('status', __('Status'));
+        $show->field('audit_time', __('Audit time'));
+        $show->field('content', __('Content'));
+        $show->field('score', __('Score'));
+        $show->field('created_at', __('Created at'));
+        $show->field('updated_at', __('Updated at'));
+
+        return $show;
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        $form = new Form(new Evaluate());
+
+        $form->number('user_id', __('User id'));
+        $form->number('order_id', __('Order id'));
+        $form->number('docter_id', __('Docter id'));
+        $form->switch('status', __('Status'))->default(1);
+        $form->number('audit_time', __('Audit time'));
+        $form->text('content', __('Content'));
+        $form->switch('score', __('Score'));
+
+        return $form;
+    }
+}

app/Admin/Controllers/UserListController.php

@@ -5,7 +5,8 @@ namespace App\Admin\Controllers;
 use App\Admin\Actions\backstage\User\archives;
 use App\Admin\Actions\backstage\User\BalanceLog;
 use App\Admin\Actions\backstage\User\BlackList;
-use App\Admin\Actions\backstage\User\service;
+use App\Admin\Actions\backstage\User\coupons;
+use App\Models\Patient;
 use App\Models\User;
 use Encore\Admin\Controllers\AdminController;
 use Encore\Admin\Form;
@@ -37,15 +38,15 @@ class UserListController extends AdminController
             // 去掉查看
             $actions->disableView();
             $actions->add(new archives());
-            $actions->add(new service());
             $actions->add(new BalanceLog());
             $actions->add(new BlackList());
+            $actions->add(new coupons());
         });
         //筛选
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
             $filter->equal('phone','手机')->mobile()->placeholder("请输入手机");
-            $filter->equal('phone','订单号')->placeholder("请输入订单号");
+            $filter->like('patient.name','患者姓名')->placeholder("请输入患者姓名");
             $filter->like('nickname','昵称');
             $filter->equal('status','用户状态')->radio([
                 ''   => '不限',
@@ -72,6 +73,8 @@ class UserListController extends AdminController
             $grid->column('last_login_time', __('最后登录时间'))->display(function ($time){
                 return date("Y-m-d H:i",$time);
             });
+//            $grid->column('patient', __('患者姓名'))->pluck('name')->map('ucwords')->implode(',');
+            $grid->column('patient', __('患者姓名'))->pluck('name')->label('default');
         return $grid;
     }
 

app/Admin/Controllers/UserPatientsController.php

@@ -2,8 +2,11 @@
 
 namespace App\Admin\Controllers;
 
+use App\Admin\Actions\backstage\User\MapDepot;
+use App\Admin\Actions\backstage\User\Suggests;
 use App\Models\Patient;
 use Encore\Admin\Controllers\AdminController;
+use App\Admin\Actions\backstage\User\service;
 use Illuminate\Http\Request;
 use Encore\Admin\Form;
 use Encore\Admin\Grid;
@@ -36,10 +39,13 @@ class UserPatientsController extends AdminController
             $actions->disableDelete();
             // 去掉编辑
             $actions->disableEdit();
+            //服务包
+            $actions->add(new service());
+
         });
         $grid->column('id', __('档案id'));
         $grid->column('user_id', __('用户id'));
-        $grid->column('name', __('姓名'));
+        $grid->column('name', __('患者姓名'));
         $grid->column('sex', __('性别'))->using([0=>'未知',1=>'男',2=>'女',]);
         $grid->column('avatar', __('头像'))->image("",100,100);
         $grid->column('age', __('年龄'));

app/Admin/Controllers/UserServiceController.php

@@ -4,6 +4,8 @@ namespace App\Admin\Controllers;
 
 use App\Models\Order;
 use App\Models\OrderPack;
+use App\Models\Patient;
+use App\Admin\Actions\backstage\User\Insurance ;
 use Encore\Admin\Controllers\AdminController;
 use Encore\Admin\Form;
 use Encore\Admin\Grid;
@@ -30,7 +32,7 @@ class UserServiceController extends AdminController
         $uesr_id = \request('user_id');
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
-            $filter->equal('user_id','用户id');
+            $filter->equal('patient_id','档案id');
             $filter->equal('product_type','订单类型');
         });
         $grid->actions(function ($actions) {
@@ -40,18 +42,21 @@ class UserServiceController extends AdminController
 
             // 去掉编辑
             $actions->disableEdit();
+            //保险单链接
+            $actions->add(new Insurance());
         });
 
         $grid->column('orderPack.id', __('Id'));
         $grid->column('orderPack.order_id', __('订单id'));
+        $grid->column('patient_id', __('患者姓名'))->display(function ($id){
+            return Patient::where('id',$id)->value('name');
+        });
         $grid->column('orderPack.service_pack_id', __('服务包id'));
         $grid->column('orderPack.pack_name', __('服务包名称'));
         $grid->column('orderPack.pack_intro', __('服务包简介'));
         $grid->column('orderPack.pack_price', __('服务包价格'))->display(function ($price){
             return $price/100;
         });
-        $grid->column('orderPack.insurance_policy', __('保单名称'));
-        $grid->column('orderPack.insurance_img_url', __('	保单图片链接'));
         $grid->column('orderPack.team_id', __('医生团队ID'));
 
         $grid->column('orderPack.effective_days', __('有效天数'));

app/Admin/Controllers/UserSuggestsController.php

@@ -0,0 +1,94 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Models\Suggest;
+use App\Models\User;
+use Encore\Admin\Controllers\AdminController;
+use Encore\Admin\Form;
+use Encore\Admin\Grid;
+use Encore\Admin\Show;
+
+class UserSuggestsController extends AdminController
+{
+    /**
+     * Title for current resource.
+     *
+     * @var string
+     */
+    protected $title = '病例意见单';
+
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        $grid = new Grid(new Suggest());
+        $uesr_id = \request('patient_id');
+        $grid->filter(function ($filter){
+            $filter->disableIdFilter();
+            $filter->equal('patient_id','档案id');
+        });
+        $grid->column('id', __('Id'));
+        $grid->column('order_id', __('订单id'));
+        $grid->column('user_id', __('用户id'));
+        $grid->column('patient_id', __('档案id'));
+        $grid->column('symptoms', __('病症'))->limit(20,'...');
+        $grid->column('pathogen', __('病因'))->limit(20,'...');
+        $grid->column('suggest', __('结论建议'))->limit(20,'...');
+        $grid->column('supplement_reason', __('补充原因'))->limit(20,'...');
+        $grid->column('supplement_content', __('补充内容'))->limit(20,'...');
+        $grid->column('created_at', __('创建时间'));
+        $grid->column('updated_at', __('更新时间'));
+
+        return $grid;
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        $show = new Show(Suggest::findOrFail($id));
+
+        $show->field('id', __('Id'));
+        $show->field('order_id', __('Order id'));
+        $show->field('user_id', __('User id'));
+        $show->field('patient_id', __('Patient id'));
+        $show->field('symptoms', __('Symptoms'));
+        $show->field('pathogen', __('Pathogen'));
+        $show->field('suggest', __('Suggest'));
+        $show->field('supplement_reason', __('Supplement reason'));
+        $show->field('supplement_content', __('Supplement content'));
+        $show->field('created_at', __('Created at'));
+        $show->field('updated_at', __('Updated at'));
+
+        return $show;
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        $form = new Form(new Suggest());
+
+        $form->number('order_id', __('Order id'));
+        $form->number('user_id', __('User id'));
+        $form->number('patient_id', __('Patient id'));
+        $form->text('symptoms', __('Symptoms'));
+        $form->text('pathogen', __('Pathogen'));
+        $form->text('suggest', __('Suggest'));
+        $form->text('supplement_reason', __('Supplement reason'));
+        $form->text('supplement_content', __('Supplement content'));
+
+        return $form;
+    }
+}

app/Admin/routes.php

@@ -16,17 +16,24 @@ Route::group([
     $router->resource('/cdms_user', CdmsController::class);
     $router->resource('/organizations', OrganizationController::class);
     $router->resource('/docters', DocterController::class);
-    $router->resource('/qualifications', QualificationController::class);
     $router->resource('/docters_approve', ApproveController::class);
     $router->resource('banners', BannerController::class);
     $router->resource('servebanners', ServebannerController::class);
+    //文章管理
     $router->resource('articles', ArticleController::class);
-
+    //疫苗管理
     $router->resource('vaccines', VaccinesController::class);
     $router->resource('docters_management', DoctorManagementController::class);
     $router->resource('users', UserListController::class);
     $router->resource('user_patients', UserPatientsController::class);
+
     $router->resource('service_applys',ServiceapplysController::class);
+    //电话咨询认证
+    $router->resource('phone_service_cc',PhoneServiceCCController::class);
+    //图文咨询认证
+    $router->resource('reply_service_cc',ReplySevriceCCController::class);
+    //门诊咨询认证
+    $router->resource('outpatient_service_cc',OutpatientServiceCCController::class);
 
     $router->resource('/setting', 'Config\ConfigController');
     $router->get('/setting_form', 'Config\FormController@form');
@@ -35,5 +42,15 @@ Route::group([
     $router->resource('user_orders', UserServiceController::class);
     $router->resource('user_balance_logs', UserBalanceLogController::class);
 
+    //用户管理->优惠券管理
+    $router->resource('user_coupons', UserCouponsController::class);
+    //用户管理->病例意见单
+    $router->resource('user_suggests', UserSuggestsController::class);
+    //评价管理
+    $router->resource('evaluates', UserEvaluatesController::class);
+    //职称类别
+    $router->resource('qualifications', QualificationsController::class);
+    //医生管理->签约管理
+    $router->resource('sign_up', SignUpController::class);
 });
 

app/Helpers/functions.php

@@ -84,10 +84,10 @@ if (!function_exists('get_distance_field')) {
     function get_distance_field($latitude, $longitude)
     {
         if (empty($latitude) || empty($longitude)) {
-            return '999999999 distance';
+            return '未知 distance';
         }
 
-        return 'if(longitude=0 and latitude=0,999999999,round(6378.138*2*asin(sqrt(pow(sin( (' . $latitude . '*pi()/180-latitude*pi()/180)/2),2)+cos(' . $latitude . '*pi()/180)*cos(latitude*pi()/180)* pow(sin((' . $longitude . '*pi()/180-longitude*pi()/180)/2),2)))*1000)) distance';
+        return 'if(longitude=0 and latitude=0,未知,round(6378.138*2*asin(sqrt(pow(sin( (' . $latitude . '*pi()/180-latitude*pi()/180)/2),2)+cos(' . $latitude . '*pi()/180)*cos(latitude*pi()/180)* pow(sin((' . $longitude . '*pi()/180-longitude*pi()/180)/2),2)))*1000)) distance';
     }
 }
 
@@ -99,10 +99,10 @@ if (!function_exists('get_user_distance_field')) {
         $latitude = $coordinate['latitude'];
         $longitude = $coordinate['longitude'];
         if (empty($latitude) || empty($longitude)) {
-            return '999999999 distance';
+            return '"未知" distance';
         }
 
-        return 'if(longitude=0 and latitude=0,999999999,round(6378.138*2*asin(sqrt(pow(sin( (' . $latitude . '*pi()/180-latitude*pi()/180)/2),2)+cos(' . $latitude . '*pi()/180)*cos(latitude*pi()/180)* pow(sin((' . $longitude . '*pi()/180-longitude*pi()/180)/2),2)))*1000)) distance';
+        return 'if(longitude=0 and latitude=0,"未知",round(6378.138*2*asin(sqrt(pow(sin( (' . $latitude . '*pi()/180-latitude*pi()/180)/2),2)+cos(' . $latitude . '*pi()/180)*cos(latitude*pi()/180)* pow(sin((' . $longitude . '*pi()/180-longitude*pi()/180)/2),2)))*1000)) distance';
     }
 }
 
@@ -143,7 +143,7 @@ if (!function_exists('get_distance')) {
     function get_distance($lat1, $lng1, $lat2, $lng2)
     {
         if (empty($lat1) || empty($lng1) || empty($lat2) || empty($lng2)) {
-            return '999999999';
+            return '未知';
         }
         $earthRadius = 6378138;
         $lat1 = ($lat1 * pi()) / 180;

app/Http/Controllers/Api/V1/OrderController.php

@@ -40,7 +40,7 @@ class OrderController extends AuthController
             'phone_minutes' => 'required_if:product_type,1|integer',
             'symptoms' => 'required_if:product_type,2|max:2000',
             'medical_imgs' => 'required_if:product_type,2|json|max:3000',
-            'pay_password|支付密码' => 'required_if:payment_type,2|integer',
+            'pay_password|支付密码' => 'integer',
         ]);
         $user = $this->user;
 
@@ -61,6 +61,10 @@ class OrderController extends AuthController
         $payment_amount = $req['total_amount'] - $discount_amount;
         $payment_amount = $payment_amount < 0 ? 0 : $payment_amount;
 
+        if ($req['payment_type'] == 2 && $payment_amount > 0 && empty($req['pay_password'])) {
+            return out(null, 10011, '请输入支付密码');
+        }
+
         if ($req['payment_type'] == 2) {
             if ($user['balance'] < $payment_amount) {
                 return out(null, 601, '余额不足');
@@ -173,7 +177,7 @@ class OrderController extends AuthController
             'docter_id' => 'required_if:product_type,3|integer',
             'vaccine_id' => 'required_if:product_type,4|integer',
             'nurse_ids' => 'required_if:product_type,5|json',
-            'pay_password|支付密码' => 'required_if:payment_type,2|integer',
+            'pay_password|支付密码' => 'integer',
         ]);
         $user = $this->user;
 
@@ -205,6 +209,10 @@ class OrderController extends AuthController
         $payment_amount = $req['total_amount'] - $discount_amount;
         $payment_amount = $payment_amount < 0 ? 0 : $payment_amount;
 
+        if ($req['payment_type'] == 2 && $payment_amount > 0 && empty($req['pay_password'])) {
+            return out(null, 10011, '请输入支付密码');
+        }
+
         if ($req['payment_type'] == 2) {
             if ($user['balance'] < $payment_amount) {
                 return out(null, 601, '余额不足');
@@ -330,7 +338,7 @@ class OrderController extends AuthController
             'is_security' => 'required|in:0,1',
             'guardian_name' => 'required|max:50',
             'relationship_type' => 'required|integer',
-            'pay_password|支付密码' => 'required_if:payment_type,2|integer',
+            'pay_password|支付密码' => 'integer',
         ]);
         $user = $this->user;
 
@@ -357,6 +365,10 @@ class OrderController extends AuthController
         $payment_amount = $req['total_amount'] - $discount_amount;
         $payment_amount = $payment_amount < 0 ? 0 : $payment_amount;
 
+        if ($req['payment_type'] == 2 && $payment_amount > 0 && empty($req['pay_password'])) {
+            return out(null, 10011, '请输入支付密码');
+        }
+
         if ($req['payment_type'] == 2) {
             if ($user['balance'] < $payment_amount) {
                 return out(null, 601, '余额不足');

app/Models/Article.php

@@ -13,10 +13,8 @@ class Article extends BaseModel
     protected $appends = ['is_collect'];
     protected $table = 'articles';
     public static $_post_type = [
-        1=>'没',
-        2=>'有',
-        3=>'分',
-        4=>'类'
+        1=>'健康科普',
+        2=>'疫苗科普'
     ];
     public function getIsCollectAttribute()
     {

app/Models/Docter.php

@@ -25,9 +25,9 @@ class Docter extends BaseModel
         return $this->belongsTo(Qualification::class)->select(['id', 'name']);
     }
 
-    public function organization()
+    public function DocterOrganization()
     {
-        return $this->belongsToMany(Organization::class);
+        return $this->belongsTo(DocterOrganization::class,'docter_id','id');
     }
 
     public function evaluate()
@@ -35,6 +35,11 @@ class Docter extends BaseModel
         return $this->hasMany(Evaluate::class)->where('status', 2);
     }
 
+    public  function teamdocter()
+    {
+        return $this->hasOne(TeamDocter::class);
+    }
+
     public function getIsCollectAttribute()
     {
         if (!empty(request()->header('token'))) {
@@ -46,4 +51,9 @@ class Docter extends BaseModel
 
         return 0;
     }
+
+    public function serviceapplys()
+    {
+        return $this->hasOne(Serviceapplys::class);
+    }
 }

app/Models/Serviceapplys.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Serviceapplys extends Model
+{
+    //
+    protected $table = 'service_applys';
+
+    public function docter(){
+        return $this->belongsTo(Docter::class);
+    }
+//    private static $_post_type =[
+//        1 => '图文',
+//        2 => '电话',
+//        3 => '问诊'
+//    ];
+
+//    private static $_post_status =[
+//        1 => '审核',
+//        2 => '通过',
+//        3 => '未通过'
+//    ];
+}

app/Models/Team.php

@@ -14,4 +14,7 @@ class Team extends BaseModel
     {
         return $this->belongsToMany(Docter::class, 'team_docters');
     }
+    public function DocterOrganization(){
+        return $this->belongsTo(DocterOrganization::class);
+    }
 }

app/Models/TeamDocter.php

@@ -10,5 +10,10 @@ namespace App\Models;
 
 class TeamDocter extends BaseModel
 {
-
+    public function DocterOrganization(){
+        return $this->belongsTo(DocterOrganization::class);
+    }
+    public function docter(){
+        return $this->belongsTo(Docter::class);
+    }
 }

app/Models/User.php

@@ -93,4 +93,7 @@ class User extends BaseModel
     public function UserBalanceLog(){
         return $this->hasMany(UserBalanceLog::class);
     }
+    public function patient(){
+        return $this->hasMany(Patient::class);
+    }
 }