diff --git a/Laravel/app/Http/Controllers/API/AspNetZhuanController.php b/Laravel/app/Http/Controllers/API/AspNetZhuanController.php index ce5c336..39029d4 100644 --- a/Laravel/app/Http/Controllers/API/AspNetZhuanController.php +++ b/Laravel/app/Http/Controllers/API/AspNetZhuanController.php @@ -68,7 +68,7 @@ class AspNetZhuanController extends Controller if($sex==1) $sex_zh="先生"; if($sex==2) $sex_zh="女士"; //$content="时间:".$time.";科室:".$keshi."。温馨提醒:您的预约已成功,请在预约时间前 30 分钟达到科室,凭身份证原件开单。建议您体检前3天清淡饮食、禁烟酒"; - $content=$time." 健康体检。请提前10分钟凭身份证到".$yy_name.$keshi."自助机取号等候,迟到超时预约号作废,需重新排队。建议体检前3天清淡饮食、禁烟酒。体检当天禁食禁水,空腹6小时以上"; + $content=$time." 健康体检。请提前10分钟凭身份证到".$yy_name.$keshi."自助机取号。建议体检前3天清淡饮食、禁烟酒。体检当天禁食禁水,空腹6小时以上"; $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 34ca7b7..5919b49 100644 --- a/Laravel/app/Http/Controllers/API/H5/OrderController.php +++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php @@ -1069,6 +1069,9 @@ class OrderController extends Controller $sex=''; if($order_info->sex=='1') $sex='男'; if($order_info->sex=='2') $sex='女'; + $loginfo=DB::table('questions_log')->where(['personid' => $order_info->person_id])->orderBy('id','desc')->first(); + if(!$loginfo) return ['status' => false,'msg' => "未找到婚检问题记录"]; + $loginfo=json_decode($loginfo->content,true); $data_array = [ "action" => "1", "ghzid" => $person->ghzid, @@ -1084,6 +1087,22 @@ class OrderController extends Controller "YYSJ_B" => $order_info->appointment_time, "YYSJ_E" => $order_info->appointment_time, "YYSJ_BE" =>substr($order_info->appointment_time, 0, 5).'-'.substr($order_info->appointment_time, 0, 5), + "zy"=>$loginfo['职业'], + "whcd"=>$loginfo['文化程度'], + "gj"=>$loginfo['国籍'], + "mz"=>$loginfo['民族'], + "csd"=>$loginfo['出生地'], + "sBjSfz"=>$order_info->id_number, + "s_province"=>$loginfo['户籍地址省市区'][0]['text'], + "s_city"=>$loginfo['户籍地址省市区'][1]['text'], + "s_county"=>$loginfo['户籍地址省市区'][2]['text'], + "xxdz"=>$loginfo['现地址'], + "yzbm"=>"", + "dw"=>$loginfo['工作单位'], + "poxm"=>$loginfo['配偶姓名'], + "xb"=>$loginfo['血缘关系'], + "hjdz"=>$loginfo['户籍地址'], + ]; $aspnet=new AspNetZhuanController(); $res = $aspnet->HunjianHis($data_array);