From 290b1dbcc0834029620b8b4da54699f61bd9481f Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Mon, 7 Oct 2024 21:43:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/API/Admin/YeWu/ItemController.php |  1 +
 .../app/Http/Controllers/API/H5/ComboController.php    | 10 ++++++----
 Laravel/app/Http/Controllers/API/H5/HomeController.php |  2 +-
 .../app/Http/Controllers/API/Web/ItemController.php    |  4 +++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/ItemController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/ItemController.php
index 9dce4bd..331ec5a 100644
--- a/Laravel/app/Http/Controllers/API/Admin/YeWu/ItemController.php
+++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/ItemController.php
@@ -51,6 +51,7 @@ class ItemController extends Controller
           'hospital_id'=>$hospital_id,
           'item_id'=>$item['Id'],
           'sex'=>$sex,
+          'can_qian_hou'=>$item['餐前餐后'],
           'name'=>$item['名称'],
           'pinyin'=>$item['拼音'],
           'price'=>$item['价格'],
diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php
index 6473625..31a6f9f 100644
--- a/Laravel/app/Http/Controllers/API/H5/ComboController.php
+++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php
@@ -331,10 +331,12 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4)
       'original_price' =>number_format($all_original_price, 2, '.', '') ,//总原价
       'pay_item_count' => $pay_item_count,//需要付费的项目数量
       'lose_price'=>number_format($lose_price, 2, '.', ''),//剩余的不用就会浪费的金额
-      'nmr_list' => [[
-        'item_id' => "1",
-        "name" => "磁共振平扫（腰椎）"
-      ]]//核磁项目列表
+      'nmr_list' => [
+//        [
+//        'item_id' => "1",
+//        "name" => "磁共振平扫（腰椎）"
+//      ]
+      ]//核磁项目列表
     ];
     return \Yz::Return(true, "查询成功", $data);
   }
diff --git a/Laravel/app/Http/Controllers/API/H5/HomeController.php b/Laravel/app/Http/Controllers/API/H5/HomeController.php
index 238ca8e..d992408 100644
--- a/Laravel/app/Http/Controllers/API/H5/HomeController.php
+++ b/Laravel/app/Http/Controllers/API/H5/HomeController.php
@@ -120,7 +120,7 @@ class HomeController extends Controller
       [
         'message' => '暂未开放',
         'name' => '检前健康评估',
-        'url' => '/pages/main/order/order',
+        'url' => '',
         'logo' => '/assets/h5/zhuyishixiang.png'
       ],
       [
diff --git a/Laravel/app/Http/Controllers/API/Web/ItemController.php b/Laravel/app/Http/Controllers/API/Web/ItemController.php
index 08cbb91..a8692c4 100644
--- a/Laravel/app/Http/Controllers/API/Web/ItemController.php
+++ b/Laravel/app/Http/Controllers/API/Web/ItemController.php
@@ -59,7 +59,9 @@ class ItemController extends Controller
           'price' =>$item->price,
           'original_price'=>$item->original_price,
           'pinyin' => $item->pinyin,
-          'desc'=>$item->jianjie
+          'desc'=>$item->jianjie,
+          'sex'=>$item->sex,
+          'can_qian_hou'=>$item->can_qian_hou
         ];