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

application/inter/controller/Inspectregister.php

@@ -402,7 +402,6 @@ class Inspectregister extends Base
             }
             //检查信息和申请信息
             $exam_info['institution_id']     = $doctor['institution_id'];
-            $exam_info['exam_status'] = 1; // 登记完成
             $exam_info['register_datetime']  = date('Y-m-d : H:i:s');
             $exam_info['phone']              = $doctor['phone'];
             $exam_info['patient_num']        = isset($param['pnum']) ? $param['pnum'] : '';
@@ -432,6 +431,7 @@ class Inspectregister extends Base
                 $exam = DB::table('exams')->where('id',$param['exam_id'])->update($exam_info);
             }else{
                 $exam_info['id']  = UUIDs::uuid16();
+                $exam_info['exam_status'] = 1; // 登记完成
                 $exam_info['createdAt'] = date('Y-m-d H:i:s',time());
                 $exam = DB::table('exams')->insert($exam_info);
             }

application/inter/controller/Report.php

@@ -166,7 +166,7 @@ class Report extends Base
                 $sql = '('.$sql1.') union ('.$sql2.') union ('.$sql3.')'.$limit;
             }else{*/
 
-            $sql = "SELECT a.id,a.severe,a.urgent,a.is_remote,a.accession_num,a.patient_num,a.exam_report,a.study_id,a.exam_datetime,a.exam_project,a.exam_status,a.exam_class,a.application_doctor,a.application_department,p.name,p.sex,p.age,ra.report_status FROM (exams as a,patient_infos as p) LEFT JOIN remote_application as ra on ra.exam_id=a.id where a.institution_id='".$doctor['institution_id']."' and p.id=a.patient_id and a.status=1 ".$where." order by a.createdAt desc".$limit;
+            $sql = "SELECT a.id,a.severe,a.urgent,a.is_remote,a.accession_num,a.patient_num,a.exam_report,a.study_id,a.exam_datetime,a.exam_project,a.exam_status,a.exam_class,a.application_doctor,a.application_department,p.name,p.sex,p.age,ra.report_status FROM (exams as a,patient_infos as p) LEFT JOIN remote_application as ra on ra.exam_id=a.id where a.institution_id='".$doctor['institution_id']."' and p.id=a.patient_id and a.status=1 and a.exam_status>2 ".$where." order by a.createdAt desc".$limit;
 //            }
             // if($doctor['institution_id'] == '13000003' and $page == 1 and empty($where)){
             //     if(Cache::get('13000003_2')){
@@ -179,7 +179,7 @@ class Report extends Base
             //     $list = DB::query($sql);
             // }
             $list = DB::query($sql);
-            $csql = "SELECT count(1) FROM (exams as a,patient_infos as p) LEFT JOIN remote_application as ra on ra.exam_id=a.id where a.institution_id='".$doctor['institution_id']."' and p.id=a.patient_id and a.status=1 ".$where;
+            $csql = "SELECT count(1) FROM (exams as a,patient_infos as p) LEFT JOIN remote_application as ra on ra.exam_id=a.id where a.institution_id='".$doctor['institution_id']."' and p.id=a.patient_id and a.status=1  and a.exam_status>2 ".$where;
             $count = DB::query($csql);
             log::record('请求的sql语句');
             log::record($sql);