From c6cc709d0133dcd6bb81d8c27facdb7c47a559be Mon Sep 17 00:00:00 2001
From: pengda <10266652509@qq.com>
Date: Mon, 9 Sep 2024 12:10:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E6=A1=88=E7=9B=B8=E5=85=B3=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=86=8D=E6=98=A0=E5=B0=84?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E5=A4=84=E7=90=86=E5=A5=BD=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 model/mUserCase.php | 41 ++++++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/model/mUserCase.php b/model/mUserCase.php
index cb37338..a8c1b88 100644
--- a/model/mUserCase.php
+++ b/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;
-
-        $user_case_herb = $this->getUserCaseHerb(array($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']];
 
         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) {
-            $value['prescribe_herb'] = json_decode($value['prescribe_herb'], true);
-            $prescribe_herb_arr[] = $value['prescribe_herb'];
+        foreach ($data['user_case'] as $value) {
+            $prescribe_herb_arr[$value['id']] = json_decode($value['prescribe_herb'], true);
         }
 
-        $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);