From a125dc008f99cca7d248e8c063317be63b3b17ae Mon Sep 17 00:00:00 2001
From: liqi <qiqiqiyoucili@163.com>
Date: Thu, 19 Dec 2024 19:32:37 +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

---
 .../v1/controllers/PrescriptionController.php      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/service/modules/v1/controllers/PrescriptionController.php b/service/modules/v1/controllers/PrescriptionController.php
index 96765c3..670a312 100644
--- a/service/modules/v1/controllers/PrescriptionController.php
+++ b/service/modules/v1/controllers/PrescriptionController.php
@@ -2135,7 +2135,7 @@ class PrescriptionController extends BaseAppController
             ])->joinWith([
                 'drug d' => function($q){
                     $q->andWhere([
-                        'in','d.type',[5]
+                        'in','d.type', [2,4]
                     ]);
                 }
             ])->joinWith([
@@ -2170,7 +2170,7 @@ class PrescriptionController extends BaseAppController
             }
 
             $unCollect = Drug::find()->alias('d')->select('d.*')->where([
-                'in','d.type', [5]
+                'in','d.type',  [2,4]
             ])->joinWith(['drugStoreDrug dsd' => function($q){
                 $q->andWhere(['dsd.status' => 2]);
             }])->joinWith(['drugStoreRelation dsr' => function ($q) use ($store_id){
@@ -2189,7 +2189,7 @@ class PrescriptionController extends BaseAppController
         }
         //搜索
         $allDrug = Drug::find()->alias('d')->select('d.*')->where([
-            'in','d.type', [5]
+            'in','d.type',  [2,4]
         ])->andWhere([
             'or',
             ['like', 'd.drug_name', '%' . $name . "%", false],
@@ -2222,7 +2222,7 @@ class PrescriptionController extends BaseAppController
         ])->joinWith([
             'drug d' => function ($q){
                 $q->andWhere([
-                    'in','d.type', [5]
+                    'in','d.type',  [2,4]
                 ]);
             }
         ])->joinWith([
@@ -2244,7 +2244,7 @@ class PrescriptionController extends BaseAppController
         $no_collect = Drug::find()->alias('d')->select('d.*')->where([
             'in', 'd.id', $ids
         ])->andWhere([
-            'in','d.type', [5]
+            'in','d.type',  [2,4]
         ])->joinWith(['drugStoreDrug dsd' => function($q){
             $q->andWhere(['dsd.status' => 2]);
         }])->joinWith(['drugStoreRelation dsr' => function ($q) use ($store_id){
@@ -2262,7 +2262,7 @@ class PrescriptionController extends BaseAppController
         $collected = Drug::find()->alias('d')->select('d.*')->where([
             'in', 'd.id', $is_collect
         ])->andWhere([
-            'in','d.type', [5]
+            'in','d.type',  [2,4]
         ])->joinWith(['drugStoreDrug dsd' => function($q){
             $q->andWhere(['dsd.status' => 2]);
         }])->joinWith(['drugStoreRelation dsr' => function ($q) use ($store_id){
@@ -2301,7 +2301,7 @@ class PrescriptionController extends BaseAppController
         ])->joinWith([
             'drug d' => function ($q) use ($name){
                 $q->andWhere([
-                    'in','d.type',[5]
+                    'in','d.type', [2,4]
                 ]);
                 if($name){
                     $q->andWhere([