From 2bab943e0add55c5e1c542ef22f436beffa335e2 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Fri, 15 Nov 2024 21:37:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E6=A3=80=E5=BC=95=E5=AF=BC=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=E5=9B=A2=E6=A3=80=E5=A4=9A=E9=80=89=E4=B8=80bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Laravel/app/Http/Controllers/API/H5/ComboController.php  | 2 +-
 Laravel/app/Http/Controllers/API/H5/DoctorController.php | 1 +
 h5/pages/user/pick/pick.vue                              | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php
index 3285c36..071adba 100644
--- a/Laravel/app/Http/Controllers/API/H5/ComboController.php
+++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php
@@ -436,7 +436,7 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4)
       //如果有多选一项目
       //构建多选一数据
       $Nx1_arrInfo=[];
-      if(isset($duo_xuan_yi) and !empty($duo_xuan_yi)){
+      if(isset($duo_xuan_yi) and !empty($duo_xuan_yi) and (!isset($combo_id) or $combo_id == 0)){
         foreach ($duo_xuan_yi as $r_k=>$r_v){
           $Nx1_arrInfo[]=[
             'id' => $r_v['item_id'],
diff --git a/Laravel/app/Http/Controllers/API/H5/DoctorController.php b/Laravel/app/Http/Controllers/API/H5/DoctorController.php
index 9c25ad6..5e53289 100644
--- a/Laravel/app/Http/Controllers/API/H5/DoctorController.php
+++ b/Laravel/app/Http/Controllers/API/H5/DoctorController.php
@@ -51,6 +51,7 @@ class DoctorController extends Controller
       "data" => $datesArray,
       "action" => "1"
     ]);
+  //  return \Yz::Return(true,"",$res);
     $list = [];
     if ($res['code'] == '200' && count($res['yisheng']) != 0) {
       foreach ($res['yisheng'] as $key => $value) {
diff --git a/h5/pages/user/pick/pick.vue b/h5/pages/user/pick/pick.vue
index e216272..f8cc374 100644
--- a/h5/pages/user/pick/pick.vue
+++ b/h5/pages/user/pick/pick.vue
@@ -91,7 +91,7 @@ import DraggableButton from "@/pages/components/goHome.vue";
 						<view class="person_name_wrapper">{{ i.name }}</view>
 						<view class="person_sex_wrapper">{{ i.sex === 1 ? "男" : "女" }}性</view>
 					</view>
-					<view class="person_idnumber_wrapper">{{ i.id_number }}</view>
+					<view class="person_idnumber_wrapper">{{ i.birthday }}</view>
 				</view>
 				<view v-if="!!i.relation" class="person_type_wrapper">{{
           i.relation