From c9911983a7aa6d99875e5557c67aa45710b80d59 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Sun, 22 Dec 2024 09:55:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=A9=9A=E6=A3=80=E5=A5=97?=
 =?UTF-8?q?=E9=A4=90?=
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 | 2 +-
 Laravel/app/Http/Controllers/API/H5/OrderController.php  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php
index a07d1cf..9f67f37 100644
--- a/Laravel/app/Http/Controllers/API/H5/ComboController.php
+++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php
@@ -76,6 +76,8 @@ class ComboController extends Controller
     if(isset($checkup_type_id)){
       $sql = $sql . "  and a.checkup_type_id=? ";
       $canshu[] = $checkup_type_id;
+    }else{
+      $sql = $sql . "  and a.checkup_type_id<>4 ";
     }
     if (isset($combo_type)) {
       $sql = $sql . "  and a.type_id=? ";
diff --git a/Laravel/app/Http/Controllers/API/H5/DoctorController.php b/Laravel/app/Http/Controllers/API/H5/DoctorController.php
index 0588ff3..8c8d3d2 100644
--- a/Laravel/app/Http/Controllers/API/H5/DoctorController.php
+++ b/Laravel/app/Http/Controllers/API/H5/DoctorController.php
@@ -56,7 +56,7 @@ class DoctorController extends Controller
       "data" => $datesArray,
       "action" => "1"
     ]);
-   // return \Yz::Return(true,"",['data'=>$res]);
+    //return \Yz::Return(true,"",['data'=>$res]);
     $list = [];
     $keshi=[
       'A0030090'=>'内科',
diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php
index 62c8100..02edc84 100644
--- a/Laravel/app/Http/Controllers/API/H5/OrderController.php
+++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php
@@ -928,7 +928,7 @@ class OrderController extends Controller
       'appointment_number' => $create_appointment['data'][0][0],
       'appointment_back_info' => json_encode($appointment_info['data'][0], JSON_UNESCAPED_UNICODE),
       'wx_day1_sendmsg_status'=>$wx_day1_sendmsg_status,
-      'wx_day1_sendmsg_time'=>$wx_day1_sendmsg_time,
+      'wx_day1_sendmsg_time'=>$wx_day1_sendmsg_time<>''?$wx_day1_sendmsg_time:null,
     ]);
     $is_sendMsg = DB::table('configs')->where(['label' => '预约完成短信通知'])->first();
     if (!!$is_sendMsg and $is_sendMsg->value == 1 and strlen($cha->phone)>0) {