录方后台

model/mFormula.php

@@ -52,31 +52,27 @@ class mFormula extends mBase {
         $data = $this->getFormulaByCondition($condition, $page_num, $page_size);
 
         $formula_ids = array_column($data, 'id');
-
         $formula_arr = $this->getFormulaHerbData($formula_ids);
 
         foreach ($data as &$da) {
             //格式化日期
             $da['create_time'] = date('Y-m-d', strtotime($da['create_time']));
-            if (isset($formula_arr[$da['id']])) {
+            if (isset($formula_arr[$da['id']])) $da['formula'] = $formula_arr[$da['id']];
-                $da['formula'] = $formula_arr[$da['id']];
-            }
 
-            $original = array();
+            //原方信息
             if (!empty($da['original'])) {
                 $original = json_decode($da['original'], true);
                 $original = array_column($original, null, 'name');
-            }
-            unset($da['original']);
 
                 foreach ($da['formula'] as &$v) {
-                //药方克重为0 去查询原方
+                    if (isset($original[$v['name']])) {
-                if (isset($original[$v['name']]) && $v['num'] == 0) {
                         $v['num_str'] = $original[$v['name']]['num'];
                         //$v['desc'] = $original[$v['name']]['desc'];
                     }
                 }
             }
+            unset($da['original']);
+        }
 
         return $data;
     }
@@ -156,7 +152,6 @@ class mFormula extends mBase {
         $formula_arr = $this->getFormulaHerbData(array($formula['id']));
         $formulaHerb = $formula_arr[$formula['id']];
 
-        //原方信息
         $original = $formula['original'];
         unset($formula['original']);
 
@@ -165,10 +160,10 @@ class mFormula extends mBase {
             return $formula;
         }
 
+        //原方信息
         $original = json_decode($original, true);
         $original = array_column($original, null, 'name');
         foreach ($formulaHerb as &$v) {
-            //药方克重为0 去查询原方
             if (isset($original[$v['name']])) {
                 $v['num_str'] = $original[$v['name']]['num'];
                 //$v['desc'] = $original[$v['name']]['desc'];