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

# Conflicts:
#	application/inter/controller/Dcquery.php

application/config.php

@@ -15,7 +15,7 @@ return [
     // +----------------------------------------------------------------------
 
     // 应用调试模式
-    'app_debug'              => false,
+    'app_debug'              => true,
     // 应用Trace
     'app_trace'              => false,
     // 应用模式状态

application/inter/controller/Dcquery.php

@@ -168,7 +168,7 @@ class Dcquery extends Controller
             // }
             $info['studyInstanceUid'] = $study_info['studyuid'];
             $patient_info = DB::table('patient_infos')->where('id',$study_info['patient_id'])->field('birthday,institution_id,temp_patient_id,name,age,sex')->find();
-            $exams = DB::table('exams')->where('patient_id',$study_info['patient_id'])->field('exam_datetime,exam_class')->find();
+            $exams = DB::table('exams')->where('patient_id',$study_info['patient_id'])->field('exam_datetime, exam_class')->find();
             $institution = DB::table('institution')->where('id',$study_info['institution_id'])->field('name')->find();
             $info['patientName'] = $patient_info['name'];
             // 根据series_num排序