Commit c295f45d by 赵增煜

Merge branch 'hotfix-1224' into develop

parents 22095cb7 4d1a5467
...@@ -488,7 +488,7 @@ public function enter(Request $request) ...@@ -488,7 +488,7 @@ public function enter(Request $request)
'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' => $pharmacyDrugQueryInfo->drug->unit,//$pharmacyDrugQueryInfo->unit,
'dosage_id' => $drug['dosage_id'] ?? 0, // $pharmacyDrugQueryInfo->dosage_id, 'dosage_id' => $drug['dosage_id'] ?? 0, // $pharmacyDrugQueryInfo->dosage_id,
'dosage_desc' => $drug['dosage_desc'] ?? '等待药师录入', // $pharmacyDrugQueryInfo->dosage->dosage_desc, 'dosage_desc' => $drug['dosage_desc'] ?? '等待药师录入', // $pharmacyDrugQueryInfo->dosage->dosage_desc,
'num' => $drug['num'], // 中药为药师录入数量 'num' => $drug['num'], // 中药为药师录入数量
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment