From 0c1325949dc3e7d8dcc5375dfe4c8ffb8465b647 Mon Sep 17 00:00:00 2001
From: wh <382379437@qq.com>
Date: Wed, 7 Aug 2024 22:45:28 +0800
Subject: [PATCH] fixed

---
 digital_doctor/application/api/controller/Hdradmin.php    | 2 +-
 digital_doctor/application/api/controller/Reporttt.php    | 3 +--
 digital_doctor/application/api/controller/Reportty.php    | 4 +---
 digital_doctor/application/api/controller/Userstt.php     | 8 ++++----
 digital_doctor/application/api/controller/Usersty.php     | 4 ++--
 digital_doctor/application/api/logic/TtchatLogic.php      | 2 +-
 digital_doctor/application/api/logic/TyuserLogic.php      | 2 +-
 digital_doctor/application/common.php                     | 2 +-
 digital_doctor/application/common/model/TabConf.php       | 6 ++++++
 .../application/admin/controller/tt/Followup.php          | 1 -
 .../general-utility-tools-php/src/api/BaseUserLogic.php   | 4 ++--
 .../src/wechat/WechatMsgPushLogicDemo.php                 | 4 ++--
 12 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/digital_doctor/application/api/controller/Hdradmin.php b/digital_doctor/application/api/controller/Hdradmin.php
index af533ce..e78b60d 100644
--- a/digital_doctor/application/api/controller/Hdradmin.php
+++ b/digital_doctor/application/api/controller/Hdradmin.php
@@ -53,7 +53,7 @@ class Hdradmin extends BaseHttpApi
             $ticketstr = md5($user['username'].$expires);
 
             //修改有效期
-            Db::table('fa_tt_users')
+            Db::table('fa_hdrdoctorusers')
                 ->data([
                     'ticket'=>$ticketstr,
                     'expires'=>$expires,//7天
diff --git a/digital_doctor/application/api/controller/Reporttt.php b/digital_doctor/application/api/controller/Reporttt.php
index b014729..1de7aa6 100644
--- a/digital_doctor/application/api/controller/Reporttt.php
+++ b/digital_doctor/application/api/controller/Reporttt.php
@@ -88,7 +88,7 @@ class Reporttt extends BaseHttpApi
         //    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)){
             return json(Tools::set_res(530,'用户不存在'));
         }
@@ -298,7 +298,6 @@ class Reporttt extends BaseHttpApi
             //if(empty($ticket)){
             //    return Tools::set_fail('ticket必须');
             //}
-            //$user = Db::table('fa_tt_users')->where('ticket',$ticket)->find();
             //修改基本信息
             $data = [
                 //'username'=>$user['username'],//医生
diff --git a/digital_doctor/application/api/controller/Reportty.php b/digital_doctor/application/api/controller/Reportty.php
index c450147..7570a6b 100644
--- a/digital_doctor/application/api/controller/Reportty.php
+++ b/digital_doctor/application/api/controller/Reportty.php
@@ -55,7 +55,7 @@ class Reportty extends BaseHttpApi
         if(empty($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)){
             return json(Tools::set_fail('医生不存在，请确认ticket'));
         }
@@ -120,7 +120,6 @@ class Reportty extends BaseHttpApi
                 $data = [
                     'doctor'=>$user['username'],
                     //病人
-                    //'username'=>Db::table('fa_ty_users')->where('doctor',$user['username'])->value('username'),
                     'report_content'=>$choice['message']['content'],
                     'ticket'=>$ticket,
                     'from'=>input('from','ty'),//来源
@@ -216,7 +215,6 @@ class Reportty extends BaseHttpApi
             if(empty($ticket)){
                 return Tools::set_fail('ticket必须');
             }
-            //$user = Db::table('fa_ty_users')->where('ticket',$ticket)->find();
 
             if(empty(input('username'))){
                 return Tools::set_fail('医生登录账号必须');
diff --git a/digital_doctor/application/api/controller/Userstt.php b/digital_doctor/application/api/controller/Userstt.php
index 045b82e..9b1139c 100644
--- a/digital_doctor/application/api/controller/Userstt.php
+++ b/digital_doctor/application/api/controller/Userstt.php
@@ -57,7 +57,7 @@ class Userstt extends BaseHttpApi
             if(empty($dataid)){
                 return Tools::set_fail('参数错误');
             }
-            $data = Db::table('fa_tt_users')
+            $data = Db::table('fa_hdrdoctorusers')
                 ->where('id',$dataid)
                 ->find();
             return Tools::set_res(200,'查询成功',$data);
@@ -92,7 +92,7 @@ class Userstt extends BaseHttpApi
             if(empty($password)){
                 return Tools::set_fail('参数错误:2');
             }
-            $user = Db::table('fa_tt_users')
+            $user = Db::table('fa_hdrdoctorusers')
                 ->where('username',$username)
                 ->find();
             if(empty($user)){
@@ -113,7 +113,7 @@ class Userstt extends BaseHttpApi
             $ticketstr = md5($user['username']);
 
             //修改有效期
-            Db::table('fa_tt_users')
+            Db::table('fa_hdrdoctorusers')
                 ->data([
                     'ticket'=>$ticketstr,
                     //'expires'=>$expires,//7天
@@ -171,7 +171,7 @@ class Userstt extends BaseHttpApi
             if(empty($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)){
                 return Tools::set_fail('ticket错误');
             }
diff --git a/digital_doctor/application/api/controller/Usersty.php b/digital_doctor/application/api/controller/Usersty.php
index 1fd42e7..7056f62 100644
--- a/digital_doctor/application/api/controller/Usersty.php
+++ b/digital_doctor/application/api/controller/Usersty.php
@@ -57,7 +57,7 @@ class Usersty extends BaseHttpApi
             if(empty($password)){
                 return Tools::set_fail('参数错误:2');
             }
-            $user = Db::table('fa_ty_users')
+            $user = Db::table('fa_hdrdoctorusers')
                 ->where('username',$username)
                 ->find();
             if(empty($user)){
@@ -81,7 +81,7 @@ class Usersty extends BaseHttpApi
                 $expires = 7*86400+time();
                 $ticketstr = md5($user['username'].$expires);
                 //修改有效期
-                Db::table('fa_ty_users')
+                Db::table('fa_hdrdoctorusers')
                     ->data([
                         'ticket'=>$ticketstr,
                         'expires'=>$expires,//7天
diff --git a/digital_doctor/application/api/logic/TtchatLogic.php b/digital_doctor/application/api/logic/TtchatLogic.php
index 0ef03bb..f5ff774 100644
--- a/digital_doctor/application/api/logic/TtchatLogic.php
+++ b/digital_doctor/application/api/logic/TtchatLogic.php
@@ -71,7 +71,7 @@ class TtchatLogic extends BaseLogic
         if(empty($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)){
             return json(Tools::set_fail('用户不存在'));
         }
diff --git a/digital_doctor/application/api/logic/TyuserLogic.php b/digital_doctor/application/api/logic/TyuserLogic.php
index 79beb02..270e343 100644
--- a/digital_doctor/application/api/logic/TyuserLogic.php
+++ b/digital_doctor/application/api/logic/TyuserLogic.php
@@ -45,7 +45,7 @@ class TyuserLogic extends BaseLogic
                 ->where('clientid', $client_id)
                 ->delete();
             //把ticket设置为空，标识离线
-            Db::table('fa_ty_users')
+            Db::table('fa_hdrdoctorusers')
                 ->data([
                     'ticket'=>'',//修改为离线
                 ])
diff --git a/digital_doctor/application/common.php b/digital_doctor/application/common.php
index ae79f49..7de8cf2 100644
--- a/digital_doctor/application/common.php
+++ b/digital_doctor/application/common.php
@@ -1355,6 +1355,6 @@ function api_user_info($field = '')
     if($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;
 }
diff --git a/digital_doctor/application/common/model/TabConf.php b/digital_doctor/application/common/model/TabConf.php
index 740b828..94a457b 100644
--- a/digital_doctor/application/common/model/TabConf.php
+++ b/digital_doctor/application/common/model/TabConf.php
@@ -17,6 +17,12 @@ class TabConf
     static $__fa_hdrdoctor = '__fa_hdrdoctor';
 
 
+    /** 
+    * 医生账户信息  
+    */
+    static $__fa_hdrdoctorusers = '__fa_hdrdoctorusers';
+
+
     /** 
     * 问诊报告存档（疼痛科、听译、h5问诊统一存放）（一个基本信息对应一个报告）  
     */
diff --git a/digital_doctor_admin/application/admin/controller/tt/Followup.php b/digital_doctor_admin/application/admin/controller/tt/Followup.php
index 3acdfa9..9cf1573 100644
--- a/digital_doctor_admin/application/admin/controller/tt/Followup.php
+++ b/digital_doctor_admin/application/admin/controller/tt/Followup.php
@@ -49,7 +49,6 @@ class Followup extends Backend
         //报告数据id
         $report_dataid = input('report_dataid');
         $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();
         $this->assign('user',$userbaseinfo);
diff --git a/digital_doctor_admin/vendor/wanghua/general-utility-tools-php/src/api/BaseUserLogic.php b/digital_doctor_admin/vendor/wanghua/general-utility-tools-php/src/api/BaseUserLogic.php
index 8cbf003..be93171 100644
--- a/digital_doctor_admin/vendor/wanghua/general-utility-tools-php/src/api/BaseUserLogic.php
+++ b/digital_doctor_admin/vendor/wanghua/general-utility-tools-php/src/api/BaseUserLogic.php
@@ -15,7 +15,7 @@ use wanghua\general_utility_tools_php\tool\Tools;
 
 class BaseUserLogic
 {
-    public $user_table = 'fa_ty_users';
+    public $user_table = 'fa_users';
 
     /**
      * desc：【通用】用户登录逻辑
@@ -133,7 +133,7 @@ class BaseUserLogic
             Tools::log_to_write_txt(['title'=>'业务ticket字段不存在','input'=>input()]);
             return false;
         }
-        $user = Db::table('fa_ty_users')
+        $user = Db::table('fa_users')
             ->where('ticket',$ticket)
             ->find();
         if(empty($user)){
diff --git a/digital_doctor_admin/vendor/wanghua/general-utility-tools-php/src/wechat/WechatMsgPushLogicDemo.php b/digital_doctor_admin/vendor/wanghua/general-utility-tools-php/src/wechat/WechatMsgPushLogicDemo.php
index c8d64fe..c42b629 100644
--- a/digital_doctor_admin/vendor/wanghua/general-utility-tools-php/src/wechat/WechatMsgPushLogicDemo.php
+++ b/digital_doctor_admin/vendor/wanghua/general-utility-tools-php/src/wechat/WechatMsgPushLogicDemo.php
@@ -135,7 +135,7 @@ class WechatMsgPushLogic
                     ]);
                     continue;//不发
                 }
-                $users = Db::table('fa_ty_users')
+                $users = Db::table('fa_users')
                     ->where('openid',$ToUserOpenid)
                     ->find();
                 if(empty($users)){
@@ -145,7 +145,7 @@ class WechatMsgPushLogic
                     continue;
                 }
                 //礼包入账
-                Db::table('fa_ty_users')
+                Db::table('fa_users')
                     ->where('openid',$ToUserOpenid)
                     ->setInc('score',$prize['val'] * $item['Num']);
             }