From 38a308dd4711773f7bdc01dbada4ec0727ad2ffc Mon Sep 17 00:00:00 2001
From: liqi <qiqiqiyoucili@163.com>
Date: Tue, 24 Dec 2024 14:13:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=9C=8D=E5=8A=A1=E5=8C=85?=
 =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/PrescriptionController.php           | 43 ++++++++++++++++++-
 .../v1/controllers/ProductOrderController.php | 14 ++++--
 2 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/admin/controllers/base/PrescriptionController.php b/admin/controllers/base/PrescriptionController.php
index ef234fb..09e527c 100644
--- a/admin/controllers/base/PrescriptionController.php
+++ b/admin/controllers/base/PrescriptionController.php
@@ -170,7 +170,7 @@ class PrescriptionController extends BaseAdminController
             $data['total_price']=$recipe[0]['total_price'];
             $data['remark']=$recipe[0]['remark'];
 
-        } else {//西药
+        } elseif ($Prescription['prescription_type'] == 2) {//西药
             $repice = json_decode($Prescription['content'], true)['repice'];
 
             $data = [];
@@ -202,6 +202,47 @@ class PrescriptionController extends BaseAdminController
 
                 $data[] = $item;
             }
+        } else {
+            $repice = json_decode($Prescription['content'], true)['repice'];
+
+            $data = [];
+            try {
+                foreach ($repice as $v) {
+                    $item = [
+                        'id' => $v['id'],
+                        'content' => json_decode($v['content']),
+                        'drug_name' => json_decode($v['content'])->drug_name,
+                        'source' => json_decode($v['content'])->source,
+                        'function' => json_decode($v['content'])->function,
+                        'usage' => json_decode($v['content'])->usage,
+                        'specification' => json_decode($v['content'])->specification,
+                        'instruction' => json_decode($v['content'])->instruction,
+                        'image' => json_decode($v['content'])->image,
+                        'number' => $v['number'],
+                        'available_days' => $v['available_days'],
+                        'total_price' => $v['total_price'],
+                        'created_at' => $v['created_at'],
+                        'type_id' => json_decode($v['content'])->type_id,
+                        'time_id' => json_decode($v['content'])->time_id,
+                        'frequency_id' => json_decode($v['content'])->frequency_id,
+                        'unit_id' => json_decode($v['content'])->unit_id,
+                        'usetime' => '',
+                        'frequency' => '',
+                        'grain_number' => $v['grain_number'],
+                        'westUnit' => '',
+                        'types' => '参考说明书', //药的使用方式
+                    ];
+
+                    $data[] = $item;
+                }
+            } catch (\Exception $e) {
+                ds([
+                    'message' => $e->getMessage(),
+                    'line' => $e->getLine(),
+                    'file' => $e->getFile(),
+                    'trace' => $e->getTraceAsString()
+                ]);
+            }
         }
 
         $ProductOrder=ProductOrder::find()->where([
diff --git a/member/modules/v1/controllers/ProductOrderController.php b/member/modules/v1/controllers/ProductOrderController.php
index cb9da92..726d744 100644
--- a/member/modules/v1/controllers/ProductOrderController.php
+++ b/member/modules/v1/controllers/ProductOrderController.php
@@ -16,6 +16,7 @@ use common\models\oldDb\Prescription;
 use common\models\oldDb\ProductOrder;
 use common\models\oldDb\ProductOrderItems;
 use common\models\oldDb\Region;
+use common\models\oldDb\ServicePackageRepice;
 use common\models\oldDb\Store;
 use common\models\oldDb\SystemConfig;
 use common\models\oldDb\User;
@@ -180,9 +181,16 @@ class ProductOrderController extends BaseAppController
 
         if($prescription['wr_ids']){
             $wr_ids = explode(',', $prescription['wr_ids']);
-            $west = WestRepice::find()->select('content,number,total_price')->where([
-                'in', 'id', $wr_ids
-            ])->all();
+            if ($prescription['prescription_type'] === 5) {
+
+                $west = ServicePackageRepice::find()->select('content,number,total_price')->where([
+                    'in', 'id', $wr_ids
+                ])->all();
+            } else {
+                $west = WestRepice::find()->select('content,number,total_price')->where([
+                    'in', 'id', $wr_ids
+                ])->all();
+            }
             foreach ($west as $value) {
                 $value['content']=Json::decode($value['content']);
             }