Merge branch 'master' of http://git.9026.com/swdz-WangHaijun/BaoMa

app/Http/Controllers/Api/V1/PatientController.php

@@ -25,7 +25,7 @@ class PatientController extends AuthController
             'info' => 'max:1000',
             'card_type' => 'in:0,1,2',
             'card_number' => 'max:50',
-            'email' => 'required|email',
+            'email' => 'email',
             'phone' => 'required',
             'guardian_name' => 'required',
             'address' => 'required',
@@ -53,7 +53,7 @@ class PatientController extends AuthController
             'info' => 'max:1000',
             'card_type' => 'in:0,1,2',
             'card_number' => 'max:50',
-            'email' => 'required|email',
+            'email' => 'email',
             'phone' => 'required',
             'guardian_name' => 'required',
             'address' => 'required',

app/Models/Docter.php

@@ -13,7 +13,7 @@ class Docter extends BaseModel
     protected $casts = [
         'label' => 'json',
     ];
-    protected $appends = ['is_collect'];
+    protected $appends = ['is_collect', 'label_texts'];
 
     public function office()
     {
@@ -64,4 +64,14 @@ class Docter extends BaseModel
     {
         return $this->hasOne(Serviceapplys::class);
     }
+
+    public function getLabelTextsAttribute()
+    {
+        $data = [];
+        if (!empty($this->label)) {
+            $data = DocterLabel::select(['name'])->whereIn('id', $this->label)->where('status', 1)->get()->toArray();
+        }
+
+        return $data;
+    }
 }