diff --git a/digital_doctor/application/api/controller/Reporttt.php b/digital_doctor/application/api/controller/Reporttt.php
index dabc663..3d86a87 100644
--- a/digital_doctor/application/api/controller/Reporttt.php
+++ b/digital_doctor/application/api/controller/Reporttt.php
@@ -182,18 +182,20 @@ class Reporttt extends BaseHttpApi
         try {
             foreach ($data as $item){
                 //只新增不修改
-                $DATAID = Db::table('fa_tt_userbaseinfo')->insert($basedata);
+                $hdruserbaseinfo_id = Db::table('fa_tt_userbaseinfo')->insert($basedata);
                 //保存疼痛科聊天记录
-                $this->setTtChatHistory($sub_content,$user['username'],$DATAID,$ticket);
-                $item['userbaseid'] = $DATAID;
+                $this->setTtChatHistory($sub_content,$user['username'],$hdruserbaseinfo_id,$ticket);
+                $item['userbaseid'] = $hdruserbaseinfo_id;
+                $item['hdruserbaseinfo_id'] = $hdruserbaseinfo_id;//统一病历基本信息ID
                 $item['from'] = input('from','num_per');//来源:num_per=数智人,ty=听译助手,h5=h5网页问诊
+                //保存报告
                 Db::table('fa_tt_medical_report')->insert($item);
                 //日期
                 $item['date'] = date('Y-m-d');
 
 
-                //统一存档(暂时不用)
-                Db::table(TabConf::$fa_hdrmedical_report)->insert($item);
+                ////统一存档(暂时不用)
+                //Db::table(TabConf::$fa_hdrmedical_report)->insert($item);
             }
 
             Db::commit();
diff --git a/digital_doctor/application/api/controller/Reportty.php b/digital_doctor/application/api/controller/Reportty.php
index 6e8957f..d3cc23d 100644
--- a/digital_doctor/application/api/controller/Reportty.php
+++ b/digital_doctor/application/api/controller/Reportty.php
@@ -132,7 +132,7 @@ class Reportty extends BaseHttpApi
                 //$data['from'] = input('from','ty');
 
                 //统一存档(暂时不用)
-                Db::table(TabConf::$fa_hdrmedical_report)->insert($data);
+                //Db::table(TabConf::$fa_hdrmedical_report)->insert($data);
 
                 $res_content[] = ['report_id'=>$report_id,'report_content'=>$choice['message']['content']];
             }
@@ -227,6 +227,9 @@ class Reportty extends BaseHttpApi
             if(empty(input('phone',''))){
                 return Tools::set_fail('病人手机号必须');
             }
+            if(empty(input('diagnosis'))){
+                return Tools::set_fail('diagnosis诊断内容必须');
+            }
             //听译问诊-患者病历信息
             $data = [
                 'username'=>input('username'),//医生
@@ -245,22 +248,7 @@ class Reportty extends BaseHttpApi
                 'ticket'=>$ticket,
                 'hdrdepartment_id'=>input('hdrdepartment_id'),//科室
             ];
-            //听译问诊-患者病历信息
-            $medicalrecord = Db::table('fa_ty_usermedicalrecord')
-                ->where('name',input('name',''))
-                ->find();
-            if(empty($medicalrecord)){
-                $data['ticket'] = $ticket;
-                //新增听译病历信息
-                $usermedicalrecord_id = Db::table('fa_ty_usermedicalrecord')->insertGetId($data);
-
-            }else{
-                $usermedicalrecord_id = $medicalrecord['id'];
-                Db::table('fa_ty_usermedicalrecord')
-                    ->where('ticket',$ticket)
-                    ->update($data);
-            }
-            //新增统一基本信息
+            //新增统一基本信息，修改报告的基本信息id
             $base_data = [
                 'doctor'=>input('username'),
                 'from'=>input('from','ty'),
@@ -268,22 +256,39 @@ class Reportty extends BaseHttpApi
                 'gender'=>input('gender',''),//病人性别： M=男性， F=女性
                 'age'=>input('age',''),//病人年龄
                 'phone'=>input('phone',''),
+                'diagnosis'=>input('diagnosis',''),//诊断
             ];
             $baseinfo = Db::table('fa_hdruserbaseinfo')
                 ->where('ticket',$ticket)
                 ->find();
-            if(empty($baseinfo)){
+            //if(empty($baseinfo)){
                 $baseinfo['ticket'] = $ticket;
                 $baseinfo['date'] = date('Y-m-d');
                 //新增统一基本信息
-                Db::table('fa_hdruserbaseinfo')
+                $hdruserbaseinfo_id = Db::table('fa_hdruserbaseinfo')
                     ->insertGetId($base_data);
+            //}else{
+            //    Db::table('fa_hdruserbaseinfo')
+            //        ->where('ticket',$ticket)
+            //        ->update($data);
+            //}
+            //听译问诊-患者病历信息
+            $medicalrecord = Db::table('fa_ty_userbaseinfo')
+                ->where('name',input('name',''))
+                ->find();
+            if(empty($medicalrecord)){
+                $data['ticket'] = $ticket;
+                //新增听译病历信息
+                $userbaseid = Db::table('fa_ty_userbaseinfo')->insertGetId($data);
+
             }else{
-                Db::table('fa_hdruserbaseinfo')
+                $userbaseid = $medicalrecord['id'];
+                Db::table('fa_ty_userbaseinfo')
                     ->where('ticket',$ticket)
                     ->update($data);
             }
 
+
             //修改报告
             $str = <<<EOF
 【姓名】：{$data['name']}
@@ -311,25 +316,26 @@ EOF;
                 ->where('id',$dataid)
                 ->data([
                     //病历信息id
-                    'userbaseid'=>$usermedicalrecord_id,//创建报告的时候这个字段是空，修改报告再补填这个字段
+                    'userbaseid'=>$userbaseid,//创建报告的时候这个字段是空，修改报告再补填这个字段
                     'report_content'=>$str,
                     'name'=>$data['name'],
                     'gender'=>$data['gender'],
+                    'hdruserbaseinfo_id'=>$hdruserbaseinfo_id,//统一病历基本信息ID
                 ])
                 ->update();
 
 
             //统一存档(暂时不用)
-            Db::table(TabConf::$fa_hdrmedical_report)
-                ->where('id',$dataid)
-                ->data([
-                    //病历信息id
-                    'userbaseid'=>$usermedicalrecord_id,//创建报告的时候这个字段是空，修改报告再补填这个字段
-                    'report_content'=>$str,
-                    'name'=>$data['name'],
-                    'gender'=>$data['gender'],
-                ])
-                ->update();
+            //Db::table(TabConf::$fa_hdrmedical_report)
+            //    ->where('id',$dataid)
+            //    ->data([
+            //        //病历信息id
+            //        'userbaseid'=>$usermedicalrecord_id,//创建报告的时候这个字段是空，修改报告再补填这个字段
+            //        'report_content'=>$str,
+            //        'name'=>$data['name'],
+            //        'gender'=>$data['gender'],
+            //    ])
+            //    ->update();
 
             return Tools::set_ok();
         });
diff --git a/digital_doctor/application/api/controller/Tyusermedicalrecord.php b/digital_doctor/application/api/controller/Tyusermedicalrecord.php
deleted file mode 100644
index ad48e5f..0000000
--- a/digital_doctor/application/api/controller/Tyusermedicalrecord.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-namespace app\api\controller;
-
-use think\Db;
-use app\common\model\TabConf;
-use wanghua\general_utility_tools_php\file\upload\FileUpload;
-use wanghua\general_utility_tools_php\tool\Tools;
-use wanghua\general_utility_tools_php\Validate;
-use think\Controller;
-
-class Tyusermedicalrecord extends BaseHttpApi
-{
-    protected $controller_comments = '听译问诊-患者病历信息';
-    
-    /**
-    * desc：获取听译问诊-患者病历信息
-    *
-    * api/Tyusermedicalrecord/getTyusermedicalrecordDetail
-    *
-    * 参数：
-    * username 所属医生 所属医生 必须
-    * name 病人姓名 病人姓名 必须
-    * phone 联系方式 联系方式 必须
-    *
-    * 所有字段说明<span style="color: gray">（可能有部分额外字段未在此体现）</span>：
-    * id ID
-    * username 所属医生
-    * name 病人姓名
-    * gender 病人性别
-    * age 病人年龄
-    * main_complaint 主诉
-    * medical_history 病史
-    * past_history 既往史
-    * allergy_history 过敏史
-    * family_history 家族史
-    * personal_history 个人史
-    * menstrual_marital_history 月经婚育史
-    * diagnosis 诊断
-    * treatment 医嘱
-    * phone 联系方式
-    * status 问诊状态
-    * create_time 创建时间
-    * ticket 对话票据
-    
-    * author：wh
-    */
-    function getTyusermedicalrecordDetail(){
-        Tools::log_to_write_txt(['获取听译问诊-患者病历信息 入参：'=>input()]);
-        $api_desc = '获取听译问诊-患者病历信息';
-        try {
-            
-            $username = input('username');
-            if(empty($username)){
-                return json(Tools::set_fail('username参数错误'));
-            }
-                    
-            $name = input('name');
-            if(empty($name)){
-                return json(Tools::set_fail('name参数错误'));
-            }
-                    
-            $phone = input('phone');
-            if(empty($phone)){
-                return json(Tools::set_fail('phone参数错误'));
-            }
-                    
-            
-            
-            $model_obj = Db::table(TabConf::$fa_ty_usermedicalrecord);
-        
-            if(input('username')){
-                $model_obj->where('username',input('username'));
-            }
-            if(input('name')){
-                $model_obj->where('name',input('name'));
-            }
-            if(input('phone')){
-                $model_obj->where('phone',input('phone'));
-            }            
-            $item = $model_obj->find();
-            $data = $item;
-            
-            
-            
-            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/common/model/TabConf.php b/digital_doctor/application/common/model/TabConf.php
index 4d33510..740b828 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';
 
 
+    /** 
+    * 问诊报告存档（疼痛科、听译、h5问诊统一存放）（一个基本信息对应一个报告）  
+    */
+    static $__fa_hdrmedical_report = '__fa_hdrmedical_report';
+
+
     /** 
     * 医患问答对话记录  
     */
@@ -41,12 +47,30 @@ class TabConf
     static $__fa_message = '__fa_message';
 
 
+    /** 
+    * 随访记录（数智人医生）  
+    */
+    static $__fa_tt_followup = '__fa_tt_followup';
+
+
     /** 
     * 疼痛科自由对话聊天历史  
     */
     static $__fa_tt_free_chathistory = '__fa_tt_free_chathistory';
 
 
+    /** 
+    * 随访记录(听译助手)  
+    */
+    static $__fa_ty_followup = '__fa_ty_followup';
+
+
+    /** 
+    * 听译-用户基本信息  
+    */
+    static $__fa_ty_userbaseinfo = '__fa_ty_userbaseinfo';
+
+
     /** 
     * 管理员表  
     */
@@ -276,7 +300,7 @@ class TabConf
 
 
     /** 
-    * 听译-用户基本信息  
+    * 听译问诊-患者病历信息  
     */
     static $fa_ty_userbaseinfo = 'fa_ty_userbaseinfo';
 
diff --git a/digital_doctor_admin/application/admin/controller/tt/Followup.php b/digital_doctor_admin/application/admin/controller/tt/Followup.php
index ccfeb2d..3acdfa9 100644
--- a/digital_doctor_admin/application/admin/controller/tt/Followup.php
+++ b/digital_doctor_admin/application/admin/controller/tt/Followup.php
@@ -93,7 +93,7 @@ class Followup extends Backend
         $report_dataid = input('report_dataid');
         $report = Db::table('fa_ty_medical_report')->where('id',$report_dataid)->find();
 
-        $userbaseinfo = Db::table('fa_ty_usermedicalrecord')->where('id',$report['id'])->find();
+        $userbaseinfo = Db::table('fa_ty_userbaseinfo')->where('id',$report['id'])->find();
         $this->assign('user',$userbaseinfo);
         $html = view('add')->getContent();
         return json(Tools::set_ok('ok',$html));
@@ -110,7 +110,7 @@ class Followup extends Backend
             }
             $report = Db::table('fa_ty_medical_report')->where('id',$report_dataid)->find();
 
-            $userbase = Db::table('fa_ty_usermedicalrecord')
+            $userbase = Db::table('fa_ty_userbaseinfo')
                 ->where('id',$report['userbaseid'])
                 ->find();
             if(empty($userbase)){