|
|
@@ -193,7 +193,7 @@ class Dcquery extends Controller
|
|
|
$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;
|
|
|
$series = array();
|
|
|
- while($seriesIndex < siezof($series_list)) {
|
|
|
+ while($seriesIndex < count($series_list)) {
|
|
|
$series = array_merge($series, $this->generateSeriesArray($series_list[$seriesIndex], $url));
|
|
|
$seriesIndex++;
|
|
|
}
|
|
|
@@ -206,14 +206,14 @@ class Dcquery extends Controller
|
|
|
$images = array();
|
|
|
$seriesCount = 0;
|
|
|
$imagesIndex = 0;
|
|
|
- while($imagesIndex < sizeof($images_list)) {
|
|
|
+ while($imagesIndex < count($images_list)) {
|
|
|
$image = $images_list[$imagesIndex];
|
|
|
$imageUrl = $this->generateUrl($image['url'], $url, $image['remote_url'], $image['local_url'], $image['status'], $image['metadata']);
|
|
|
$frame = $image['frame'];
|
|
|
if($frame === 0) {
|
|
|
$images.push($this->generateImage($image, $imageUrl));
|
|
|
} else {
|
|
|
- if(sizeof($images) != 0) {
|
|
|
+ if(count($images) != 0) {
|
|
|
$series.push([
|
|
|
'instances' => $images,
|
|
|
'seriesInstanceUid' => $serie['seriesuid'],
|
fuyu