|
|
@@ -146,6 +146,7 @@ class Dcquery extends Controller
|
|
|
throw new \think\Exception('series列表中影像为空');
|
|
|
}
|
|
|
$series = $this->testHandleSeires($series_list , $images_list , $url);
|
|
|
+
|
|
|
// foreach($series_list as $k=>$v){
|
|
|
// // image_number排序
|
|
|
// $image = DB::table('images')->where('series_id',$v['id'])->field('cineRate,remote_url,local_url,status,columns,image_number as instanceNumber,rows,image_id as sopInstanceUid,metadata,url')->order('image_number asc')->select();
|
|
|
@@ -363,8 +364,9 @@ class Dcquery extends Controller
|
|
|
$seriesIndexMap[$v['id']] = $k;
|
|
|
}
|
|
|
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']));
|
|
|
}
|
|
|
+ return $series;
|
|
|
}
|
|
|
|
|
|
public function generateSerie($serie) {
|
lgy