药店端增加中药筛选

app/Admin/Controllers/PharmacyDrugController.php

@@ -62,6 +62,7 @@ protected function grid()
                 $filter->like('drug.name', '药品名称')->width(3);
                 $filter->like('drug.name', '药品名称')->width(3);
                 $filter->like('drug.code', '药品简码')->width(3);
                 $filter->like('drug.code', '药品简码')->width(3);
                 $filter->like('drug.factory', '生产厂家')->width(3);
                 $filter->like('drug.factory', '生产厂家')->width(3);
+                $filter->in('drug.drug_type')->checkbox(DrugModel::DRUG_TYPE_MAP)->width(3);
             });
             });
 
 
             // 行按钮控制
             // 行按钮控制

app/Api/Controllers/PrescriptionController.php

@@ -454,7 +454,7 @@ public function enter(Request $request)
                     'unit' => $pharmacyDrugQueryInfo->unit,
                     'unit' => $pharmacyDrugQueryInfo->unit,
                     // 'dosage_id' => 0, // $pharmacyDrugQueryInfo->dosage_id,
                     // 'dosage_id' => 0, // $pharmacyDrugQueryInfo->dosage_id,
                     // 'dosage_desc' => '等待药师录入', // $pharmacyDrugQueryInfo->dosage->dosage_desc,
                     // 'dosage_desc' => '等待药师录入', // $pharmacyDrugQueryInfo->dosage->dosage_desc,
-                    'num' => $drug['num'],  // 中药为药师录入数量
+                    'num' => '',  // 中药为药师录入数量
                 ];
                 ];
             }
             }
             $prescription->doses = $request->input('doses'); // 剂量
             $prescription->doses = $request->input('doses'); // 剂量