wanghua/digital_doctor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed

Browse Source
This commit is contained in:
wnaguha
2024-08-07 22:45:28 +08:00
parent 9a224fad7c
commit 0c1325949d
12 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
digital_doctor/application/api/controller/Hdradmin.php
View File

@@ -53,7 +53,7 @@ class Hdradmin extends BaseHttpApi
$ticketstr = md5($user['username'].$expires); $ticketstr = md5($user['username'].$expires);
//修改有效期 //修改有效期
Db::table('fa_tt_users') Db::table('fa_hdrdoctorusers')
->data([ ->data([
'ticket'=>$ticketstr, 'ticket'=>$ticketstr,
'expires'=>$expires,//7天 'expires'=>$expires,//7天

3
digital_doctor/application/api/controller/Reporttt.php
View File

@@ -88,7 +88,7 @@ class Reporttt extends BaseHttpApi
// return json(Tools::set_fail('username不存在')); // return json(Tools::set_fail('username不存在'));
//} //}
$user = Db::table('fa_tt_users')->where('ticket',$ticket)->find(); $user = Db::table('fa_hdrdoctorusers')->where('ticket',$ticket)->find();
if(empty($user)){ if(empty($user)){
return json(Tools::set_res(530,'用户不存在')); return json(Tools::set_res(530,'用户不存在'));
} }
@@ -298,7 +298,6 @@ class Reporttt extends BaseHttpApi
//if(empty($ticket)){ //if(empty($ticket)){
// return Tools::set_fail('ticket必须'); // return Tools::set_fail('ticket必须');
//} //}
//$user = Db::table('fa_tt_users')->where('ticket',$ticket)->find();
//修改基本信息 //修改基本信息
$data = [ $data = [
//'username'=>$user['username'],//医生 //'username'=>$user['username'],//医生

4
digital_doctor/application/api/controller/Reportty.php
View File

@@ -55,7 +55,7 @@ class Reportty extends BaseHttpApi
if(empty($ticket)){ if(empty($ticket)){
return json(Tools::set_fail('ticket必须')); return json(Tools::set_fail('ticket必须'));
} }
$user = Db::table('fa_ty_users')->where('ticket',$ticket)->find(); $user = Db::table('fa_hdrdoctorusers')->where('ticket',$ticket)->find();
if(empty($user)){ if(empty($user)){
return json(Tools::set_fail('医生不存在，请确认ticket')); return json(Tools::set_fail('医生不存在，请确认ticket'));
} }
@@ -120,7 +120,6 @@ class Reportty extends BaseHttpApi
$data = [ $data = [
'doctor'=>$user['username'], 'doctor'=>$user['username'],
//病人 //病人
//'username'=>Db::table('fa_ty_users')->where('doctor',$user['username'])->value('username'),
'report_content'=>$choice['message']['content'], 'report_content'=>$choice['message']['content'],
'ticket'=>$ticket, 'ticket'=>$ticket,
'from'=>input('from','ty'),//来源 'from'=>input('from','ty'),//来源
@@ -216,7 +215,6 @@ class Reportty extends BaseHttpApi
if(empty($ticket)){ if(empty($ticket)){
return Tools::set_fail('ticket必须'); return Tools::set_fail('ticket必须');
} }
//$user = Db::table('fa_ty_users')->where('ticket',$ticket)->find();
if(empty(input('username'))){ if(empty(input('username'))){
return Tools::set_fail('医生登录账号必须'); return Tools::set_fail('医生登录账号必须');

8
digital_doctor/application/api/controller/Userstt.php
View File

@@ -57,7 +57,7 @@ class Userstt extends BaseHttpApi
if(empty($dataid)){ if(empty($dataid)){
return Tools::set_fail('参数错误'); return Tools::set_fail('参数错误');
} }
$data = Db::table('fa_tt_users') $data = Db::table('fa_hdrdoctorusers')
->where('id',$dataid) ->where('id',$dataid)
->find(); ->find();
return Tools::set_res(200,'查询成功',$data); return Tools::set_res(200,'查询成功',$data);
@@ -92,7 +92,7 @@ class Userstt extends BaseHttpApi
if(empty($password)){ if(empty($password)){
return Tools::set_fail('参数错误:2'); return Tools::set_fail('参数错误:2');
} }
$user = Db::table('fa_tt_users') $user = Db::table('fa_hdrdoctorusers')
->where('username',$username) ->where('username',$username)
->find(); ->find();
if(empty($user)){ if(empty($user)){
@@ -113,7 +113,7 @@ class Userstt extends BaseHttpApi
$ticketstr = md5($user['username']); $ticketstr = md5($user['username']);
//修改有效期 //修改有效期
Db::table('fa_tt_users') Db::table('fa_hdrdoctorusers')
->data([ ->data([
'ticket'=>$ticketstr, 'ticket'=>$ticketstr,
//'expires'=>$expires,//7天 //'expires'=>$expires,//7天
@@ -171,7 +171,7 @@ class Userstt extends BaseHttpApi
if(empty($ticket)){ if(empty($ticket)){
return Tools::set_fail('ticket必须'); return Tools::set_fail('ticket必须');
} }
$user = Db::table('fa_tt_users')->where('ticket',$ticket)->find(); $user = Db::table('fa_hdrdoctorusers')->where('ticket',$ticket)->find();
if(empty($user)){ if(empty($user)){
return Tools::set_fail('ticket错误'); return Tools::set_fail('ticket错误');
} }

4
digital_doctor/application/api/controller/Usersty.php
View File

@@ -57,7 +57,7 @@ class Usersty extends BaseHttpApi
if(empty($password)){ if(empty($password)){
return Tools::set_fail('参数错误:2'); return Tools::set_fail('参数错误:2');
} }
$user = Db::table('fa_ty_users') $user = Db::table('fa_hdrdoctorusers')
->where('username',$username) ->where('username',$username)
->find(); ->find();
if(empty($user)){ if(empty($user)){
@@ -81,7 +81,7 @@ class Usersty extends BaseHttpApi
$expires = 7*86400+time(); $expires = 7*86400+time();
$ticketstr = md5($user['username'].$expires); $ticketstr = md5($user['username'].$expires);
//修改有效期 //修改有效期
Db::table('fa_ty_users') Db::table('fa_hdrdoctorusers')
->data([ ->data([
'ticket'=>$ticketstr, 'ticket'=>$ticketstr,
'expires'=>$expires,//7天 'expires'=>$expires,//7天

2
digital_doctor/application/api/logic/TtchatLogic.php
View File

@@ -71,7 +71,7 @@ class TtchatLogic extends BaseLogic
if(empty($ticket)){ if(empty($ticket)){
return json(Tools::set_fail('ticket必须')); return json(Tools::set_fail('ticket必须'));
} }
$user = Db::table('fa_ty_users')->where('ticket',$ticket)->find(); $user = Db::table('fa_hdrdoctorusers')->where('ticket',$ticket)->find();
if(empty($user)){ if(empty($user)){
return json(Tools::set_fail('用户不存在')); return json(Tools::set_fail('用户不存在'));
} }

2
digital_doctor/application/api/logic/TyuserLogic.php
View File

@@ -45,7 +45,7 @@ class TyuserLogic extends BaseLogic
->where('clientid', $client_id) ->where('clientid', $client_id)
->delete(); ->delete();
//把ticket设置为空，标识离线 //把ticket设置为空，标识离线
Db::table('fa_ty_users') Db::table('fa_hdrdoctorusers')
->data([ ->data([
'ticket'=>'',//修改为离线 'ticket'=>'',//修改为离线
]) ])

2
digital_doctor/application/common.php
View File

@@ -1355,6 +1355,6 @@ function api_user_info($field = '')
if($api_user_info){ if($api_user_info){
return $api_user_info; return $api_user_info;
} }
$api_user_info = Db::table('fa_ty_users')->where('openid',$openid2)->find(); $api_user_info = Db::table('fa_hdrdoctorusers')->where('openid',$openid2)->find();
return $field?$api_user_info[$field]:$api_user_info; return $field?$api_user_info[$field]:$api_user_info;
} }

6
digital_doctor/application/common/model/TabConf.php
View File

@@ -17,6 +17,12 @@ class TabConf
static $__fa_hdrdoctor = '__fa_hdrdoctor'; static $__fa_hdrdoctor = '__fa_hdrdoctor';
/**
* 医生账户信息
*/
static $__fa_hdrdoctorusers = '__fa_hdrdoctorusers';
/** /**
* 问诊报告存档（疼痛科、听译、h5问诊统一存放）（一个基本信息对应一个报告） * 问诊报告存档（疼痛科、听译、h5问诊统一存放）（一个基本信息对应一个报告）
*/ */

1
digital_doctor_admin/application/admin/controller/tt/Followup.php
View File

@@ -49,7 +49,6 @@ class Followup extends Backend
//报告数据id //报告数据id
$report_dataid = input('report_dataid'); $report_dataid = input('report_dataid');
$report = Db::table('fa_tt_medical_report')->where('id',$report_dataid)->find(); $report = Db::table('fa_tt_medical_report')->where('id',$report_dataid)->find();
//$user = Db::table('fa_tt_users')->where('username',$report['username'])->find();
$userbaseinfo = Db::table('fa_tt_userbaseinfo')->where('id',$report['id'])->find(); $userbaseinfo = Db::table('fa_tt_userbaseinfo')->where('id',$report['id'])->find();
$this->assign('user',$userbaseinfo); $this->assign('user',$userbaseinfo);

4
digital_doctor_admin/vendor/wanghua/general-utility-tools-php/src/api/BaseUserLogic.php vendored
View File

@@ -15,7 +15,7 @@ use wanghua\general_utility_tools_php\tool\Tools;
class BaseUserLogic class BaseUserLogic
{ {
public $user_table = 'fa_ty_users'; public $user_table = 'fa_users';
/** /**
* desc：【通用】用户登录逻辑 * desc：【通用】用户登录逻辑
@@ -133,7 +133,7 @@ class BaseUserLogic
Tools::log_to_write_txt(['title'=>'业务ticket字段不存在','input'=>input()]); Tools::log_to_write_txt(['title'=>'业务ticket字段不存在','input'=>input()]);
return false; return false;
} }
$user = Db::table('fa_ty_users') $user = Db::table('fa_users')
->where('ticket',$ticket) ->where('ticket',$ticket)
->find(); ->find();
if(empty($user)){ if(empty($user)){

4
digital_doctor_admin/vendor/wanghua/general-utility-tools-php/src/wechat/WechatMsgPushLogicDemo.php vendored
View File

@@ -135,7 +135,7 @@ class WechatMsgPushLogic
]); ]);
continue;//不发 continue;//不发
} }
$users = Db::table('fa_ty_users') $users = Db::table('fa_users')
->where('openid',$ToUserOpenid) ->where('openid',$ToUserOpenid)
->find(); ->find();
if(empty($users)){ if(empty($users)){
@@ -145,7 +145,7 @@ class WechatMsgPushLogic
continue; continue;
} }
//礼包入账 //礼包入账
Db::table('fa_ty_users') Db::table('fa_users')
->where('openid',$ToUserOpenid) ->where('openid',$ToUserOpenid)
->setInc('score',$prize['val'] * $item['Num']); ->setInc('score',$prize['val'] * $item['Num']);
} }