Merge branch 'master' of http://git.imohe.com/zhaozengyu/tzt-admin

app/Admin/Controllers/DoctorController.php

@@ -3,6 +3,7 @@
 namespace App\Admin\Controllers;
 
 use App\Admin\Repositories\DoctorRepository;
+use App\Models\DoctorModel;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Http\Controllers\AdminController;
@@ -24,6 +25,8 @@ protected function grid()
 
             $grid->column('id')->sortable();
             $grid->column('name');
+            $grid->column('status')->switch('', true);
+            $grid->column('is_auto')->using(DoctorModel::IS_AUTO_MAP)->dot(DoctorModel::IS_AUTO_MAP_COLOR);
             $grid->column('id_card')->display(function ($content) {
                 return data_masking($content, 'idcard');
             });
@@ -42,10 +45,9 @@ protected function grid()
             // $grid->column('be_good_at');
             // $grid->column('introduction');
             $grid->column('signed_pic')->image('', 50, 50);
-            $grid->column('status')->switch();
             $grid->column('user.openid', '关联用户');
             $grid->column('created_at');
-            $grid->column('updated_at')->sortable();
+            // $grid->column('updated_at')->sortable();
 
             // 快捷搜索
             $grid->quickSearch(['name', 'mobile', 'id_card'])->placeholder('请输入[姓名|手机号|身份证号码]')->width(25);
@@ -57,6 +59,8 @@ protected function grid()
                 $filter->like('name')->width(3);
                 $filter->like('id_card')->width(3);
                 $filter->like('mobile')->width(3);
+                $filter->in('status')->checkbox(DoctorModel::STATUS_MAP)->width(3);
+                $filter->in('is_auto', '自动开方')->checkbox(DoctorModel::IS_AUTO_MAP)->width(3);
             });
 
             $grid->setActionClass(Grid\Displayers\Actions::class);

app/Admin/Controllers/InquiryController.php

@@ -31,6 +31,7 @@ protected function grid()
                 $filter->expand(); // 默认展开搜索框
 
                 $filter->like('question')->width(3);
+                $filter->in('is_common')->checkbox(InquiryModel::INQUIRY_COMMON_MAP)->width(3);
             });
 
             $grid->setActionClass(Grid\Displayers\Actions::class);

app/Admin/Controllers/PatientController.php

@@ -35,7 +35,7 @@ protected function grid()
             $grid->column('mobile')->display(function ($content) {
                 return data_masking($content, 'mobile');
             });
-            $grid->column('is_default')->using([0 => '否', 1 => '是']);
+            $grid->column('is_default')->using(PatientModel::IS_DEFAULT_MAP)->dot(PatientModel::IS_DEFAULT_MAP_COLOR);
             $grid->column('user.id', '关联用户');
             $grid->column('pharmacy.name', '关联药店');
 

app/Admin/Controllers/PharmacistController.php

@@ -3,6 +3,7 @@
 namespace App\Admin\Controllers;
 
 use App\Admin\Repositories\PharmacistRepository;
+use App\Models\PharmacistModel;
 use App\Models\PharmacyModel;
 use Carbon\Carbon;
 use Dcat\Admin\Admin;
@@ -63,7 +64,7 @@ protected function grid()
 
             $grid->model()->orderBy('id', 'desc');
             $grid->column('id')->sortable();
-            $grid->column('status')->switch();
+            $grid->column('status')->switch('', true);
             $grid->column('name');
             $grid->column('id_card')->display(function ($content) {
                 return data_masking($content, 'idcard');
@@ -75,7 +76,7 @@ protected function grid()
             });
             $grid->column('practicing_license_expired_time');
             $grid->column('pharmacy.name', '关联药店');
-            $grid->column('is_default')->using([0 => '否', 1 => '是']);
+            $grid->column('is_default')->using(PharmacistModel::IS_DEFAULT_MAP)->dot(PharmacistModel::IS_DEFAULT_MAP_COLOR);
             // $grid->column('practicing_license')->image('', 50, 50);
             // $grid->column('physician_license')->image('', 50, 50);
             // $grid->column('created_at');

app/Admin/Controllers/PharmacyController.php

@@ -30,7 +30,8 @@ protected function grid()
 
             $grid->column('id')->sortable();
             $grid->column('status')->switch('', true);
-            $grid->column('is_open')->using(PharmacyModel::IS_OPEN_MAP)->help('药店控制');
+            $grid->column('is_open')->using(PharmacyModel::IS_OPEN_MAP)->help('药店控制')->dot(PharmacyModel::IS_OPEN_MAP_COLOR);
+            $grid->column('is_auto')->using(PharmacyModel::IS_AUTO_MAP)->dot(PharmacyModel::IS_AUTO_MAP_COLOR);
             $grid->column('name');
             // $grid->column('business_license')->image('', 50, 50);
             // $grid->column('drug_biz_license')->image('', 50, 50);
@@ -62,6 +63,9 @@ protected function grid()
 
                 $filter->like('name')->width(3);
                 $filter->like('mobile')->width(3);
+                $filter->in('status', '平台启用状态')->checkbox(PharmacyModel::STATUS_MAP)->width(3);
+                $filter->in('is_open', '开店状态')->checkbox(PharmacyModel::IS_OPEN_MAP)->width(3);
+                $filter->in('is_auto', '自动审方')->checkbox(PharmacyModel::IS_AUTO_MAP)->width(3);
             });
 
             $grid->setActionClass(Grid\Displayers\Actions::class);

app/Admin/Controllers/PharmacyCorrectionController.php

@@ -23,7 +23,7 @@ protected function grid()
 
             $grid->column('id');
             // $grid->column('pharmacy_id');
-            $grid->column('is_handle')->switch();
+            $grid->column('is_handle')->switch('', true);
             $grid->column('pharmacy_name');
             $grid->column('content');
             $grid->column('created_at');

app/Admin/Controllers/PrescriptionController.php

@@ -30,7 +30,7 @@ protected function grid()
             $grid->model()->orderBy('id', 'DESC');
 
             $grid->column('id', '处方单编号')->sortable();
-            $grid->column('status')->using(PrescriptionModel::PRESCRIPTION_STATUS_MAP);
+            $grid->column('status')->using(PrescriptionModel::PRESCRIPTION_STATUS_MAP)->badge(PrescriptionModel::PRESCRIPTION_STATUS_MAP_COLOR);
             $grid->column('patient_name');
             $grid->column('patient_age');
             $grid->column('patient_gender')->using(PatientModel::SEX_MAP);
@@ -68,18 +68,23 @@ protected function grid()
             // $grid->column('pharmacist_id');
             // $grid->column('pharmacist_license_number');
             $grid->column('created_at');
-            $grid->column('is_abnormal')->using([0 => '否', 1 => '是']);
+            $grid->column('is_abnormal')->using(PrescriptionModel::IS_ABNORMAL_MAP)->badge(PrescriptionModel::IS_ABNORMAL_MAP_COLOR);
+            $grid->column('is_voided')->using(PrescriptionModel::IS_VOIDED_MAP)->badge(PrescriptionModel::IS_VOIDED_MAP_COLOR);
             // $grid->column('updated_at')->sortable();
 
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->panel(); // 更改为 panel 布局
                 $filter->expand(); // 默认展开搜索框
 
+                $filter->equal('pharmacy_id')->select(PharmacyModel::all()->pluck('name', 'id'))->width(3);
                 $filter->like('patient_name')->width(3);
                 $filter->like('diagnosis_name')->width(3);
-                $filter->equal('pharmacy_id')->select(PharmacyModel::all()->pluck('name', 'id'))->width(3);
                 $filter->in('status')->checkbox(PrescriptionModel::PRESCRIPTION_STATUS_MAP)->width(3);
+                $filter->in('is_abnormal')->checkbox([0 => '否', 1 => '是'])->width(3);
+                $filter->in('is_voided')->checkbox(PrescriptionModel::IS_VOIDED_MAP)->width(3);
+                $filter->in('open_source')->checkbox(PrescriptionModel::OPEN_SOURCE_MAP)->width(3);
             });
+            // $show->field('is_voided')->width(3)->using(PrescriptionModel::IS_VOIDED_MAP);
 
             // 行按钮控制
             $grid->disableCreateButton(); // 禁用创建按钮

app/Models/DoctorModel.php

@@ -26,6 +26,23 @@ class DoctorModel extends Model
         self::STATUS_TRUE => '启用',
     ];
 
+    // 自动开放[0=否,1=是]
+    const IS_AUTO_FALSE = 0;
+
+    const IS_AUTO_TRUE = 1;
+
+    // 自动开放-文字映射
+    const IS_AUTO_MAP = [
+        self::IS_AUTO_FALSE => '否',
+        self::IS_AUTO_TRUE => '是',
+    ];
+
+    // 自动开放-颜色映射
+    const IS_AUTO_MAP_COLOR = [
+        self::IS_AUTO_FALSE => 'gray',
+        self::IS_AUTO_TRUE => 'success',
+    ];
+
     // 医师所属于的用户,一对一
     public function user()
     {

app/Models/PatientModel.php

@@ -27,6 +27,23 @@ class PatientModel extends Model
         self::SEX_FEMALE => '女',
     ];
 
+    // 是否默认[0=否,1=是]
+    const IS_DEFAULT_FALSE = 0;
+
+    const IS_DEFAULT_TRUE = 1;
+
+    // 是否默认-文字映射
+    const IS_DEFAULT_MAP = [
+        self::IS_DEFAULT_FALSE => '否',
+        self::IS_DEFAULT_TRUE => '是',
+    ];
+
+    // 是否默认-颜色映射
+    const IS_DEFAULT_MAP_COLOR = [
+        self::IS_DEFAULT_FALSE => 'gray',
+        self::IS_DEFAULT_TRUE => 'success',
+    ];
+
     /**
      * 根据身份证设置性别
      */

app/Models/PharmacistModel.php

@@ -15,6 +15,23 @@ class PharmacistModel extends Model
 
     protected $table = 'pharmacist';
 
+    // 是否默认[0=否,1=是]
+    const IS_DEFAULT_FALSE = 0;
+
+    const IS_DEFAULT_TRUE = 1;
+
+    // 是否默认-文字映射
+    const IS_DEFAULT_MAP = [
+        self::IS_DEFAULT_FALSE => '否',
+        self::IS_DEFAULT_TRUE => '是',
+    ];
+
+    // 是否默认-颜色映射
+    const IS_DEFAULT_MAP_COLOR = [
+        self::IS_DEFAULT_FALSE => 'gray',
+        self::IS_DEFAULT_TRUE => 'success',
+    ];
+
     // 药师关联的药店,多对一
     public function pharmacy()
     {

app/Models/PharmacyModel.php

@@ -23,8 +23,8 @@ class PharmacyModel extends Model
 
     // 平台启用店铺状态状态-文字映射
     const STATUS_MAP = [
-        self::STATUS_FALSE => '闭店',
-        self::STATUS_TRUE => '开店',
+        self::STATUS_FALSE => '禁用',
+        self::STATUS_TRUE => '启用',
     ];
 
     // 开店状态[0=闭店,1=开店]
@@ -38,6 +38,29 @@ class PharmacyModel extends Model
         self::IS_OPEN_TRUE => '开店',
     ];
 
+    // 是否默认-颜色映射
+    const IS_OPEN_MAP_COLOR = [
+        self::IS_OPEN_FALSE => 'danger',
+        self::IS_OPEN_TRUE => 'success',
+    ];
+
+    // 自动审方[0=否,1=是]
+    const IS_AUTO_FALSE = 0;
+
+    const IS_AUTO_TRUE = 1;
+
+    // 自动审方-文字映射
+    const IS_AUTO_MAP = [
+        self::IS_AUTO_FALSE => '否',
+        self::IS_AUTO_TRUE => '是',
+    ];
+
+    // 自动审方-颜色映射
+    const IS_AUTO_MAP_COLOR = [
+        self::IS_AUTO_FALSE => 'gray',
+        self::IS_AUTO_TRUE => 'success',
+    ];
+
     // 药店所属于的用户,一对一
     public function user()
     {

app/Models/PrescriptionModel.php

@@ -35,6 +35,13 @@ class PrescriptionModel extends Model
         self::PRESCRIPTION_STATUS_SUCCESS => '审方成功',
     ];
 
+    // 审方状态-文字映射
+    const PRESCRIPTION_STATUS_MAP_COLOR = [
+        self::PRESCRIPTION_STATUS_PENDING => 'info',
+        self::PRESCRIPTION_STATUS_REVIEWING => 'warning',
+        self::PRESCRIPTION_STATUS_SUCCESS => 'success',
+    ];
+
     // 开方来源[0=客开,1=店开]
     const OPEN_SOURCE_CUSTOMER = 0;
 
@@ -46,6 +53,23 @@ class PrescriptionModel extends Model
         self::OPEN_SOURCE_PHARMACY => '店开',
     ];
 
+    // 异常处方单状态[0=否,1=是]
+    const IS_ABNORMAL_FALSE = 0;
+
+    const IS_ABNORMAL_TRUE = 1;
+
+    // 异常处方单状态-文字映射
+    const IS_ABNORMAL_MAP = [
+        self::IS_VOIDED_FALSE => '否',
+        self::IS_VOIDED_TRUE => '是',
+    ];
+
+    // 异常处方单状态-颜色映射
+    const IS_ABNORMAL_MAP_COLOR = [
+        self::IS_VOIDED_FALSE => 'gray',
+        self::IS_VOIDED_TRUE => 'danger',
+    ];
+
     // 作废状态[0=未作废,1=作废]
     const IS_VOIDED_FALSE = 0;
 
@@ -54,7 +78,13 @@ class PrescriptionModel extends Model
     // 作废状态-文字映射
     const IS_VOIDED_MAP = [
         self::IS_VOIDED_FALSE => '未作废',
-        self::IS_VOIDED_FALSE => '作废',
+        self::IS_VOIDED_TRUE => '作废',
+    ];
+
+    // 作废状态-颜色映射
+    const IS_VOIDED_MAP_COLOR = [
+        self::IS_VOIDED_FALSE => 'gray',
+        self::IS_VOIDED_TRUE => 'danger',
     ];
 
     public function getDoctorSignedPicAttribute($value)