lgy 6 年之前
父节点
当前提交
b8f297f695
共有 2 个文件被更改,包括 10 次插入7 次删除
  1. 4 4
      .idea/workspace.xml
  2. 6 3
      application/inter/controller/Dcquery.php

+ 4 - 4
.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.6173913">
-              <caret line="110" column="71" selection-start-line="110" selection-start-column="71" selection-end-line="110" selection-end-column="71" />
+            <state vertical-scroll-proportion="0.46434784">
+              <caret line="121" column="51" selection-start-line="121" selection-start-column="51" selection-end-line="121" selection-end-column="51" />
               <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.6173913">
-          <caret line="110" column="71" selection-start-line="110" selection-start-column="71" selection-end-line="110" selection-end-column="71" />
+        <state vertical-scroll-proportion="0.46434784">
+          <caret line="121" column="51" selection-start-line="121" selection-start-column="51" selection-end-line="121" selection-end-column="51" />
           <folding />
         </state>
       </provider>

+ 6 - 3
application/inter/controller/Dcquery.php

@@ -94,11 +94,11 @@ class Dcquery extends Controller
     public function get_studiesinfo(){
         $study_id = $_REQUEST['study_id'];
         $info = array();
-        $study_info = DB::table('studies')->where('id',$study_id)->field('studyuid,patient_id')->find();
+        $study_info = DB::table('studies')->where('id',$study_id)->field('studyuid,studyid,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();
+        $patient_info = DB::table('patient_infos')->where('id',$study_info['patient_id'])->field('institution_id,temp_patient_id,name,age,sex')->find();
         $date = DB::table('exams')->where('patient_id',$study_info['patient_id'])->field('exam_datetime')->find();
-
+        $institution = DB::table('institution')->where('id',$patient_info['institution_id'])->field('name')->find();
         $info['patientName'] = $patient_info['name'];
         // 根据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();
@@ -121,6 +121,9 @@ class Dcquery extends Controller
         $info['patientAge'] = $patient_info['age'];
         $info['patientSex'] = $patient_info['sex'];
         $info['studyDate'] = $date['exam_datetime'];
+        $info['studyid'] = $study_info['studyid'];
+        $info['patientId'] = $patient_info['temp_patient_id'];
+        $info['institution'] = $institution['name'];
         $return['studies'][] = $info;
         return json_encode($return);
     }