xg

application/inter/controller/Application.php

@@ -197,11 +197,11 @@ class Application extends Base
             //申请信息
             if(isset($param['rid']) && !empty($param['rid'])){
                 $rid = $param['rid'];
-                $application = DB::table('remote_application')->where('id',$rid)->field(['id,report_status,id,remote_doctor_id','application_desc','attachment','req_doctor_id','illness_desc','phys_sign','is_urgent','clin_symp','anamnesis','family_ill','remark','clin_diag'])->find();
+                $application = DB::table('remote_application')->where('id',$rid)->field(['id,remote_institution_id,report_status,id,remote_doctor_id','application_desc','attachment','req_doctor_id','illness_desc','phys_sign','is_urgent','clin_symp','anamnesis','family_ill','remark','clin_diag'])->find();
                 $aid = $application['id'];
             }else{
                 $rid = '';
-                $application = DB::table('remote_application')->where('exam_id',$id)->field(['id,report_status,id,remote_doctor_id','application_desc','attachment','req_doctor_id','illness_desc','phys_sign','clin_symp','is_urgent','anamnesis','family_ill','remark','clin_diag'])->find();
+                $application = DB::table('remote_application')->where('exam_id',$id)->field(['id,remote_institution_id,report_status,id,remote_doctor_id','application_desc','attachment','req_doctor_id','illness_desc','phys_sign','clin_symp','is_urgent','anamnesis','family_ill','remark','clin_diag'])->find();
                 $aid = $application['id'];
             }
             $remote_order =  DB::table('remote_order')
@@ -238,9 +238,12 @@ class Application extends Base
                 }
                 $exam_application['report_status'] = '';
                 $exam_application['remark'] = '';
+                $exam_application['remote_institution'] = '';
                 $info['application'] = $exam_application;
             }else{
                 $remote_name = DB::table('doctors')->where('id',$application['remote_doctor_id'])->field('realname')->find();
+                $remote_institution = DB::table('institution')->where('id',$application['remote_institution'])->value('name');
+                $application['remote_institution'] = $remote_institution;
                 $application['remote_doctor'] = $remote_name['realname'];
                 if(empty($application['anamnesis'])){
                     $application['anamnesis'] = '';