From 0d211759665a3c79cb5935116c35caff7aab86f7 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Fri, 27 Sep 2024 11:54:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/API/Admin/YeWu/ReportController.php   | 2 ++
 Laravel/app/Http/Controllers/API/H5/ComboController.php    | 2 +-
 Laravel/app/Http/Controllers/API/H5/OrderController.php    | 2 ++
 Laravel/app/Http/Controllers/API/H5/PersonController.php   | 7 +++++++
 Laravel/app/Http/Controllers/API/H5/UserController.php     | 1 +
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/ReportController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/ReportController.php
index 0feca08..fc21180 100644
--- a/Laravel/app/Http/Controllers/API/Admin/YeWu/ReportController.php
+++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/ReportController.php
@@ -9,6 +9,8 @@ use Illuminate\Support\Facades\DB;
 
 class ReportController extends Controller
 {
+
+  //获取思信那边的报告信息，推送或者拉取
   public function ReportInfo()
   {
     $type = "la";  //la拉取 //tui 推送
diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php
index 4e1c38c..476e6a6 100644
--- a/Laravel/app/Http/Controllers/API/H5/ComboController.php
+++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php
@@ -271,7 +271,7 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4)
         if (!isset($groupedData[$keshiName])) {
           $groupedData[$keshiName] = [];
         }
-        $groupedData[$keshiName][] = ['desc' => $item->jianjie, 'name' => $item->name];
+        $groupedData[$keshiName][] = ['desc' => $item->jianjie, 'name' => $item->name,'price'=>$item->price];
       }
       $items_info['price'] = $price;
       $items_info['original_price'] = $items_original_price;
diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php
index de65d47..63ffde2 100644
--- a/Laravel/app/Http/Controllers/API/H5/OrderController.php
+++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php
@@ -56,6 +56,7 @@ class OrderController extends Controller
     $item_ids = request('item_ids');//自选item的ids
     $plan_id = request('plan_id');//号源id
     $plan_nmr_id = request('plan_nmr_id');//核磁号源id
+    $doctor = request('doctor');//预约的医生名字
 
     if (!isset($hospital_id)) return \Yz::echoError1('医院id不能为空');
     if (!isset($openid)) return \Yz::echoError1('openid不能为空');
@@ -231,6 +232,7 @@ class OrderController extends Controller
       'plan_number' => $plan->plan_number,
       'combo_id' => $combo_id,
       'hospital_id' => $hospital_id,
+      'doctor' => $doctor,
       'phone' => $person->phone,
       'sex' => $person->sex,
       'birthday' => $person->birthday,
diff --git a/Laravel/app/Http/Controllers/API/H5/PersonController.php b/Laravel/app/Http/Controllers/API/H5/PersonController.php
index 881b35c..192ba73 100644
--- a/Laravel/app/Http/Controllers/API/H5/PersonController.php
+++ b/Laravel/app/Http/Controllers/API/H5/PersonController.php
@@ -67,6 +67,13 @@ class PersonController extends Controller
       '证件号码' => $id_number
     ];
     $res = self::group_info($hospital_id, $data);
+    $dbinfo=DB::table('web_user_person')->where(['phone'=>$phone,'id_number'=>$id_number])->first();
+    $res['sex']=null;
+    $res['married']=null;
+    if(!!$dbinfo){
+      $res['sex']=$dbinfo->sex;
+      $res['married']=$dbinfo->married ;
+    }
     return \Yz::Return(true,"查询完成",['unit'=>$res]);
   }
   //获取团检套餐
diff --git a/Laravel/app/Http/Controllers/API/H5/UserController.php b/Laravel/app/Http/Controllers/API/H5/UserController.php
index 9e348f5..931be3c 100644
--- a/Laravel/app/Http/Controllers/API/H5/UserController.php
+++ b/Laravel/app/Http/Controllers/API/H5/UserController.php
@@ -41,6 +41,7 @@ class UserController extends Controller
          'count' => $count,
          'openid' => $openid,
          'person_id' => $default_person->id,
+         'married'=>$default_person->married
        ];
        return \Yz::Return(true, '获取成功', [
          'info' => $info