diff --git a/digital_doctor/application/api/controller/H5userbaseinfo.php b/digital_doctor/application/api/controller/H5userbaseinfo.php deleted file mode 100644 index 45d5761..0000000 --- a/digital_doctor/application/api/controller/H5userbaseinfo.php +++ /dev/null @@ -1,110 +0,0 @@ -input()]); - $api_desc = '新增h5问诊用户基本信息'; - Db::startTrans(); - try { - - $doctor = input('doctor'); - if(empty($doctor)){ - return json(Tools::set_fail('参数错误.0')); - } - - $name = input('name'); - if(empty($name)){ - return json(Tools::set_fail('参数错误.1')); - } - - $gender = input('gender'); - $age = input('age'); - $edu = input('edu'); - $career_year = input('career_year'); - $power = input('power'); - $satisfaction = input('satisfaction'); - $old_career_year = input('old_career_year'); - $support = input('support'); - $marriage = input('marriage'); - $live = input('live'); - $home = input('home'); - $address = input('address'); - $phone = input('phone'); - if(empty($phone)){ - return json(Tools::set_fail('参数错误.14')); - } - - $wechat_no = input('wechat_no'); - - $data = [ - 'doctor'=>$doctor?:'', - 'name'=>$name?:'', - 'gender'=>$gender?:'', - 'age'=>$age?:'', - 'edu'=>$edu?:'', - 'career_year'=>$career_year?:'', - 'power'=>$power?:'', - 'satisfaction'=>$satisfaction?:'', - 'old_career_year'=>$old_career_year?:'', - 'support'=>$support?:'', - 'marriage'=>$marriage?:'', - 'live'=>$live?:'', - 'home'=>$home?:'', - 'address'=>$address?:'', - 'phone'=>$phone?:'', - 'wechat_no'=>$wechat_no?:'', - ]; - - - $dataid = Db::table(TabConf::$fa_h5userbaseinfo)->insertGetId($data); - - $this->operateLog('新增h5问诊用户基本信息',api_user_info('id')); - Db::commit(); - return json(Tools::set_ok('ok',$dataid)); - }catch (\Exception $e){ - Db::rollback(); - Tools::log_to_write_txt([ - 'error'=>'新增h5问诊用户基本信息.异常.'.$e->getMessage(), - 'input'=>input(), - 'error_info'=>$e->getTraceAsString() - ]); - return json(Tools::set_fail()); - } - } - - -} \ No newline at end of file diff --git a/digital_doctor/application/api/controller/Hdrmedicalreport.php b/digital_doctor/application/api/controller/Hdrmedicalreport.php deleted file mode 100644 index 74079f9..0000000 --- a/digital_doctor/application/api/controller/Hdrmedicalreport.php +++ /dev/null @@ -1,87 +0,0 @@ -input()]); - $api_desc = '新增问诊报告存档(疼痛科、听译、h5问诊统一存放)(一个基本信息对应一个报告)'; - Db::startTrans(); - try { - - $userbaseid = input('userbaseid'); - if(empty($userbaseid)){ - return json(Tools::set_fail('参数错误.0')); - } - - $doctor = input('doctor'); - if(empty($doctor)){ - return json(Tools::set_fail('参数错误.1')); - } - - $username = input('username'); - $report_content = input('report_content'); - $name = input('name'); - if(empty($name)){ - return json(Tools::set_fail('参数错误.4')); - } - - $phone = input('phone'); - if(empty($phone)){ - return json(Tools::set_fail('参数错误.5')); - } - - $gender = input('gender'); - - $data = [ - 'userbaseid'=>$userbaseid?:'', - 'doctor'=>$doctor?:'', - 'username'=>$username?:'', - 'report_content'=>$report_content?:'', - 'name'=>$name?:'', - 'phone'=>$phone?:'', - 'gender'=>$gender?:'', - ]; - - - $dataid = Db::table(TabConf::$fa_hdrmedical_report)->insertGetId($data); - - $this->operateLog('新增问诊报告存档(疼痛科、听译、h5问诊统一存放)(一个基本信息对应一个报告)',api_user_info('id')); - Db::commit(); - return json(Tools::set_ok('ok',$dataid)); - }catch (\Exception $e){ - Db::rollback(); - Tools::log_to_write_txt([ - 'error'=>'新增问诊报告存档(疼痛科、听译、h5问诊统一存放)(一个基本信息对应一个报告).异常.'.$e->getMessage(), - 'input'=>input(), - 'error_info'=>$e->getTraceAsString() - ]); - return json(Tools::set_fail()); - } - } - - -} \ No newline at end of file diff --git a/digital_doctor/application/api/controller/Hdrregister.php b/digital_doctor/application/api/controller/Hdrregister.php index 8e127ac..8eef077 100644 --- a/digital_doctor/application/api/controller/Hdrregister.php +++ b/digital_doctor/application/api/controller/Hdrregister.php @@ -1,21 +1,21 @@ -input()]); - $api_desc = '新增患者挂号列表(可重复挂号)'; - Db::startTrans(); - try { - - $date = input('date'); - if(empty($date)){ - return json(Tools::set_fail('参数错误.0')); - } - - $name = input('name'); - if(empty($name)){ - return json(Tools::set_fail('参数错误.1')); - } - - $doctor_name = input('doctor_name'); - if(empty($doctor_name)){ - return json(Tools::set_fail('参数错误.2')); - } - - $age = input('age'); - if(empty($age)){ - return json(Tools::set_fail('参数错误.3')); - } - - $gender = input('gender'); - if(empty($gender)){ - return json(Tools::set_fail('参数错误.4')); - } - - $phone = input('phone'); - if(empty($phone)){ - return json(Tools::set_fail('参数错误.5')); - } - - $qa_type = input('qa_type'); - $say_ticket = input('say_ticket'); - if(empty($say_ticket)){ - return json(Tools::set_fail('参数错误.7')); - } - - - $data = [ - 'date'=>$date?:'', - 'name'=>$name?:'', - 'doctor_name'=>$doctor_name?:'', - 'age'=>$age?:'', - 'gender'=>$gender?:'', - 'phone'=>$phone?:'', - 'qa_type'=>$qa_type?:'', - 'say_ticket'=>$say_ticket?:'', - ]; - - - $dataid = Db::table(TabConf::$fa_hdrregister)->insertGetId($data); - - $this->operateLog('新增患者挂号列表(可重复挂号)',api_user_info('id')); - Db::commit(); - return json(Tools::set_ok('ok',$dataid)); - }catch (\Exception $e){ - Db::rollback(); - Tools::log_to_write_txt([ - 'error'=>'新增患者挂号列表(可重复挂号).异常.'.$e->getMessage(), - 'input'=>input(), - 'error_info'=>$e->getTraceAsString() - ]); - return json(Tools::set_fail()); - } - } - - /** - * desc:获取患者挂号列表(可重复挂号) - * - * api/Hdrregister/getHdrregisterList - * + * ticket 对话凭据(便于查询) + * api/Hdrregister/addHdrregister + */ + function addHdrregister(){ + Tools::log_to_write_txt(['新增患者挂号列表(可重复挂号)'=>input()]); + $api_desc = '新增患者挂号列表(可重复挂号)'; + Db::startTrans(); + try { + + $date = input('date'); + if(empty($date)){ + return json(Tools::set_fail('参数错误.0')); + } + + $name = input('name'); + if(empty($name)){ + return json(Tools::set_fail('参数错误.1')); + } + + $doctor_name = input('doctor_name'); + if(empty($doctor_name)){ + return json(Tools::set_fail('参数错误.2')); + } + + $age = input('age'); + if(empty($age)){ + return json(Tools::set_fail('参数错误.3')); + } + + $gender = input('gender'); + if(empty($gender)){ + return json(Tools::set_fail('参数错误.4')); + } + + $phone = input('phone'); + if(empty($phone)){ + return json(Tools::set_fail('参数错误.5')); + } + + $qa_type = input('qa_type'); + $ticket = input('ticket'); + if(empty($ticket)){ + return json(Tools::set_fail('参数错误.7')); + } + + + $data = [ + 'date'=>$date?:'', + 'name'=>$name?:'', + 'doctor_name'=>$doctor_name?:'', + 'age'=>$age?:'', + 'gender'=>$gender?:'', + 'phone'=>$phone?:'', + 'qa_type'=>$qa_type?:'', + 'ticket'=>$ticket?:'', + ]; + + + $dataid = Db::table(TabConf::$fa_hdrregister)->insertGetId($data); + + $this->operateLog('新增患者挂号列表(可重复挂号)',api_user_info('id')); + Db::commit(); + return json(Tools::set_ok('ok',$dataid)); + }catch (\Exception $e){ + Db::rollback(); + Tools::log_to_write_txt([ + 'error'=>'新增患者挂号列表(可重复挂号).异常.'.$e->getMessage(), + 'input'=>input(), + 'error_info'=>$e->getTraceAsString() + ]); + return json(Tools::set_fail()); + } + } + + + /** + * desc:获取患者挂号列表(可重复挂号) + * + * api/Hdrregister/getHdrregisterList + * * 参数: * name 患者姓名(可重复挂号) * phone 手机号 @@ -112,82 +113,82 @@ class Hdrregister extends BaseHttpApi * gender 病人性别 * phone 手机号 * status 状态:0=挂号中,1=结束诊断 - * qa_type 问答类型(患者定):1=自由问答,2=固定问答,3=健康问答 - * + * qa_type 问答类型(患者定):1=自由问答,2=固定问答,3=健康问答 + * * 所有字段说明(可能有部分额外字段未在此体现): - * id ID - * date 挂号日期 - * name 患者姓名(可重复挂号) - * doctor_name 医生名称 - * age 病人年龄 - * gender 病人性别 - * phone 手机号 - * create_time 创建时间 - * status 状态:0=挂号中,1=结束诊断 - * qa_type 问答类型(患者定):1=自由问答,2=固定问答,3=健康问答 - * say_ticket 对话凭据(便于查询) - - * author:wh - */ - function getHdrregisterList(){ - Tools::log_to_write_txt(['获取患者挂号列表(可重复挂号) 入参:'=>input()]); - $api_desc = '获取患者挂号列表(可重复挂号)'; - try { - - $id = input('id'); - $date = input('date'); - $name = input('name'); - $gender = input('gender'); - $phone = input('phone'); - $status = input('status'); - $qa_type = input('qa_type'); - - - $model_obj = Db::table(TabConf::$fa_hdrregister); - - if(input('name')){ - $model_obj->whereLike('name','%'.input('name').'%'); - } - - if(input('phone')){ - $model_obj->whereLike('phone','%'.input('phone').'%'); - } - - if(input('id')){ - $model_obj->where('id',input('id')); - } - if(input('date')){ - $model_obj->where('date',input('date')); - } - if(input('name')){ - $model_obj->where('name',input('name')); - } - if(input('gender')){ - $model_obj->where('gender',input('gender')); - } - if(input('status')){ - $model_obj->where('status',input('status')); - } - if(input('qa_type')){ - $model_obj->where('qa_type',input('qa_type')); - } - $data = $model_obj->select(); - if(empty($data)){ - return json(Tools::set_ok('ok',$data)); - } - - - - - - return json(Tools::set_ok('ok',$data)); - }catch(\Exception $e){ - Tools::log_to_write_txt([ - 'error'=>'获取患者挂号列表(可重复挂号).异常.'.$e->getMessage(), - '参数'=>input(), - 'error_info'=>$e->getTraceAsString() - ]); - return json(Tools::set_res(500,'操作异常',[])); - } - } + * id ID + * date 挂号日期 + * name 患者姓名(可重复挂号) + * doctor_name 医生名称 + * age 病人年龄 + * gender 病人性别 + * phone 手机号 + * create_time 创建时间 + * status 状态:0=挂号中,1=结束诊断 + * qa_type 问答类型(患者定):1=自由问答,2=固定问答,3=健康问答 + * ticket 对话凭据(便于查询) + + * author:wh + */ + function getHdrregisterList(){ + Tools::log_to_write_txt(['获取患者挂号列表(可重复挂号) 入参:'=>input()]); + $api_desc = '获取患者挂号列表(可重复挂号)'; + try { + + $id = input('id'); + $date = input('date'); + $name = input('name'); + $gender = input('gender'); + $phone = input('phone'); + $status = input('status'); + $qa_type = input('qa_type'); + + + $model_obj = Db::table(TabConf::$fa_hdrregister); + + if(input('name')){ + $model_obj->whereLike('name','%'.input('name').'%'); + } + + if(input('phone')){ + $model_obj->whereLike('phone','%'.input('phone').'%'); + } + + if(input('id')){ + $model_obj->where('id',input('id')); + } + if(input('date')){ + $model_obj->where('date',input('date')); + } + if(input('name')){ + $model_obj->where('name',input('name')); + } + if(input('gender')){ + $model_obj->where('gender',input('gender')); + } + if(input('status')){ + $model_obj->where('status',input('status')); + } + if(input('qa_type')){ + $model_obj->where('qa_type',input('qa_type')); + } + $data = $model_obj->select(); + if(empty($data)){ + return json(Tools::set_ok('ok',$data)); + } + + + + + + return json(Tools::set_ok('ok',$data)); + }catch(\Exception $e){ + Tools::log_to_write_txt([ + 'error'=>'获取患者挂号列表(可重复挂号).异常.'.$e->getMessage(), + '参数'=>input(), + 'error_info'=>$e->getTraceAsString() + ]); + return json(Tools::set_res(500,'操作异常',[])); + } + } } \ No newline at end of file diff --git a/digital_doctor/application/api/controller/Reporttt.php b/digital_doctor/application/api/controller/Reporttt.php index a397e62..99b0d13 100644 --- a/digital_doctor/application/api/controller/Reporttt.php +++ b/digital_doctor/application/api/controller/Reporttt.php @@ -80,7 +80,8 @@ class Reporttt 'address'=>input('address',''),//地址 'phone'=>input('phone',''),//联系方式 'wechat_no'=>input('wechat_no',''),//微信号 - 'form'=>'num_per' + 'form'=>'num_per', + 'ticket'=>$ticket,//对话票据' ]; $contentstr = input('content'); @@ -186,7 +187,7 @@ class Reporttt 'username'=>$username, 'type'=>empty($content[0])?'':$content[0], 'chat_msg'=>$item['content'], - 'say_ticket'=>$ticket, + 'ticket'=>$ticket, ]; $data[] = $d; } diff --git a/digital_doctor/application/api/controller/Reportty.php b/digital_doctor/application/api/controller/Reportty.php index 2dbeea6..1f9bdb5 100644 --- a/digital_doctor/application/api/controller/Reportty.php +++ b/digital_doctor/application/api/controller/Reportty.php @@ -124,6 +124,7 @@ class Reportty //'username'=>Db::table('fa_ty_users')->where('doctor',$user['username'])->value('username'), 'report_content'=>$choice['message']['content'], 'ticket'=>$ticket, + 'form'=>'ty', ]; $report_id = Db::table('fa_ty_medical_report')->insertGetId($data); @@ -145,7 +146,7 @@ class Reportty //查询广播客户端id $arr = Db::table('fa_device') - ->where('say_ticket',$ticket) + ->where('ticket',$ticket) ->select(); $clientid_arr = array_column($arr,'clientid'); $json = Tools::wss_json_ok('Reportty/createReport','ok',['flow_code'=>'create_report_end']); diff --git a/digital_doctor/application/api/controller/Userstt.php b/digital_doctor/application/api/controller/Userstt.php index c3d5ebc..5843e74 100644 --- a/digital_doctor/application/api/controller/Userstt.php +++ b/digital_doctor/application/api/controller/Userstt.php @@ -258,7 +258,7 @@ class Userstt extends BaseHttpApi 'username'=>$username, 'type'=>empty($content[0])?'':$content[0], 'chat_msg'=>$item['content'], - 'say_ticket'=>$ticket, + 'ticket'=>$ticket, ]; $data[] = $d; } diff --git a/digital_doctor/application/api/logic/TychatLogic.php b/digital_doctor/application/api/logic/TychatLogic.php index 230619a..7633b20 100644 --- a/digital_doctor/application/api/logic/TychatLogic.php +++ b/digital_doctor/application/api/logic/TychatLogic.php @@ -61,7 +61,7 @@ class TychatLogic extends BaseLogic //广播消息 //查询广播客户端id $arr = Db::table(TabConf::$fa_device) - ->where('say_ticket',$ticket) + ->where('ticket',$ticket) ->where('clientid','neq',$client_id)//不给自己发 ->select(); if(empty($arr)){ @@ -209,14 +209,14 @@ class TychatLogic extends BaseLogic 'doctor_phone'=>$data['items']['doctor_phone'], 'name'=>$data['items']['name'], 'phone'=>$data['items']['phone'], - 'say_ticket'=>$data['items']['ticket'], + 'ticket'=>$data['items']['ticket'], ]; Db::table(TabConf::$fa_hdropen_chat_room_record) ->insert($data); //查询绑定的设备 $device = Db::table(TabConf::$fa_device) - ->where('say_ticket',$data['items']['ticket']) + ->where('ticket',$data['items']['ticket']) ->find(); $client_id_arr = array_column($device,'clientid'); diff --git a/digital_doctor/application/api/logic/TyuserLogic.php b/digital_doctor/application/api/logic/TyuserLogic.php index 8ccb226..593f13e 100644 --- a/digital_doctor/application/api/logic/TyuserLogic.php +++ b/digital_doctor/application/api/logic/TyuserLogic.php @@ -87,7 +87,7 @@ class TyuserLogic extends BaseLogic ->insert([ 'username'=>$items['username'], 'clientid'=>$clientid, - 'say_ticket'=>$items['ticket'],//对话票据,根据票据分发消息 + 'ticket'=>$items['ticket'],//对话票据,根据票据分发消息 ]); return null; diff --git a/digital_doctor/public/api_docs/api_list.html b/digital_doctor/public/api_docs/api_list.html index c7b0926..800ffc8 100644 --- a/digital_doctor/public/api_docs/api_list.html +++ b/digital_doctor/public/api_docs/api_list.html @@ -130,7 +130,7 @@ * gender 病人性别 * phone 手机号 * qa_type 问答类型(患者定):1=自由问答,2=固定问答,3=健康问答 - * say_ticket 对话凭据(便于查询) + * ticket 对话凭据(便于查询) * api/Hdrregister/addHdrregister * api/hdrregister/addHdrregister */ @@ -174,7 +174,7 @@ * create_time 创建时间 * status 状态:0=挂号中,1=结束诊断 * qa_type 问答类型(患者定):1=自由问答,2=固定问答,3=健康问答 - * say_ticket 对话凭据(便于查询) + * ticket 对话凭据(便于查询) * author:wh * api/hdrregister/getHdrregisterList diff --git a/digital_doctor/public/api_docs/api_list.md b/digital_doctor/public/api_docs/api_list.md index 5160ec9..4593ef7 100644 --- a/digital_doctor/public/api_docs/api_list.md +++ b/digital_doctor/public/api_docs/api_list.md @@ -99,7 +99,7 @@ * gender 病人性别 * phone 手机号 * qa_type 问答类型(患者定):1=自由问答,2=固定问答,3=健康问答 - * say_ticket 对话凭据(便于查询) + * ticket 对话凭据(便于查询) * api/Hdrregister/addHdrregister * api/hdrregister/addHdrregister */ @@ -134,7 +134,7 @@ * create_time 创建时间 * status 状态:0=挂号中,1=结束诊断 * qa_type 问答类型(患者定):1=自由问答,2=固定问答,3=健康问答 - * say_ticket 对话凭据(便于查询) + * ticket 对话凭据(便于查询) * author:wh * api/hdrregister/getHdrregisterList