刘桂岩 пре 5 година
родитељ
комит
b8cbd51109
1 измењених фајлова са 4 додато и 4 уклоњено
  1. 4 4
      application/inter/controller/Dcquery.php

+ 4 - 4
application/inter/controller/Dcquery.php

@@ -84,7 +84,7 @@ class Dcquery extends Controller
         $series_list = DB::table('series')->where('study_id',$study_id)->field('id,seriesuid,description')->select();
         $series = array();
         foreach($series_list as $k=>$v){
-            $image = DB::table('images')->where('series_id',$v['id'])->field('columns,imageNumber as instanceNumber,rows,image_id as sopInstanceUid,url,frame')->select();
+            $image = DB::table('images')->where('series_id',$v['id'])->field('columns,imageNumber as instanceNumber,rows,imageId as sopInstanceUid,url,frame')->select();
             foreach($image as $key=>$value){
                 $image[$key]['url'] = 'http://dcm.pacsonline.cn/'.$value['url'];
             }
@@ -179,9 +179,9 @@ class Dcquery extends Controller
                 $ids[] = $v['id'];
             }
             if($patient_info['institution_id'] == '15000004') {
-                $images_list = DB::table('images')->whereNotNull('imageNumber')->where('series_id','in',$ids)->field('frame,series_id,cineRate,remote_url,local_url,status,columns,imageNumber as instanceNumber,rows,image_id as sopInstanceUid,metadata,url')->order('imageNumber asc')->select();
+                $images_list = DB::table('images')->whereNotNull('imageNumber')->where('series_id','in',$ids)->field('frame,series_id,cineRate,remote_url,local_url,status,columns,imageNumber as instanceNumber,rows,imageId as sopInstanceUid,metadata,url')->order('imageNumber asc')->select();
             } else {
-                $images_list = DB::table('images')->where('series_id','in',$ids)->field('frame,series_id,cineRate,remote_url,local_url,status,columns,imageNumber as instanceNumber,rows,image_id as sopInstanceUid,metadata,url')->order('imageNumber asc')->select();
+                $images_list = DB::table('images')->where('series_id','in',$ids)->field('frame,series_id,cineRate,remote_url,local_url,status,columns,imageNumber as instanceNumber,rows,imageId as sopInstanceUid,metadata,url')->order('imageNumber asc')->select();
             }
             if(empty($images_list)){
                 return json_encode([
@@ -292,7 +292,7 @@ class Dcquery extends Controller
     }*/
 
     /*public function generateSeriesSingle($serie, $url) {
-        $images_list = DB::table('images')->where('series_id',$serie['id'])->field('remote_url,local_url,status,columns,imageNumber as instanceNumber,rows,image_id as sopInstanceUid,metadata,url,frame')->order('imageNumber asc')->select();
+        $images_list = DB::table('images')->where('series_id',$serie['id'])->field('remote_url,local_url,status,columns,imageNumber as instanceNumber,rows,imageId as sopInstanceUid,metadata,url,frame')->order('imageNumber asc')->select();
         $series = array();
         $images = array();
         $seriesCount = 0;