From e0784816fbe6202a86c361d1277d7bd954f39a5a Mon Sep 17 00:00:00 2001
From: liqi <qiqiqiyoucili@163.com>
Date: Mon, 23 Dec 2024 12:11:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=9C=8D=E5=8A=A1=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/controllers/drug/ServerController.php | 29 +++++++++++++++------
 common/models/oldDb/Drug.php                |  8 ++++++
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/admin/controllers/drug/ServerController.php b/admin/controllers/drug/ServerController.php
index 071d958..ead7e58 100644
--- a/admin/controllers/drug/ServerController.php
+++ b/admin/controllers/drug/ServerController.php
@@ -8,8 +8,10 @@ use admin\models\forms\drug\ImportForm;
 use admin\models\forms\drug\ServerForm;
 use common\enums\UserRoleEnum;
 use common\helpers\FuncHelper;
+use common\models\newDb\SupplierModel;
 use common\models\oldDb\Drug;
 use moonland\phpexcel\Excel;
+use yii\db\Exception;
 use yii\web\UploadedFile;
 
 /**
@@ -34,7 +36,7 @@ class ServerController extends BaseAdminController
             $end_time = strtotime($get['end_time'] . ' ' . '23:59:59');
         }
 
-        $query = Drug::find()->alias('d')->orderBy(['id' => SORT_DESC]);
+        $query = Drug::find()->with(['supplier'])->alias('d')->orderBy(['id' => SORT_DESC]);
 
         $user = \Yii::$app->user->identity;
 
@@ -84,6 +86,8 @@ class ServerController extends BaseAdminController
                 'use_frequency' => 'drugUseFrequency.name', 'use_type' => 'drugUseType.name',
                 'use_time' => 'drugUseTime.name',
                 'is_forbid'=>'drugStoreRelationes.is_forbid',
+                'supplier',
+                'source_name' => 'supplier.name',
             ],
         ];
         return $this->create($query, $get);
@@ -108,6 +112,15 @@ class ServerController extends BaseAdminController
         $GranularForm->attributes=$post;
         return $GranularForm->save();
     }
+
+    /**
+     * 获取服务商的下拉框
+     * @return array|\yii\db\ActiveRecord[]
+     */
+    public function actionSupplierOption()
+    {
+        return SupplierModel::find()->select(['id', 'name'])->all();
+    }
     /**
      * @doc-name 删除产品服务包库
      * @doc-param int id 药品ID
@@ -151,13 +164,13 @@ class ServerController extends BaseAdminController
      */
     public function actionInfo()
     {
-        $get=\Yii::$app->request->get();
-        $this->requestValidate($get,[
-            ['id','required']
-        ]);
-        $GranularForm=new GranularForm();
-        $GranularForm->attributes=$get;
-        return $GranularForm->info();
+        $drug=  Drug::find()->with(['supplier'])->where([
+            'id'=>\Yii::$app->request->get('id'),
+            'type'=>5,
+        ])->asArray()->one();
+        if (!$drug) throw new Exception('该药品不存在');
+        $drug['source_name']=$drug['supplier']['name'];
+        return $drug;
     }
 
     /**
diff --git a/common/models/oldDb/Drug.php b/common/models/oldDb/Drug.php
index 7da44e0..41c90a7 100644
--- a/common/models/oldDb/Drug.php
+++ b/common/models/oldDb/Drug.php
@@ -2,6 +2,8 @@
 
 namespace common\models\oldDb;
 
+use common\models\newDb\SupplierModel;
+
 class Drug  extends \common\modelsgii\oldDb\Drug
 {
 
@@ -55,6 +57,12 @@ class Drug  extends \common\modelsgii\oldDb\Drug
         return $this->hasOne(DrugUseTime::class,['id'=>'time_id']);
     }
 
+    //关联使用时间
+    public function getSupplier()
+    {
+        return $this->hasOne(SupplierModel::class,['id'=>'source']);
+    }
+
     //关联煎法
     public function getDrugUseWay()
     {