Merge branch 'master' into develop

README.md

@@ -52,7 +52,7 @@ cd /www/wwwroot/BaoMa && php artisan  scheduleNotice<br>
 服务包过期 每10分钟执行
 cd /www/wwwroot/BaoMa && php artisan  packExpiredCheck<br>
 
-## 数据清空语句
+# 数据清空语句
 delete from bm_cdms_users where id > 1;<br>
 delete from bm_cdms_role_users where user_id >1;<br>
 delete from bm_admin_operation_log;<br>
@@ -114,7 +114,7 @@ delete from bm_organizations;<br>
 delete from bm_refund_application;<br>
 
 
-##清空用户数据
+## 清空用户数据
 delete  from bm_order_packs where order_id in (select id from bm_orders where user_id =10007 );<br>
 delete  from bm_order_patients where order_id in (select id from bm_orders where user_id =10007 );<br>
 delete  from bm_order_vaccines where order_id in (select id from bm_orders where user_id =10007 );<br>
@@ -124,7 +124,7 @@ delete  from bm_users where id = 10007;<br>
 delete  from bm_orders where user_id = 10007;<br>
 
 
-##清空医生数据
+## 清空医生数据
 delete from bm_docter_settings where docter_id  = 1007;<br>
 delete  from bm_order_packs where order_id in (select docter_id from bm_orders where docter_id=10007 );<br>
 delete  from bm_order_patients where order_id in (select id from bm_orders where docter_id=10007 );<br>
@@ -133,7 +133,25 @@ delete  from bm_order_nurses where order_id in (select id from bm_orders where d
 delete from bm_docters where id = 10007;<br>
 delete from bm_docter_organization where docter_id  = 10007;<br>
 
-
-
+# 导入用户数据
+##  导入用户数据要严格按照顺序来执行
+1. 导入机构表
+    - php artisan import:importDocter organization organization
+2. 导入医生表
+    -  php artisan import:importDocter docter docter
+3. 导入机构科室表 
+    - php artisan import:importDocter organization_office office
+4. 导入用户表
+    - php artisan import:importUser user user
+5. 导入患者表
+    - php artisan import:importUser patients patients
+
+# 导入订单数据
+## 导入订单数据之前必须要导入用户数据，否则会报错
+- php artisan importOrder nurse nurseOrder
+- php artisan importOrder service order
+- php artisan importOrder vaccine vaccineOrder
+- php artisan importOrder chat chatOrder
+- php artisan importOrder phone phoneOrder
 
 

app/Admin/Controllers/ArticleManagement/ArticleController.php

@@ -32,7 +32,7 @@ class ArticleController extends AdminController
         $grid->column('id', __('Id'));
         $grid->column('type', __('分类'))->using([1=>'健康科普',2=>'疫苗科普']);
         $grid->column('title', __('标题'))->limit(10,'...')->width(100);
-        $grid->column('content', __('内容'))->limit(20,'...')->width(200);
+//        $grid->column('content', __('内容'))->limit(20,'...')->width(200);
         $grid->column('banner_url', __('图片'))->lightbox(['width' =>'', 'height' => 30]);
         $grid->column('created_at', __('创建时间'));
         $grid->column('updated_at', __('更新时间'));

app/Admin/Controllers/CouponManagement/CouponDistributionUserList.php

@@ -37,11 +37,6 @@ class CouponDistributionUserList extends AdminController
                 0    => '黑名单',
                 1    => '正常',
             ]);
-            $filter->equal('is_pack','用户状态')->radio([
-                ''   => '全部用户',
-                0    => '普通用户',
-                1    => '服务包用户',
-            ]);
         });
         $grid->batchActions(function ($batch) {
             $batch->add(new CouponBatchGrant());
@@ -55,7 +50,6 @@ class CouponDistributionUserList extends AdminController
         $grid->column('sex', __('性别'))->using([0=>'未知',1=>'男',2=>'女']);
         $grid->column('age', __('年龄'));
         $grid->column('status', __('状态'))->using([0=>'黑名单',1=>'正常',]);
-        $grid->column('is_pack', __('用户身份'))->using([0=>'普通用户',1=>'付费用户']);
         $grid->column('balance', __('当前余额'))->display(function ($price){
             return $price/100;
         });

app/Admin/Controllers/CouponManagement/CouponManagementController.php

@@ -164,6 +164,13 @@ class CouponManagementController extends AdminController
             $f->model()->max_reduce_amount /=100;
             $f->model()->min_consume_amount /=100;
             $f->model()->money /=100;
+            $f->model()->start_time = date('Y-m-d H:i:s',$f->model()->start_time);
+            $f->model()->end_time = date('Y-m-d H:i:s',$f->model()->end_time);
+            if ($f->model()->start_time == 0 || $f->model()->end_time)
+            {
+                $f->model()->end_time = date('Y-m-d H:i:s',time());
+                $f->model()->start_time = date('Y-m-d H:i:s',time());
+            }
         });
         $type = request('type');
         if (isset($type))
@@ -174,7 +181,6 @@ class CouponManagementController extends AdminController
         $form->text('title', __('券标题'));
         $form->text('desc', __('使用说明'));
         $form->text('rules', __('使用规则'));
-//        dd($form->toArray());
         $form->image('icon', __('券图标'))->help('图标大小48px * 48px');
         $form->select('type', '类型')
             ->options([
@@ -216,7 +222,6 @@ class CouponManagementController extends AdminController
                     2=>'部分产品可用'
                 ]);
         }
-
         $form->select('expire_type', '过期类型')
             ->options([
                 1 => '领取N天过期',
@@ -224,8 +229,8 @@ class CouponManagementController extends AdminController
             ])->when(1, function (Form $form) {
                 $form->text('effective_days', __('有效天数'));
             })->when(2, function (Form $form) {
-                $form->date('start_time', __('有效期开始时间'));
-                $form->date('end_time', __('有效期结束时间'));
+                $form->datetime('start_time', __('有效期开始时间'));
+                $form->datetime('end_time', __('有效期结束时间'));
                 $form->saving(function ($form){
                     $form->start_time = strtotime($form->start_time);
                     $form->end_time = strtotime($form->end_time);
@@ -242,7 +247,14 @@ class CouponManagementController extends AdminController
                         {
                             return redirect('admin/coupons/create?type=1');
                         }
-
+                    }
+                    //如果过期类型是领取n天的话就把开始时间和结束时间置空
+                    if ($form->expire_type == 1)
+                    {
+                        $form->start_time = 0;
+                        $form->end_time = 0;
+                    }else{
+                        $form->effective_days = 0;
                     }
                 });
             });

app/Admin/Controllers/DataCenter/FinancialOrderOverview.php

@@ -27,16 +27,16 @@ class FinancialOrderOverview
             ->row('<h1 text-align="center">订单走势</h1>')
             ->row(function (Row $row) {
                 $row->column(3, function (Column $column) {
-                    $column->append(infoBox('今日支付金额', 'dropbox', '/admin/deliver?status=1', 'green', FinancialSta::getTodayPay()));
+                    $column->append(infoBox('今日支付金额', 'dropbox', '', 'green', FinancialSta::getTodayPay()));
                 });
                 $row->column(3, function (Column $column) {
-                    $column->append(infoBox('昨日支付金额', 'dropbox', '/admin/deliver?status=1', 'green', FinancialSta::getYesterdayPay()));
+                    $column->append(infoBox('昨日支付金额', 'dropbox', '', 'green', FinancialSta::getYesterdayPay()));
                 });
                 $row->column(3, function (Column $column) {
-                    $column->append(infoBox('近七日支付金额', 'dropbox', '/admin/deliver?status=1', 'green', FinancialSta::getSevenDayPay()));
+                    $column->append(infoBox('近七日支付金额', 'dropbox', '', 'green', FinancialSta::getSevenDayPay()));
                 });
                 $row->column(3, function (Column $column) {
-                    $column->append(infoBox('近三十日支付金额', 'dropbox', '/admin/deliver?status=1', 'green', FinancialSta::getOneMonthPay()));
+                    $column->append(infoBox('近三十日支付金额', 'dropbox', '', 'green', FinancialSta::getOneMonthPay()));
                 });
             })
             ->row(function (Row $row){

app/Admin/Controllers/DataCenter/FinancialOverview.php

@@ -28,28 +28,28 @@ class FinancialOverview
             ->row(function (Row $row) {
                 // 产品类型(1.电话咨询 2.图文咨询 3.门诊预约 4.疫苗接种预约 5.儿保预约 6.服务包 7.充值)
                 $row->column(3, function (Column $column) {
-                    $column->append(infoBox('收入总金额', 'dropbox', '/admin/deliver?status=1', 'green', FinancialSta::getTotalIncome()));
+                    $column->append(infoBox('收入总金额', 'dropbox', '', 'green', FinancialSta::getTotalIncome()));
                 });
                 $row->column(3, function (Column $column) {
-                    $column->append(infoBox('退款总金额', 'dropbox', '/admin/deliver?status=1', 'green', FinancialSta::getTotalRefund()));
+                    $column->append(infoBox('退款总金额', 'dropbox', '', 'green', FinancialSta::getTotalRefund()));
                 });
                 $row->column(3, function (Column $column) {
-                    $column->append(infoBox('用户充值总金额', 'dropbox', '/admin/deliver?status=1', 'green', FinancialSta::getTotalRecharge()));
+                    $column->append(infoBox('用户充值总金额', 'dropbox', '', 'green', FinancialSta::getTotalRecharge()));
                 });
                 $row->column(3, function (Column $column) {
-                    $column->append(infoBox('用户总余额', 'dropbox', '/admin/deliver?status=1', 'green', FinancialSta::getTotalUserBalance()));
+                    $column->append(infoBox('用户总余额', 'dropbox', '', 'green', FinancialSta::getTotalUserBalance()));
                 });
             })
             ->row('<h1 text-align="center">充值记录</h1>')
             ->row(function (Row $row){
                 $row->column(3,function (Column $column){
-                    $column->append(infoBox('当日充值金额', 'dropbox', '/admin/deliver?status=1', 'green', FinancialSta::getTodayReCharge()));
+                    $column->append(infoBox('当日充值金额', 'dropbox', '', 'green', FinancialSta::getTodayReCharge()));
                 });
                 $row->column(3,function (Column $column){
-                    $column->append(infoBox('近七日充值金额', 'dropbox', '/admin/deliver?status=1', 'green', FinancialSta::getSevenDayReCharge()));
+                    $column->append(infoBox('近七日充值金额', 'dropbox', '', 'green', FinancialSta::getSevenDayReCharge()));
                 });
                 $row->column(3,function (Column $column){
-                    $column->append(infoBox('近三十日充值金额', 'dropbox', '/admin/deliver?status=1', 'green', FinancialSta::getOneMonthReCharge()));
+                    $column->append(infoBox('近三十日充值金额', 'dropbox', '', 'green', FinancialSta::getOneMonthReCharge()));
                 });
             })
             ->row(function (Row $row){

app/Admin/Controllers/OrdersManagement/BookingOrderController.php

@@ -46,6 +46,7 @@ class BookingOrderController extends AdminController
                 $filter->like('user.nickname','用户姓名');
                 $filter->like('docter.name','医生姓名');
                 $filter->like('orderPatient.name','患者姓名');
+                $filter->equal('orderPatient.patient_phone','患者电话');
                 $filter->equal('product_type','预约类型')->radio(
                     [
                         ''=>'不限',
@@ -106,10 +107,6 @@ class BookingOrderController extends AdminController
                         }
                 }
             }
-            //有问题 未支付是订单状态，这里冲突了
-//            if ($actions->row->product_type == 5 && $actions->row->order_status == 5 && $actions->row->payment_status == 2){
-//
-//            }
         });
         $grid->model()->orderBy('id','desc');
         $grid->column('id', __('Id'))->sortable();
@@ -123,29 +120,7 @@ class BookingOrderController extends AdminController
         $grid->column('orderPatient.appoint_end_time', __('就诊日期'))->display(function ($time){
             return date('Y-m-d H:i:s',$time);
         });
-        $grid->column('is_evaluates', __('评价详情'))->expand(function ($model){
-            $infos = $model->evaluate()->get()->map(function ($info){
-                return $info->only(['order_id','content','status']);
-            });
-            $infos = $infos->toArray();
-            foreach ($infos as $key => $value)
-            {
-                if (!empty($infos[$key]))
-                {
-                    if ($infos[$key]['status'] == 1)
-                    {
-                        $infos[$key]['status'] = '待审核';
-                    }else if ($infos[$key]['status'] == 2)
-                    {
-                        $infos[$key]['status'] = '审核成功';
-                    }else{
-                        $infos[$key]['status'] = '审核拒绝';
-                    }
-                }
-            }
-            return new Table(['订单id','评价内容','评价状态'],$infos);
-        });
-        $grid->column('evaluate.score', __('订单评分'));
+//        $grid->column('evaluate.score', __('订单评分'));
         $grid->column('product_type', __('产品类型'))->using([3=>'门诊预约',4=>'疫苗接种预约',5=>'儿保预约']);
         $grid->column('payment_type', __('支付方式'))->display(function ($payment_type){
             if ($payment_type == 1)

app/Admin/Controllers/UserManagement/BmUser/FeedBacksController.php

@@ -31,6 +31,8 @@ class FeedBacksController extends AdminController
         });
         $grid->filter(function ($filter){
            $filter->like('docter.nickname','名字');
+           $filter->equal('docter.phone','电话');
+           $filter->between('created_at', '创建时间')->datetime();
         });
         $grid->column('id', __('Id'));
         $grid->column('user_id', __('用户id'));

app/Admin/Controllers/UserManagement/BmUser/UserListController.php

@@ -55,7 +55,7 @@ class UserListController extends AdminController
             $filter->column(1/2, function ($filter) {
                 $filter->disableIdFilter();
                 $filter->equal('phone','手机')->mobile()->placeholder("请输入手机");
-                $filter->like('nickname','昵称');
+                $filter->like('nickname','用户名');
                 $filter->equal('status','用户状态')->radio([
                     ''   => '不限',
                     0    => '黑名单',

app/Admin/Controllers/UserManagement/BmUser/UserPatientsController.php

@@ -46,7 +46,7 @@ class UserPatientsController extends AdminController
         $grid->column('userspatient.nickname', __('用户姓名'));
         $grid->column('name', __('患者姓名'));
         $grid->column('sex', __('性别'))->using([0=>'未知',1=>'男',2=>'女',]);
-        $grid->column('avatar', __('头像'))->lightbox(['width' =>'', 'height' => 30]);
+//        $grid->column('avatar', __('头像'))->lightbox(['width' =>'', 'height' => 30]);
         $grid->column('age', __('年龄'));
         $grid->column('email', __('邮箱'));
         $grid->column('phone', __('联系电话'));

app/Admin/Controllers/UserManagement/DocterManagement/ApproveController.php

@@ -35,6 +35,7 @@ class ApproveController extends AdminController
             $filter->disableIdFilter();
             $filter->like('docter.name','医生姓名');
             $filter->like('organization.name','机构名');
+            $filter->equal('state', '认证状态')->select([1=>'已认证',2=>'审核驳回',3=>'待审核']);
             $filter->between('authentication_time', '签约时间')->datetime();
             $filter->between('authentication_end_time', '签约到期时间')->datetime();
         });
@@ -43,6 +44,7 @@ class ApproveController extends AdminController
         $grid->column('id', __('Id'));
         $grid->column('docter.id', __('医生ID'));
         $grid->column('docter.name', __('医生姓名'));
+        $grid->column('docter.phone', __('医生电话'));
         $grid->column('docter.avatar', __('医生头像'))->lightbox(['width' =>'', 'height' => 30]);
         $grid->column('docter.sex', __('性别'))->using([0=>'未知',1=>'男',2=>'女']);
         $grid->column('organization.name', __('机构'));

app/Admin/Controllers/UserManagement/DocterManagement/DoctorManagementController.php

@@ -40,7 +40,7 @@ class DoctorManagementController extends AdminController
         $grid->filter(function ($filter){
             $filter->disableIdFilter();
             $filter->like('name','昵称');
-//            $filter->like('organization','机构名称');
+            $filter->equal('phone','电话');
             $filter->where(function ($query) {
                 $query->whereHas('organization',function ($query){
                     $query->where('name','like',"%{$this->input}%");
@@ -50,6 +50,10 @@ class DoctorManagementController extends AdminController
                 0    => '禁用',
                 1    => '启用',
             ]);
+            $filter->equal('is_then','认证状态')->select([
+                0    => '未认证',
+                1    => '已认证',
+            ]);
         });
         $grid->actions(function ($actions) {
             // 去掉编辑
@@ -79,10 +83,7 @@ class DoctorManagementController extends AdminController
             'on'  => ['value' => 1, 'text' => '启用', 'color' => 'primary'],
             'off' => ['value' => 0, 'text' => '禁用', 'color' => 'danger'],
         ];
-//        $grid->column('organization', __('所属机构'))->pluck('name')->label('info');
         $grid->column('org', __('所属机构'))->display(function (){
-//            dd($organization);
-//            dd($this->id);
             $org_id = DocterOrganization::where('docter_id',$this->id)->where('state',1)->pluck('organization_id')->toArray();
             $name = Organization::whereIn('id',$org_id)->pluck('name')->toArray();
             if (empty($name))
@@ -119,7 +120,6 @@ class DoctorManagementController extends AdminController
             return $type_arr;
         })->label('info');
         $grid->column('label', __('标签'))->display(function ($label){
-//            dd($label);
             if($label==null)
             {
                 return '无';

app/Admin/Controllers/UserManagement/DocterManagement/PhoneController.php

@@ -37,7 +37,7 @@ class PhoneController extends AdminController
         $grid->column('type', __('类型'))->using([1=>'电话咨询',2=>'图文咨询',3=>'门诊咨询',4=>'疫苗预约接种',5=>'儿保预约',6=>'服务包',7=>'充值']);
 
         $grid->column('base_price', __('基础价格'));
-        $grid->column('base_price', __('步进价格'));
+        $grid->column('step_price', __('步进价格'));
         $grid->column('am', __('上午服务时间'))->display(function (){
             $service_time = DocterTimes::where('docter_id',$this->docter_id)->where('id',$this->id)->value('service_time');
             $arr = json_decode($service_time);

app/Admin/Controllers/UserManagement/DocterManagement/UserEvaluatesController.php

@@ -51,13 +51,18 @@ class UserEvaluatesController extends AdminController
             $filter->disableIdFilter();
             $filter->like('user.nickname','用户名字');
             $filter->like('docter.name','医生名字');
-            $filter->like('content','评价内容');
-            $filter->timestampBetween('audit_time', "审核时间")->datetime();
             $filter->equal('status','审核状态')->select([
                 1   => '待审核',
                 2    => '审核通过',
                 3    => '忽略',
             ]);
+            $filter->in('score','评分')->checkbox([
+                1    => 1,
+                2    => 2,
+                3    => 3,
+                4    => 4,
+                5    => 5,
+            ]);
         });
         $grid->model()->orderBy('id','desc');
         $grid->column('id', __('Id'));

app/Admin/Controllers/VaccinesManagement/VaccinesController.php

@@ -65,7 +65,7 @@ class VaccinesController extends AdminController
             });
             $filter->column(1/2, function ($filter) {
                $filter->like('name','疫苗名称');
-                $filter->equal('organizationvaccines.org_id','机构')->select(Organization::pluck('name','id'));
+                $filter->equal('org_id','机构')->select(Organization::pluck('name','id'));
             });
         });
         //按关键字查询

app/Console/Commands/ImportOrder.php

@@ -23,7 +23,7 @@ class ImportOrder extends Command
      *
      * @var string
      */
-    protected $description = '订单数据导入';
+    protected $description = '订单数据导入 importOrder {订单类型} {导入xls文件名}';
 
     /**
      * Create a new command instance.