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

application/inter/controller/Registerlist.php

@@ -66,7 +66,7 @@ class Registerlist extends Base
                 if(!empty($param['exam_status'])){
                     $where = ' and e.exam_status = '.$param['exam_status'];
                 }
-                /*foreach ($search as $k => $v) {
+                foreach ($param as $k => $v) {
                     switch($k){
                         case 'name':
                             if(empty($v)){
@@ -104,9 +104,9 @@ class Registerlist extends Base
                             $where .= ' and e.'.$k.'=\''.$v.'\'';
                             break;
                     }
-                }*/
+                }
             }
-            $sql1 = "SELECT e.id,e.is_remote,e.study_id,e.patient_num,e.institution_id,e.exam_datetime,e.exam_class,e.exam_project,e.exam_status,p.name,p.sex,p.age from exams as e ,patient_infos as p where e.institution_id='".$doctor['institution_id']."' and p.id=e.patient_id and e.status!=0";
+            $sql1 = "SELECT e.id,e.is_remote,e.study_id,e.accession_num,e.patient_num,e.institution_id,e.exam_datetime,e.exam_class,e.exam_project,e.exam_status,p.name,p.sex,p.age from exams as e ,patient_infos as p where e.institution_id='".$doctor['institution_id']."' and p.id=e.patient_id and e.status!=0";
             //
             if(isset($param['search']) && !empty($param['search'])){
                 // 姓名  病历号  检查号