update

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

@@ -182,15 +182,20 @@ class DocterController extends AuthController
 
     public function timePeriodList()
     {
+        $req = request()->post();
+        $this->validate(request(), [
+            'organization_id' => 'required|integer',
+        ]);
+
         $data = [];
-        $data['list'] = TimePeriod::select(['id', 'start_time_period', 'end_time_period'])->get();
+        $data['list'] = TimePeriod::select(['id', 'start_time_period', 'end_time_period'])->where('org_id', $req['organization_id'])->get()->toArray();
 
         for ($i = 0; $i < 7; $i++) {
             if ($i > 0) {
-                $data['dates'][] = date('m-d', strtotime("+$i days"));
+                $data['dates'][] = date('Y-m-d', strtotime("+$i days"));
             }
             else {
-                $data['dates'][] = date('m-d');
+                $data['dates'][] = date('Y-m-d');
             }
         }
 

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

@@ -16,12 +16,13 @@ class NurseController extends AuthController
     {
         $req = request()->post();
         $this->validate(request(), [
+            'organization_id' => 'required|integer',
             'name' => 'max:255',
             'free_type' => 'in:0,1,2',
             'sort_type' => 'in:0,1,2'
         ]);
 
-        $builder = Nurse::select(['id', 'price', 'name', 'remark']);
+        $builder = Nurse::select(['id', 'org_id', 'price', 'name', 'remark']);
         if (!empty($req['free_type'])) {
             if ($req['free_type'] == 1) {
                 $builder->where('price', 0);
@@ -33,6 +34,9 @@ class NurseController extends AuthController
         if (!empty($req['name'])) {
             $builder->where('name', 'like', '%'.$req['name'].'%');
         }
+        if (!empty($req['organization_id'])) {
+            $builder->where('org_id', $req['organization_id']);
+        }
         if (!empty($req['sort_type'])) {
             if ($req['sort_type'] == 1) {
                 $builder->orderBy('price', 'asc');

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

@@ -16,24 +16,28 @@ class VaccineController extends AuthController
     {
         $req = request()->post();
         $this->validate(request(), [
+            'organization_id' => 'required|integer',
             'name' => 'max:50',
             'type' => 'in:0,1,2',
             'sort_type' => 'in:0,1,2',
         ]);
 
-        $builder = Vaccine::select(['id', 'type', 'price', 'name', 'remark', 'supplier']);
+        $builder = Vaccine::join('organization_vaccines', 'organization_vaccines.vaccine_id', '=', 'vaccines.id')->select(['vaccines.id', 'vaccines.type', 'vaccines.price', 'vaccines.name', 'vaccines.remark', 'vaccines.supplier', 'organization_vaccines.stock']);
         if (!empty($req['type'])) {
-            $builder->where('type', $req['type']);
+            $builder->where('vacciness.type', $req['type']);
         }
         if (!empty($req['name'])) {
-            $builder->where('name', 'like', '%'.$req['name'].'%');
+            $builder->where('vacciness.name', 'like', '%'.$req['name'].'%');
+        }
+        if (!empty($req['organization_id'])) {
+            $builder->where('organization_vaccines.org_id', $req['organization_id']);
         }
         if (!empty($req['sort_type'])) {
             if ($req['sort_type'] == 1) {
-                $builder->orderBy('price', 'asc');
+                $builder->orderBy('vaccines.price', 'asc');
             }
             elseif ($req['sort_type'] == 2) {
-                $builder->orderBy('price', 'desc');
+                $builder->orderBy('vaccines.price', 'desc');
             }
         }