|
|
@@ -122,9 +122,9 @@ class Dcquery extends Controller
|
|
|
}
|
|
|
$info = array();
|
|
|
if(strlen($study_id) == '16'){
|
|
|
- $study_info = DB::table('studies')->where('id',$study_id)->field('studyuid,studyid,patient_id')->find();
|
|
|
+ $study_info = DB::table('studies')->where('id',$study_id)->field('id,studyuid,studyid,patient_id')->find();
|
|
|
}else{
|
|
|
- $study_info = DB::table('studies')->where('studyuid',$study_id)->field('studyuid,studyid,patient_id')->find();
|
|
|
+ $study_info = DB::table('studies')->where('studyuid',$study_id)->field('id,studyuid,studyid,patient_id')->find();
|
|
|
}
|
|
|
$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();
|
|
|
@@ -132,11 +132,7 @@ class Dcquery extends Controller
|
|
|
$institution = DB::table('institution')->where('id',$patient_info['institution_id'])->field('name')->find();
|
|
|
$info['patientName'] = $patient_info['name'];
|
|
|
// 根据series_num排序
|
|
|
- if(strlen($study_id) == '16'){
|
|
|
- $series_list = DB::table('series')->where('study_id',$study_id)->where('modality','not in','PR,SR')->field('id,series_num,seriesuid,description')->order('series_num asc')->select();
|
|
|
- }else{
|
|
|
- $series_list = DB::table('series')->where('studyuid',$study_id)->where('modality','not in','PR,SR')->field('id,series_num,seriesuid,description')->order('series_num asc')->select();
|
|
|
- }
|
|
|
+ $series_list = DB::table('series')->where('study_id',$study_info['id'])->where('modality','not in','PR,SR')->field('id,series_num,seriesuid,description')->order('series_num asc')->select();
|
|
|
$series = array();
|
|
|
foreach($series_list as $k=>$v){
|
|
|
// image_number排序
|
lgy