处方单增加筛选

app/Admin/Controllers/PrescriptionController.php

@@ -69,6 +69,7 @@ protected function grid()
             // $grid->column('pharmacist_license_number');
             // $grid->column('pharmacist_license_number');
             $grid->column('created_at');
             $grid->column('created_at');
             $grid->column('is_abnormal')->using([0 => '否', 1 => '是']);
             $grid->column('is_abnormal')->using([0 => '否', 1 => '是']);
+            $grid->column('is_voided')->using(PrescriptionModel::IS_VOIDED_MAP);
             // $grid->column('updated_at')->sortable();
             // $grid->column('updated_at')->sortable();
 
 
             $grid->filter(function (Grid\Filter $filter) {
             $grid->filter(function (Grid\Filter $filter) {
@@ -79,7 +80,10 @@ protected function grid()
                 $filter->like('diagnosis_name')->width(3);
                 $filter->like('diagnosis_name')->width(3);
                 $filter->equal('pharmacy_id')->select(PharmacyModel::all()->pluck('name', 'id'))->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('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);
             });
             });
+            // $show->field('is_voided')->width(3)->using(PrescriptionModel::IS_VOIDED_MAP);
 
 
             // 行按钮控制
             // 行按钮控制
             $grid->disableCreateButton(); // 禁用创建按钮
             $grid->disableCreateButton(); // 禁用创建按钮

app/Api/Controllers/InquiryController.php

@@ -25,7 +25,7 @@ public function InquirytList(Request $request)
         if ($drug_ids) {
         if ($drug_ids) {
             Log::info('drug_ids=>'.json_encode($drug_ids).'===>'.gettype($drug_ids));
             Log::info('drug_ids=>'.json_encode($drug_ids).'===>'.gettype($drug_ids));
             $tag_ids = DrugRelatedTagModel::whereIn('drug_id', $drug_ids)->pluck('tag_id')->toArray();
             $tag_ids = DrugRelatedTagModel::whereIn('drug_id', $drug_ids)->pluck('tag_id')->toArray();
-            Log::info('tag_ids=>'.json_encode($tag_ids) .'===>'.gettype($tag_ids));
+            Log::info('tag_ids=>'.json_encode($tag_ids).'===>'.gettype($tag_ids));
             // 获取标签关联的问题
             // 获取标签关联的问题
             if ($tag_ids) {
             if ($tag_ids) {
                 $inquiry_ids = DrugTagRelatedInquiryModel::whereIn('tag_id', $tag_ids)->pluck('inquiry_id')->toArray();
                 $inquiry_ids = DrugTagRelatedInquiryModel::whereIn('tag_id', $tag_ids)->pluck('inquiry_id')->toArray();

app/Models/PrescriptionModel.php

@@ -54,7 +54,7 @@ class PrescriptionModel extends Model
     // 作废状态-文字映射
     // 作废状态-文字映射
     const IS_VOIDED_MAP = [
     const IS_VOIDED_MAP = [
         self::IS_VOIDED_FALSE => '未作废',
         self::IS_VOIDED_FALSE => '未作废',
-        self::IS_VOIDED_FALSE => '作废',
+        self::IS_VOIDED_TRUE => '作废',
     ];
     ];
 
 
     public function getDoctorSignedPicAttribute($value)
     public function getDoctorSignedPicAttribute($value)