浏览代码

Merge branch 'pro' of http://code.pacsonline.cn/zskk_bg/yuanchengpasc into pro

lgy 5 年之前
父节点
当前提交
9cf71cd8d5
共有 1 个文件被更改,包括 4 次插入2 次删除
  1. 4 2
      application/inter/controller/Writereport.php

+ 4 - 2
application/inter/controller/Writereport.php

@@ -885,7 +885,7 @@ class Writereport extends Base
             $info['description'] = $report['description'];
             $info['qr_code'] = $report['qr_code'];
             // 报告医生
-            $report_doctor = DB::table('doctors')->where('id',$report['report_doctor_id'])->field('realname,autograph,is_use_autograph')->find();
+            $report_doctor = DB::table('doctors')->where('id',$report['report_doctor_id'])->field('realname,autograph,is_use_autograph,institution_id')->find();
             $info['report_doctor'] = $report_doctor['realname'];
             $info['report_use_autograph'] = $report_doctor['is_use_autograph'];
             $info['report_autograph'] = $report_doctor['autograph'];
@@ -894,7 +894,9 @@ class Writereport extends Base
             $info['review_doctor'] = $review_doctor['realname'];
             $info['review_use_autograph'] = $review_doctor['is_use_autograph'];
             $info['review_autograph'] = $review_doctor['autograph'];
-            $hospital = DB::table('institution')->where('id',$doctor['institution_id'])->field('name')->find();
+            
+            // $hospital = DB::table('institution')->where('id',$doctor['institution_id'])->field('name')->find();
+            $hospital = DB::table('institution')->where('id',$report_doctor['institution_id'])->field('name')->find();
             $info['hospital'] = $hospital['name'];
             return json_encode(['status'=>'ok','code'=>'0000','info'=>$info,'sessionid'=>$sessionid]);
         }catch(\Exception $e){