修改代码

application/inter/controller/Dcquery.php

@@ -294,20 +294,20 @@ class Dcquery extends Controller
     }*/
 
 
-    public function generateUrl($url, $address, $remote_url, $local_url, $status, $metadata, $image_url) {
+    public function generateUrl($url, $address, $remote_url, $local_url, $status, $metadata) {
         if(empty($address)) {
             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, $image_url);
+            return self::generateIpUrl($url,$address,$remote_url, $local_url, $status,$metadata);
         }
         return  self::generateNormalUrl($url,$address);
     }
-    public function generateIpUrl($url, $address, $remote_url, $local_url, $status,$metadata, $image_url) {
+    public function generateIpUrl($url, $address, $remote_url, $local_url, $status,$metadata) {
         
-        if (strpos($image_url, "dicomweb://zskk-dcm.oss-cn-beijing.aliyuncs.com")){
-            return str_replace('dicomweb://zskk-dcm.oss-cn-beijing.aliyuncs.com', $url.'/oss', $image_url);
+        if (strpos($image_url, "zskk-dcm.oss-cn-beijing.aliyuncs.com")){
+            return str_replace('zskk-dcm.oss-cn-beijing.aliyuncs.com', $address.'/oss', $image_url);
         }
         
         
@@ -377,7 +377,7 @@ class Dcquery extends Controller
         //     }
         // }
         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'], $image['url']));
+             $series[$seriesIndexMap[$image['series_id']]]['instances'][] = $this->generateImage1($image, $this->generateUrl($image['url'], $url, $image['remote_url'], $image['local_url'], $image['status'], $image['metadata']));
         }
         return $series;
     }