From c149e34d3c44f278e58dc1b5746596181fbb5354 Mon Sep 17 00:00:00 2001
From: lq <workerqi@163.com>
Date: Fri, 15 Nov 2024 13:35:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=B1=E8=AF=8A=E4=BA=BA?=
 =?UTF-8?q?=E5=81=A5=E5=BA=B7=E4=BF=A1=E6=81=AF=E9=BB=98=E8=AE=A4=E5=80=BC?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E5=8C=BB=E7=94=9F=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/controllers/doctor/DoctorController.php |  4 ++-
 .../v1/controllers/PatientController.php      | 26 -------------------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/admin/controllers/doctor/DoctorController.php b/admin/controllers/doctor/DoctorController.php
index 01a78d5..12c9169 100644
--- a/admin/controllers/doctor/DoctorController.php
+++ b/admin/controllers/doctor/DoctorController.php
@@ -162,7 +162,9 @@ class DoctorController extends BaseAdminController
                     return StoreDoctor::find()->select(['store_id'])->where([
                         'su_id' => $m->id,
                         'is_delete' => 0
-                    ])->with(['store'])->asArray()->all();
+                    ])->with(['store' => function ($query) {
+                        return $query->select(['name', 'id']);
+                    }])->asArray()->all();
                 }
             ],
             DoctorService::class => [
diff --git a/member/modules/v1/controllers/PatientController.php b/member/modules/v1/controllers/PatientController.php
index a260bb3..ab0e2ae 100644
--- a/member/modules/v1/controllers/PatientController.php
+++ b/member/modules/v1/controllers/PatientController.php
@@ -188,32 +188,6 @@ class PatientController extends BaseAppController
         $info['person_history'] = !empty($info['person_history']) ? explode(',', $info['person_history']) : [];
         $info['allergic_history'] = !empty($info['allergic_history']) ? explode(',', $info['allergic_history']) : [];
 
-        return $info;
-        if (!empty($info['family_history'])) {
-            foreach (explode(',', $info['family_history']) as $v) {
-                $info['family_history'][] = [
-                    'name' => $v,
-                    'checked' => true
-                ];
-            }
-        }
-        if (!empty($info['person_history'])) {
-            foreach (explode(',', $info['person_history']) as $v) {
-                $info['person_history'][] = [
-                    'name' => $v,
-                    'checked' => true
-                ];
-            }
-        }
-        if (!empty($info['allergic_history'])) {
-            foreach (explode(',', $info['allergic_history']) as $v) {
-                $info['allergic_history'][] = [
-                    'name' => $v,
-                    'checked' => true
-                ];
-            }
-        }
-
         return $info;
     }
 }
\ No newline at end of file