|
@@ -310,6 +310,8 @@ class Dcquery extends Controller
|
|
|
}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))) {
|
|
|
//浪潮政务云访问
|
|
|
return "dicomweb://$address/$remote_url";
|
|
@@ -325,7 +327,7 @@ class Dcquery extends Controller
|
|
|
}
|
|
|
}
|
|
|
if($status & (STATUS_LOCAL | STATUS_REMOTE)) {
|
|
|
- return "dicomweb://$address/$url";
|
|
|
+ return "dicomweb://$address/$url";
|
|
|
}
|
|
|
//浪潮政务云访问
|
|
|
return null;
|
|
@@ -364,11 +366,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 $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']));
|
|
|
}
|