From fb6ab0f310cee0adcfe40ea372c0064d7f40d2f4 Mon Sep 17 00:00:00 2001
From: wh <382379437@qq.com>
Date: Fri, 19 Jul 2024 17:10:07 +0800
Subject: [PATCH] fixed

---
 .../application/api/controller/Reporttt.php   | 10 +++++---
 .../application/api/controller/Reportty.php   | 24 ++++++++++++++-----
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/digital_doctor/application/api/controller/Reporttt.php b/digital_doctor/application/api/controller/Reporttt.php
index 506ad7a..21736bc 100644
--- a/digital_doctor/application/api/controller/Reporttt.php
+++ b/digital_doctor/application/api/controller/Reporttt.php
@@ -146,9 +146,13 @@ class Reporttt
 
         Db::startTrans();
         try {
-            Db::table('fa_tt_medical_report')->insertAll($data);
-            //只新增不修改
-            Db::table('fa_tt_userbaseinfo')->insert($basedata);
+            foreach ($data as $item){
+                //只新增不修改
+                $DATAID = Db::table('fa_tt_userbaseinfo')->insert($basedata);
+                $item['userbaseid'] = $DATAID;
+                Db::table('fa_tt_medical_report')->insert($item);
+            }
+
             Db::commit();
             return json(Tools::set_ok(['base_data'=>$content,'res_content'=>$res_content]));
         }catch (\Exception $e){
diff --git a/digital_doctor/application/api/controller/Reportty.php b/digital_doctor/application/api/controller/Reportty.php
index a1c3a8b..cc6aef7 100644
--- a/digital_doctor/application/api/controller/Reportty.php
+++ b/digital_doctor/application/api/controller/Reportty.php
@@ -212,11 +212,20 @@ class Reportty
                 'diagnosis'=>input('diagnosis',''),//诊断
                 'treatment'=>input('treatment',''),//医嘱
             ];
-            //修改基本信息
-            Mmodel::existsUpdateInsert('fa_ty_userbaseinfo',[
-                //'username'=>input('username',''),
-                'name'=>input('name',''),
-            ],$data);
+            //查询基本信息
+            $baseuser = Db::table('fa_ty_userbaseinfo')
+                ->where('name',input('name',''))
+                ->find();
+            if(empty($baseuser)){
+                //新增基本信息
+                $userbaseid = Db::table('fa_ty_userbaseinfo')->insertGetId($data);
+
+            }else{
+                $userbaseid = $baseuser['id'];
+                Db::table('fa_ty_userbaseinfo')
+                    ->where('id',$userbaseid)
+                    ->update($data);
+            }
 
             //修改报告
             $str = <<<EOF
@@ -243,7 +252,10 @@ EOF;
 
             Db::table('fa_ty_medical_report')
                 ->where('id',$dataid)
-                ->data(['report_content'=>$str])
+                ->data([
+                    'userbaseid'=>$userbaseid,//创建报告的时候这个字段是空，修改报告再补填这个字段
+                    'report_content'=>$str
+                ])
                 ->update();
 
             return Tools::set_ok();