医案相关接口数据不再映射后端处理好直接返回

model/mUserCase.php

@@ -163,14 +163,12 @@ class mUserCase extends mBase {
             return false;
         }
 
-        $prescribe_herb = json_decode($user_case['prescribe_herb'], true);
+        //格式化医案开药详情
-        $user_case['prescribe_herb'] = $prescribe_herb;
+        $prescribe_herb = $this->getUserCaseHerb(array($user_case['id'] => json_decode($user_case['prescribe_herb'], true)));
-
+        $user_case['prescribe_herb'] = $prescribe_herb[$user_case['id']];
-        $user_case_herb = $this->getUserCaseHerb(array($prescribe_herb));
 
         return array(
             'user_case' => $user_case,
-            'user_case_herb' => $user_case_herb,
             'case_data' => $case,
         );
     }
@@ -230,8 +228,23 @@ class mUserCase extends mBase {
 
             $herb = array_merge($herb, $user_herb);
         }
+        $herb_list = array_column($herb, null, 'id');
+
+        $return = array();
+        foreach ($prescribe_herb_arr as $user_case_id => $prescribe_herb) {
+            foreach ($prescribe_herb as $herb_item) {
+                $temp = array(
+                    'herb_id' => $herb_item['herb_id'],
+                    'name' => $herb_list[$herb_item['herb_id']]['name'],
+                    'num' => $herb_item['num'],
+                    'desc' => $herb_list[$herb_item['herb_id']]['desc']
+                );
+
+                $return[$user_case_id][] = $temp;
+            }
+        }
 
-        return array_column($herb, null, 'id');
+        return $return;
     }
 
     public function getUserCaseListCount($uid) {
@@ -246,12 +259,16 @@ class mUserCase extends mBase {
         $data = $this->getUserCaseList($uid, $page_num, $page_size);
 
         $prescribe_herb_arr = array();
-        foreach ($data['user_case'] as &$value) {
+        foreach ($data['user_case'] as $value) {
-            $value['prescribe_herb'] = json_decode($value['prescribe_herb'], true);
+            $prescribe_herb_arr[$value['id']] = json_decode($value['prescribe_herb'], true);
-            $prescribe_herb_arr[] = $value['prescribe_herb'];
         }
 
-        $data['user_case_herb'] = $this->getUserCaseHerb($prescribe_herb_arr);
+        //格式化医案开药详情
+        $prescribe_herb = $this->getUserCaseHerb($prescribe_herb_arr);
+
+        foreach ($data['user_case'] as &$value) {
+            $value['prescribe_herb'] = $prescribe_herb[$value['id']];
+        }
 
         return $this->formatUserCaseData($data);
     }
@@ -278,9 +295,7 @@ class mUserCase extends mBase {
 
             $herb_arr = array();
             foreach ($item['prescribe_herb'] as $herb) {
-                $herb_name = $data['user_case_herb'][$herb['herb_id']]['name'];
+                $herb_arr[] = $herb['name'] . $herb['num'] . "克";
-
-                $herb_arr[] = $herb_name . $herb['num'] . "克";
             }
             $herb_str = implode('、', $herb_arr);