From 7c9e3e8094e8cb6d8c26043be2c2da0321bc515f Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Thu, 23 Mar 2023 14:34:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=81=8C=E4=B8=9A=E3=80=81?=
 =?UTF-8?q?=E6=B0=91=E6=97=8F=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/BasicDataController.php | 24 ++++++++++++++++++---
 app/Services/BasicDataService.php      | 30 ++++++++++++++++++++++++++
 config/routes.php                      |  3 +++
 3 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/app/Controller/BasicDataController.php b/app/Controller/BasicDataController.php
index c4af027..10f0bc4 100644
--- a/app/Controller/BasicDataController.php
+++ b/app/Controller/BasicDataController.php
@@ -2,6 +2,7 @@
 
 namespace App\Controller;
 
+use App\Model\BasicNation;
 use App\Request\BasicDataRequest;
 use App\Request\DiseaseRequest;
 use App\Services\BasicDataService;
@@ -146,8 +147,25 @@ class BasicDataController extends AbstractController
         return $this->response->json($data);
     }
 
-    public function getNation(){
-        $params = array();
-//        $basic_nation = BasicNation::
+    /**
+     * 获取民族数据
+     * @return ResponseInterface
+     */
+    public function getNation(): ResponseInterface
+    {
+        $BasicDataService = new BasicDataService();
+        $data = $BasicDataService->getNation();
+        return $this->response->json($data);
+    }
+
+    /**
+     * 获取职业数据
+     * @return ResponseInterface
+     */
+    public function getJob(): ResponseInterface
+    {
+        $BasicDataService = new BasicDataService();
+        $data = $BasicDataService->getJob();
+        return $this->response->json($data);
     }
 }
\ No newline at end of file
diff --git a/app/Services/BasicDataService.php b/app/Services/BasicDataService.php
index 678ca08..8222681 100644
--- a/app/Services/BasicDataService.php
+++ b/app/Services/BasicDataService.php
@@ -3,6 +3,8 @@
 namespace App\Services;
 
 use App\Model\BasicBank;
+use App\Model\BasicJob;
+use App\Model\BasicNation;
 use App\Model\DiseaseClass;
 use App\Model\DiseaseClassExpertise;
 use App\Model\DiseaseClassIcd;
@@ -263,4 +265,32 @@ class BasicDataService extends BaseService
         return success($disease_class_icd->toArray());
 
     }
+
+    /**
+     * 获取民族数据
+     * @return array
+     */
+    public function getNation(): array
+    {
+        $params = array();
+        $basic_nation = BasicNation::getList($params);
+        if (empty($basic_nation)){
+            return success();
+        }
+        return success($basic_nation->toArray());
+    }
+
+    /**
+     * 获取职业数据
+     * @return array
+     */
+    public function getJob(): array
+    {
+        $params = array();
+        $basic_job = BasicJob::getList($params);
+        if (empty($basic_job)){
+            return success();
+        }
+        return success($basic_job->toArray());
+    }
 }
\ No newline at end of file
diff --git a/config/routes.php b/config/routes.php
index 1c1b761..700df12 100644
--- a/config/routes.php
+++ b/config/routes.php
@@ -485,6 +485,9 @@ Router::addGroup('/basic', function () {
 
     // 获取民族数据
     Router::get('/nation', [BasicDataController::class, 'getNation']);
+
+    // 获取职业数据
+    Router::get('/job', [BasicDataController::class, 'getJob']);
 });
 
 // 获取医生评价