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

app/Api/Controllers/PrescriptionController.php

@@ -448,16 +448,19 @@ public function enter(Request $request)
             // 用药信息 中药:[['pharmacy_drug_id'=>2,'unit'=>'盒','num'=>1]]
             // 用药信息 中药:[['pharmacy_drug_id'=>2,'unit'=>'盒','num'=>1]]
             $drug_info = [];
             $drug_info = [];
             foreach ($drugs as $drug) {
             foreach ($drugs as $drug) {
+                if( intval($drug['num']) <= 0 ){
+                    return $this->failed('请输入正确的中药数量!');
+                }
                 $pharmacyDrugQueryInfo = PharmacyDrugModel::with(['drug', 'dosage'])->find($drug['pharmacy_drug_id']);
                 $pharmacyDrugQueryInfo = PharmacyDrugModel::with(['drug', 'dosage'])->find($drug['pharmacy_drug_id']);
                 $drug_info[] = [
                 $drug_info[] = [
                     'pharmacy_drug_id' => $drug['pharmacy_drug_id'],
                     'pharmacy_drug_id' => $drug['pharmacy_drug_id'],
                     'drug_id' => $pharmacyDrugQueryInfo->drug_id,
                     'drug_id' => $pharmacyDrugQueryInfo->drug_id,
                     'drug_name' => $pharmacyDrugQueryInfo->drug->name,
                     'drug_name' => $pharmacyDrugQueryInfo->drug->name,
                     'spec' => $pharmacyDrugQueryInfo->drug->spec,
                     'spec' => $pharmacyDrugQueryInfo->drug->spec,
-                    'unit' => $pharmacyDrugQueryInfo->unit,
+                    'unit' => $drug['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' => '',  // 中药为药师录入数量
+                    'num' => $drug['num'],  // 中药为药师录入数量
                 ];
                 ];
             }
             }
             $prescription->doses = $request->input('doses'); // 剂量
             $prescription->doses = $request->input('doses'); // 剂量