修改代码

application/inter/controller/Dcquery.php

@@ -132,40 +132,40 @@ class Dcquery extends Controller
         $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);
-        //             continue;
-        //         }
-        //         $image[$key]['url'] = $imageUrl;
-        //         $image[$key]['imageNumber'] = $value['instanceNumber'];
+        $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);
+                    continue;
+                }
+                $image[$key]['url'] = $imageUrl;
+                $image[$key]['imageNumber'] = $value['instanceNumber'];
 
-        //     }
-        //     $series[$k]['instances'] = $image;
-        //     $series[$k]['seriesInstanceUid'] = $v['seriesuid'];
-        //     $series[$k]['seriesDescription'] = $v['description'];
-        //     $series[$k]['seriesNumber'] = $v['series_num'];
-        // }
-        // $info['seriesList'] = $series;
+            }
+            $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);
+        // $info['seriesList'] = $this->generateSeries($study_id, $url);
 
         $return  = array();
         $return['transactionId'] = $study_info['studyuid'];