Dcquery

application/inter/controller/Dcquery.php

@@ -43,7 +43,7 @@ class Dcquery extends Controller
                     $seriesListData=array();
                     foreach($series as $key=>$val){
                         $seriesData=array();
-                        
+
                         $seriesData["seriesInstanceUid"]=$val["seriesuid"];
                         $seriesData["seriesDescription"]=$val["description"];
                         $imgs=Db::table("images")->where("series_id",$val["id"])->field("id,columns,image_number,rows,sop_uid,url,metadata")->select();
@@ -115,46 +115,6 @@ class Dcquery extends Controller
      *")
      **/
     public function get_studiesinfo(){
-<<<<<<< HEAD
-        $study_id = $_REQUEST['study_id'];
-        if(isset($_REQUEST['address']) && !empty($_REQUEST['address'])){
-            $url = $_REQUEST['address'];
-        }else{
-            $url = '';
-        }
-        $info = array();
-        if(strlen($study_id) == '16'){
-            $study_info = DB::table('studies')->where('id',$study_id)->field('id,studyuid,studyid,patient_id,institution_id')->find();
-        }else{
-            $study_info = DB::table('studies')->where('studyuid',$study_id)->field('id,studyuid,studyid,patient_id,institution_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();
-        $date = DB::table('exams')->where('patient_id',$study_info['patient_id'])->field('exam_datetime')->find();
-        $institution = DB::table('institution')->where('id',$study_info['institution_id'])->field('name')->find();
-        $info['patientName'] = $patient_info['name'];
-        // 根据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')->order('series_num asc')->select();
-        $series = array();
-        foreach($series_list as $k=>$v){
-            // image_number排序
-            $image = DB::table('images')->where('series_id',$v['id'])->field('remote_url,local_url,status,columns,image_number as instanceNumber,rows,image_id as sopInstanceUid,metadata,url,frame')->order('image_number asc')->select();
-            foreach($image as $key=>$value){
-                /*if(empty($url)){
-                    if(substr($value['metadata'], 0, strlen('group')) === 'group'){
-                        $image[$key]['url'] = "dicomweb://dcm.pacsonline.cn/".$value['metadata'];
-                    }else{
-                        $image[$key]['url'] = "dicomweb://static.dcm.pacsonline.cn/".$value['metadata'];
-                    }
-                }else{
-                    $image[$key]['url'] = $url.$value['metadata'];
-                }*/
-                $imageUrl = $this->generateUrl($value['url'],$url,$value['remote_url'],$value['local_url'],$value['status'],$value['metadata']);
-                if(!$imageUrl){
-                    $file = ROOT_PATH . 'public' . DS . 'get_studiesinfo/'.date('Ymd').'-fail.log';
-                    $log = 'url错误，传值为--'.$url;
-                    file_put_contents($file, $log,FILE_APPEND);
-=======
         try{
             $study_id = $_REQUEST['study_id'];
             if(isset($_REQUEST['address']) && !empty($_REQUEST['address'])){
@@ -181,7 +141,6 @@ class Dcquery extends Controller
                 // image_number排序
                 $image = DB::table('images')->where('series_id',$v['id'])->field('remote_url,local_url,status,columns,image_number as instanceNumber,rows,image_id as sopInstanceUid,metadata,url')->order('image_number asc')->select();
                 if(empty($image)){
->>>>>>> dfb61aa0cde67811d87676a8f24f7ceb2f3acf4b
                     continue;
                 }
                 $error = 2;
@@ -211,27 +170,6 @@ class Dcquery extends Controller
                 $series[$k]['seriesDescription'] = $v['description'];
                 $series[$k]['seriesNumber'] = $v['series_num'];
             }
-<<<<<<< HEAD
-            $series[$k]['instances'] = $image;
-            $series[$k]['seriesInstanceUid'] = $v['seriesuid'];
-            $series[$k]['seriesDescription'] = $v['description'];
-            $series[$k]['seriesNumber'] = $v['series_num'];
-        }
-        $info['seriesList'] = $series;
-
-        // $info['seriesList'] = $this->generateSeries($study_id, $url);
-
-        $return  = array();
-        $return['transactionId'] = $study_info['studyuid'];
-        if(!empty($patient_info['age'])){
-            $info['patientAge'] = $patient_info['age'];
-        }elseif(!empty($patient_info['birthday'])){
-            $time = date('Ymd',time());
-            $age = floor(($time - $patient_info['birthday'])/10000);
-            $info['patientAge'] =  $age;
-        }else{
-            $info['patientAge'] = '';
-=======
             if($error == 1){
                 throw new Exception('series列表为空');
             }
@@ -256,7 +194,6 @@ class Dcquery extends Controller
             return json_encode($return);
         }catch(Exception $e){
             echo $e->getMessage();
->>>>>>> dfb61aa0cde67811d87676a8f24f7ceb2f3acf4b
         }
     }