xiugai Dcquery.php

application/inter/controller/Dcquery.php

@@ -208,7 +208,7 @@ class Dcquery extends Controller
     }
 
 
-    public function generateSeries($study_id, $url) {
+    /*public function generateSeries($study_id, $url) {
         $series = array();
         $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();
         $seriesIndex = 0;
@@ -218,9 +218,9 @@ class Dcquery extends Controller
             $seriesIndex++;
         }
         return $series;
-    }
+    }*/
 
-    public function generateSeriesSingle($serie, $url) {
+    /*public function generateSeriesSingle($serie, $url) {
         $images_list = DB::table('images')->where('series_id',$serie['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();
         $series = array();
         $images = array();
@@ -268,9 +268,9 @@ class Dcquery extends Controller
             ]);
         }
         return $series;
-    }
+    }*/
 
-    public function generateImage($image,$url,$frameIndex = -1) {
+    /*public function generateImage($image,$url,$frameIndex = -1) {
         $image_url = $url;
         $imageNumber = $image['instanceNumber'];
         if($frameIndex !== -1) {
@@ -291,7 +291,7 @@ class Dcquery extends Controller
             'frame' => $image['frame'],
             'frameIndex' => $frameIndex,
         ];
-    }
+    }*/
 
 
     public function generateUrl($url, $address, $remote_url, $local_url, $status, $metadata) {
@@ -299,6 +299,7 @@ class Dcquery extends Controller
             return self::generateNormalUrl($url);
         }
         if(preg_match("/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/",$address)) {
+
             return self::generateIpUrl($url,$address,$remote_url, $local_url, $status,$metadata);
         }
         return  self::generateNormalUrl($url,$address);
@@ -363,6 +364,11 @@ class Dcquery extends Controller
             $series[$k] = $this->generateSerie($v);
             $seriesIndexMap[$v['id']] = $k;
         }
+        foreach($images_list as $k=>$v){
+            if (strpos($v['url'], "zskk-dcm.oss-cn-beijing.aliyuncs.com")){
+                $images_list[$k]['url'] = str_replace('zskk-dcm.oss-cn-beijing.aliyuncs.com', $url.'/oss', $images_list[$k]['url']);
+            }
+        }
         foreach($images_list as $image) {
              $series[$seriesIndexMap[$image['series_id']]]['instances'][] = $this->generateImage1($image, $this->generateUrl($image['url'], $url, $image['remote_url'], $image['local_url'], $image['status'], $image['metadata']));
         }