|
@@ -50,7 +50,7 @@ class Report extends Base
|
|
|
*")
|
|
|
**/
|
|
|
public function index(){
|
|
|
- try{
|
|
|
+// try{
|
|
|
$sessionid = Request::instance()->param('sessionid');
|
|
|
$doctor = Cache::get($sessionid);
|
|
|
if(!$doctor){
|
|
@@ -195,30 +195,30 @@ class Report extends Base
|
|
|
if($v['is_remote'] == 1){
|
|
|
// 远程报告 获取发送的报告医院
|
|
|
$remote = DB::table('remote_application')->where('exam_id',$v['id'])->field('remote_institution_id')->find();
|
|
|
- $remote_name = DB::table('institution')->where('id',$remote['remote_institution_id'])->cache(300)->field('name')->find();
|
|
|
+ $remote_name = DB::table('institution')->where('id',$remote['remote_institution_id'] ?? null)->cache(300)->field('name')->find();
|
|
|
$project = DB::table('exam_project')->where('id',$v['exam_project'])->field('name')->find();
|
|
|
- $list[$k]['exam_project_name'] = $project['name'];
|
|
|
- $list[$k]['report_app_name'] = $remote_name['name'];
|
|
|
+ $list[$k]['exam_project_name'] = $project['name'] ?? null;
|
|
|
+ $list[$k]['report_app_name'] = $remote_name['name'] ?? null;
|
|
|
$report = DB::table('report')->where('exam_id',$v['id'])->field('report_datetime,report_doctor_id,review_doctor_id')->find();
|
|
|
if($report){
|
|
|
- $report_doctor = DB::table('doctors')->where('id',$report['report_doctor_id'])->field('realname')->find();
|
|
|
- $review_doctor = DB::table('doctors')->where('id',$report['review_doctor_id'])->field('realname')->find();
|
|
|
- $list[$k]['review_doctor'] = $review_doctor['realname'];
|
|
|
- $list[$k]['report_doctor'] = $report_doctor['realname'];
|
|
|
- $list[$k]['report_datetime'] = $report['report_datetime'];
|
|
|
+ $report_doctor = DB::table('doctors')->where('id',$report['report_doctor_id'] ?? null)->field('realname')->find();
|
|
|
+ $review_doctor = DB::table('doctors')->where('id',$report['review_doctor_id'] ?? null)->field('realname')->find();
|
|
|
+ $list[$k]['review_doctor'] = $review_doctor['realname'] ?? null;
|
|
|
+ $list[$k]['report_doctor'] = $report_doctor['realname'] ?? null;
|
|
|
+ $list[$k]['report_datetime'] = $report['report_datetime'] ?? null;
|
|
|
}
|
|
|
}else{
|
|
|
$remote_name = DB::table('institution')->where('id',$doctor['institution_id'])->cache(300)->field('name')->find();
|
|
|
- $list[$k]['report_app_name'] = $remote_name['name'];
|
|
|
+ $list[$k]['report_app_name'] = $remote_name['name'] ?? null;
|
|
|
$project = DB::table('exam_project')->where('id',$v['exam_project'])->field('name')->find();
|
|
|
- $list[$k]['exam_project_name'] = $project['name'];
|
|
|
+ $list[$k]['exam_project_name'] = $project['name'] ?? null;
|
|
|
$report = DB::table('report')->where('exam_id',$v['id'])->field('report_datetime,report_doctor_id,review_doctor_id')->find();
|
|
|
if($report){
|
|
|
- $report_doctor = DB::table('doctors')->where('id',$report['report_doctor_id'])->field('realname')->find();
|
|
|
- $review_doctor = DB::table('doctors')->where('id',$report['review_doctor_id'])->field('realname')->find();
|
|
|
- $list[$k]['review_doctor'] = $review_doctor['realname'];
|
|
|
- $list[$k]['report_doctor'] = $report_doctor['realname'];
|
|
|
- $list[$k]['report_datetime'] = $report['report_datetime'];
|
|
|
+ $report_doctor = DB::table('doctors')->where('id',$report['report_doctor_id'] ?? null)->field('realname')->find();
|
|
|
+ $review_doctor = DB::table('doctors')->where('id',$report['review_doctor_id'] ?? null)->field('realname')->find();
|
|
|
+ $list[$k]['review_doctor'] = $review_doctor['realname'] ?? null;
|
|
|
+ $list[$k]['report_doctor'] = $report_doctor['realname'] ?? null;
|
|
|
+ $list[$k]['report_datetime'] = $report['report_datetime'] ?? null;
|
|
|
}else{
|
|
|
$list[$k]['report_doctor'] = '';
|
|
|
$list[$k]['report_datetime'] = '';
|
|
@@ -241,9 +241,9 @@ class Report extends Base
|
|
|
$list['institution'] = $institution;
|
|
|
}*/
|
|
|
return json_encode(['status'=>'ok','code'=>'0000','count'=>$count[0]['count(1)'],'info'=>$list,'sessionid'=>$sessionid]);
|
|
|
- }catch(\Exception $e){
|
|
|
- return json_encode(['status'=>'fail','code'=>'2000','msg'=>$e->getMessage()]);
|
|
|
- }
|
|
|
+// }catch(\Exception $e){
|
|
|
+// return json_encode(['status'=>'fail','code'=>'2000','msg'=>$e->getMessage()]);
|
|
|
+// }
|
|
|
|
|
|
}
|
|
|
|