|
@@ -304,13 +304,18 @@ class Dcquery extends Controller
|
|
|
}
|
|
|
return self::generateNormalUrl($url,$address);
|
|
|
}
|
|
|
- public function generateIpUrl($url, $address, $remote_url, $local_url, $status,$metadata) {
|
|
|
+ public function generateIpUrl($url, $address, $remote_url, $local_url, $status,$metadata, $image_url) {
|
|
|
+
|
|
|
+ if (strpos($image_url, "zskk-dcm.oss-cn-beijing.aliyuncs.com")){
|
|
|
+ return str_replace('zskk-dcm.oss-cn-beijing.aliyuncs.com', $url.'/oss', $image_url);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
if(empty($remote_url) && empty($local_url)){
|
|
|
return 'dicomweb://'.$address.'/'.$metadata;
|
|
|
}else{
|
|
|
//获取ip
|
|
|
$ip = $this->getIpbyAddress($address);
|
|
|
- $images_list[$k]['url'] = str_replace('zskk-dcm.oss-cn-beijing.aliyuncs.com', $url.'/oss', $images_list[$k]['url']);
|
|
|
|
|
|
if(in_array($ip,json_decode(LC_WAN_IPS,TRUE))) {
|
|
|
//浪潮政务云访问
|
|
@@ -372,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']));
|
|
|
+ $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']));
|
|
|
}
|
|
|
return $series;
|
|
|
}
|