series

.idea/workspace.xml

@@ -67,8 +67,8 @@
       <file leaf-file-name="Dcquery.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/application/inter/controller/Dcquery.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.84695655">
-              <caret line="116" column="53" selection-start-line="116" selection-start-column="53" selection-end-line="116" selection-end-column="53" />
+            <state vertical-scroll-proportion="0.8086957">
+              <caret line="115" column="56" selection-start-line="115" selection-start-column="46" selection-end-line="115" selection-end-column="56" />
               <folding />
             </state>
           </provider>
@@ -856,8 +856,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Dcquery.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.84695655">
-          <caret line="116" column="53" selection-start-line="116" selection-start-column="53" selection-end-line="116" selection-end-column="53" />
+        <state vertical-scroll-proportion="0.8086957">
+          <caret line="115" column="56" selection-start-line="115" selection-start-column="46" selection-end-line="115" selection-end-column="56" />
           <folding />
         </state>
       </provider>

application/inter/controller/Dcquery.php

@@ -97,24 +97,31 @@ class Dcquery extends Controller
         $study_info = DB::table('studies')->where('id',$study_id)->field('studyuid,patient_id')->find();
         $info['studyInstanceUid'] = $study_info['studyuid'];
         $patient_info = DB::table('patient_infos')->where('id',$study_info['patient_id'])->field('name,age,sex')->find();
+        $date = DB::table('exams')->where('patient_id',$study_info['patient_id'])->field('exam_datetime')->find();
+
         $info['patientName'] = $patient_info['name'];
-        $series_list = DB::table('series')->where('study_id',$study_id)->where('modality','not in','PR,SR')->field('id,seriesuid,description')->select();
+        // 根据series_num排序
+        $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();
         $series = array();
         foreach($series_list as $k=>$v){
-            $image = DB::table('images')->where('series_id',$v['id'])->field('columns,image_number as instanceNumber,rows,image_id as sopInstanceUid,url')->select();
+            // image_number排序
+            $image = DB::table('images')->where('series_id',$v['id'])->field('columns,image_number as instanceNumber,rows,image_id as sopInstanceUid,url')->order('image_number asc')->select();
             foreach($image as $key=>$value){
                 $image[$key]['url'] = 'dicomweb://dcm.pacsonline.cn/'.$value['url'];
+                $image[$key]['imageNumber'] = $value['instanceNumber'];
             }
             $series[$k]['instances'] = $image;
             $series[$k]['seriesInstanceUid'] = $v['seriesuid'];
             $series[$k]['seriesDescription'] = $v['description'];
+            $series[$k]['seriesNumber'] = $v['series_num'];
         }
         $info['seriesList'] = $series;
         $return  = array();
         $return['transactionId'] = $study_info['studyuid'];
+        $info['patientAge'] = $patient_info['age'];
+        $info['patientSex'] = $patient_info['sex'];
+        $info['studyDate'] = $date['exam_datetime'];
         $return['studies'][] = $info;
-        $return['patientAge'] = $patient_info['age'];
-        $return['patientSex'] = $patient_info['sex'];
         return json_encode($return);
     }
 }