From 86cd09cc93723768fcdb4aeed2c290ce7ce91883 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Thu, 28 Nov 2024 20:46:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86bug,=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E5=8F=91=E9=80=81=E5=88=A4=E6=96=AD=E6=80=A7?=
 =?UTF-8?q?=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Laravel/app/Http/Controllers/API/AspNetZhuanController.php | 7 +++++--
 Laravel/app/Http/Controllers/API/H5/OrderController.php    | 4 ++--
 Laravel/app/Http/Controllers/API/H5/UserController.php     | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/AspNetZhuanController.php b/Laravel/app/Http/Controllers/API/AspNetZhuanController.php
index 107e287..e734956 100644
--- a/Laravel/app/Http/Controllers/API/AspNetZhuanController.php
+++ b/Laravel/app/Http/Controllers/API/AspNetZhuanController.php
@@ -50,14 +50,17 @@ class AspNetZhuanController extends Controller
   }
 
   //发送短信
-  public static function SendMsg($r_yyid,$tel,$name,$time){
+  public static function SendMsg($r_yyid,$tel,$name,$time,$sex){
     if($r_yyid==1){
       $yyid=6;
     }
     if($r_yyid==4){
       $yyid=2;
     }
-    $content="时间:".$time.";科室:健康管理中心1区。温馨提醒:您的预约已成功，请在预约时间前 30 分钟达到科室，凭身份证原件开单。建议您体检前3天清淡饮食、禁烟酒";
+    $keshi="健康管理中心1区";
+    if($sex==1) $keshi="健康管理中心1区";
+    if($sex==2) $keshi="健康管理中心2区";
+    $content="时间:".$time.";科室:".$keshi."。温馨提醒:您的预约已成功，请在预约时间前 30 分钟达到科室，凭身份证原件开单。建议您体检前3天清淡饮食、禁烟酒";
     $url=self::$BaseUrl."/tuisong.aspx?yyid=".$yyid."&type=8&mobile=".$tel."&msg1=".urlencode($name)."&msg2=".urlencode($content);
     self::get($url,"短信发送");
 
diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php
index dfe5b5e..18b0126 100644
--- a/Laravel/app/Http/Controllers/API/H5/OrderController.php
+++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php
@@ -900,9 +900,9 @@ class OrderController extends Controller
       'appointment_back_info' => json_encode($appointment_info['data'][0], JSON_UNESCAPED_UNICODE)
     ]);
     $is_sendMsg = DB::table('configs')->where(['label' => '预约完成短信通知'])->first();
-    if (!!$is_sendMsg and $is_sendMsg->value == 1) {
+    if (!!$is_sendMsg and $is_sendMsg->value == 1 and strlen($cha->phone)>0) {
       $asp = new AspNetZhuanController();
-      $asp::SendMsg($cha->hospital_id, $cha->phone, $cha->name, $cha->appointment_date . ' ' . substr($cha->appointment_time, 0, 5));
+      $asp::SendMsg($cha->hospital_id, $cha->phone, $cha->name, $cha->appointment_date . ' ' . substr($cha->appointment_time, 0, 5),$cha->sex);
     }
     return ['status' => true, 'msg' => "完成"];
   }
diff --git a/Laravel/app/Http/Controllers/API/H5/UserController.php b/Laravel/app/Http/Controllers/API/H5/UserController.php
index 1c8a7dd..3590aca 100644
--- a/Laravel/app/Http/Controllers/API/H5/UserController.php
+++ b/Laravel/app/Http/Controllers/API/H5/UserController.php
@@ -24,7 +24,7 @@ class UserController extends Controller
       ]);
 
 
-      
+
           return \Yz::Return(true,"查询完成",['info'=>$res]);
 
     }else{
@@ -237,7 +237,7 @@ class UserController extends Controller
         $info = [
           'name' => isset($default_person->name) ? $default_person->name : null,
           'sex' => isset($default_person->sex) ? $default_person->sex : null,
-          'phone' => $default_person->phone,
+          'phone' => isset($default_person->phone) ? $default_person->phone:null,
           'id_number' => $default_person->id_number,
           'count' => $count,
           'openid' => $openid,