|
|
@@ -76,13 +76,13 @@ class Writereport extends Base
|
|
|
$info['images'] = isset($param['images']) ? $param['images'] : '';
|
|
|
if(isset($param['rid']) && !empty($param['rid'])){
|
|
|
$remote_id = $param['rid'];
|
|
|
- $report = DB::table('report')->where('exam_id',$id)->where('remote_application_id',$remote_id)->field('id,remote_application_id,report_result,report_datetime,report_doctor_id,review_datetime,review_doctor_id,impression,description')->find();
|
|
|
+ $report = DB::table('report')->where('exam_id',$id)->where('remote_application_id',$remote_id)->field('qr_code,id,remote_application_id,report_result,report_datetime,report_doctor_id,review_datetime,review_doctor_id,impression,description')->find();
|
|
|
$sta = DB::table('remote_application')->where('id',$remote_id)->field('report_status')->find();
|
|
|
$info['report_status'] = $sta['report_status'];
|
|
|
$r_id = $report['remote_application_id'];
|
|
|
}else{
|
|
|
// 不存在 本地点击进入 获取本地报告
|
|
|
- $report = DB::table('report')->where('exam_id',$id)->where('type',1)->field('id,remote_application_id,report_result,report_datetime,report_doctor_id,review_datetime,review_doctor_id,impression,description')->find();
|
|
|
+ $report = DB::table('report')->where('exam_id',$id)->where('type',1)->field('qr_code,id,remote_application_id,report_result,report_datetime,report_doctor_id,review_datetime,review_doctor_id,impression,description')->find();
|
|
|
$info['report_status'] = '';
|
|
|
$r_report = DB::table('report')->where('exam_id',$id)->where('type',2)->field('remote_application_id')->find();
|
|
|
$r_id = $r_report['remote_application_id'];
|
|
|
@@ -102,6 +102,7 @@ class Writereport extends Base
|
|
|
$info['impression'] = $report['impression'];
|
|
|
$info['report_result'] = $report['report_result'];
|
|
|
$info['report_id'] = $report['id'];
|
|
|
+ $info['qr_code'] = $report['qr_code'];
|
|
|
$cache_key = $doctor['id'].'_'.$report['id'];
|
|
|
if(Cache::get($cache_key)){
|
|
|
$cache = Cache::get($cache_key);
|
lgy