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

application/inter/controller/Dcquery.php

@@ -161,7 +161,6 @@ class Dcquery extends Controller
             // 根据series_num排序
             $series_list = DB::table('series')->where('study_id',$study_info['id'])->where('modality','not in','PR,SR')->field('id,series_num,seriesuid,description,modality')->order('series_num asc')->select();
             $series = array();
-            $error = 1;
             $ids = array();
             foreach($series_list as $k=>$v){
                 $ids[] = $v['id'];
@@ -229,8 +228,12 @@ class Dcquery extends Controller
             $info['institution'] = $institution['name'];
             $return['studies'][] = $info;
             Cache::set($study_id,json_encode($return), 1800);
+            Log::record('return');
+            Log::record($return);
             return json_encode($return);
         }catch(Exception $e){
+            Log::record('error');
+            Log::record($e->getMessage());
             echo $e->getMessage();
         }
     }