Browse Source

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

fuyu 5 years ago
parent
commit
05b4928638
1 changed files with 15 additions and 3 deletions
  1. 15 3
      application/inter/controller/Writereport.php

+ 15 - 3
application/inter/controller/Writereport.php

@@ -61,7 +61,7 @@ class Writereport extends Base
             $institution = DB::table('institution')->where('id',$doctor['institution_id'])->field('name,report_subtitle')->find();
             $param = $_REQUEST['param'];
             $id = $param['id'];
-            $info = DB::table('exams')->where('id',$id)->field(['id','ext','study_id','exam_class','exam_status','exam_datetime','exam_sub_class','body_part','accession_num','patient_id','film_type'])->find();
+            $info = DB::table('exams')->where('id',$id)->field(['id','ext','study_id','exam_class','exam_status','exam_datetime','exam_sub_class','body_part','accession_num','patient_id','film_type','patient_area','bed_no','hopitalized_no'])->find();
             $exam_class = DB::table('constant')->where('id',$info['exam_class'])->field('constant_value')->find();
             $info['exam_class'] = $exam_class['constant_value'];
             $exam_subclass = DB::table('exam_subclass')->where('id',$info['exam_sub_class'])->field('name')->find();
@@ -114,6 +114,9 @@ class Writereport extends Base
                 $info['sex'] = isset($cache['sex']) ? $cache['sex'] : '';
                 $info['age'] = isset($cache['age']) ? $cache['age'] : '';
                 $info['phone'] = isset($cache['phone']) ? $cache['phone'] : '';
+                $info['patient_area']    = isset($cache['patient_area']) ? $cache['patient_area'] : '';
+                $info['hopitalized_no']    = isset($cache['hopitalized_no']) ? $cache['hopitalized_no'] : '';
+                $info['bed_no']    = isset($cache['bed_no']) ? $cache['bed_no'] : '';
             }
             return json_encode(['status'=>'ok','code'=>'0000','info'=>$info,'sessionid'=>$sessionid,'is_remote'=>$is_remote]);
         }catch(\Exception $e){
@@ -268,12 +271,19 @@ class Writereport extends Base
             $info['exam_id'] = $param['id'];
             $info['impression']       = isset($param['impression']) ? $param['impression'] : '';
             $info['description']      = isset($param['description']) ? $param['description'] : '';
+            $exam_info = [];
+            $exam_info['patient_area']    = isset($param['patient_area']) ? $param['patient_area'] : '';
+            $exam_info['hopitalized_no']    = isset($param['hopitalized_no']) ? $param['hopitalized_no'] : '';
+            $exam_info['bed_no']    = isset($param['bed_no']) ? $param['bed_no'] : '';
+            $exam_info['film_type']    = $film_type;
+            $exam_info['phone']    = isset($param['phone']) ? $param['phone'] : '';
+            $exam_info['exam_report']    = isset($param['report_result']) ? $param['report_result'] : '';
             if(isset($param['r_result']) && $param['r_result'] == 'true'){
                 $info['report_result'] = 2;
             }else{
                 $info['report_result'] = 1;
             }
-            DB::table('exams')->where('id',$param['id'])->update(['film_type'=>$film_type,'phone'=>isset($param['phone']) ? $param['phone'] : '','exam_report'=>$info['report_result']]);
+            DB::table('exams')->where('id',$param['id'])->update($exam_info);
             // 报告的id
             $report_id = $param['report_id'];
             if(isset($_REQUEST['is_remote']) && !empty($_REQUEST['is_remote'])){
@@ -908,9 +918,10 @@ class Writereport extends Base
             $report = DB::table('report')->where('id',$report_id)->field('qr_code,remote_application_id,report_datetime,impression,description,report_doctor_id,review_doctor_id')->find();
             $info = array();
             // 检查日期 住院号 床号 本地申请科室 本地申请医生
-            $exam_info = DB::table('exams')->where('id',$id)->field('id,ext,accession_num,exam_datetime,exam_class,hopitalized_no,bed_no,exam_project,patient_id,application_department,application_doctor')->find();
+            $exam_info = DB::table('exams')->where('id',$id)->field('id,ext,accession_num,exam_datetime,exam_class,hopitalized_no,bed_no,exam_project,patient_id,application_department,application_doctor,patient_area')->find();
             $info['id'] = $exam_info['id'];
             $info['ext'] = $exam_info['ext'];
+            $info['patient_area'] = $exam_info['patient_area'];
             $info['accession_num'] = $exam_info['accession_num'];
             if(!empty($exam_info['exam_datetime'])){
                 $datetime = explode(' ',$exam_info['exam_datetime']);
@@ -1179,6 +1190,7 @@ class Writereport extends Base
         }*/
         $doctor = Cache::get($sessionid);
         $is_remote = $_REQUEST['is_remote'];
+        $param = $_REQUEST['param'];
         $patient_info['name']       = isset($param['name']) ? $param['name'] : '';
         $patient_info['sex']       = isset($param['sex']) ? $param['sex'] : '';
         $patient_info['age']       = isset($param['age']) ? $param['age'] : '';