xiugai diquery

.idea/workspace.xml

@@ -25,7 +25,7 @@
       <file leaf-file-name="Index.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-10.645162">
+            <state vertical-scroll-proportion="0.0">
               <caret line="38" column="22" selection-start-line="38" selection-start-column="22" selection-end-line="38" selection-end-column="22" />
               <folding>
                 <marker date="1541039464853" expanded="true" signature="4426:4470" placeholder="select count... templates" />
@@ -47,15 +47,14 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Writereport.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="Writereport.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.32869565">
-              <caret line="282" column="8" selection-start-line="282" selection-start-column="8" selection-end-line="282" selection-end-column="8" />
+            <state vertical-scroll-proportion="-2.9672132">
+              <caret line="60" column="74" selection-start-line="60" selection-start-column="70" selection-end-line="60" selection-end-column="74" />
               <folding>
                 <element signature="e#260#2235#0#PHP" expanded="false" />
                 <element signature="e#5629#6944#0#PHP" expanded="false" />
-                <element signature="e#6949#7552#0#PHP" expanded="false" />
                 <element signature="e#7557#10222#0#PHP" expanded="false" />
                 <marker date="1541064875727" expanded="true" signature="6390:6841" placeholder="..." />
                 <marker date="1541064875727" expanded="true" signature="8560:10102" placeholder="..." />
@@ -77,6 +76,16 @@
           </provider>
         </entry>
       </file>
+      <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.19652174">
+              <caret line="130" column="100" selection-start-line="130" selection-start-column="100" selection-end-line="130" selection-end-column="100" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="Login.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/inter/controller/Login.php">
           <provider selected="true" editor-type-id="text-editor">
@@ -128,7 +137,7 @@
       <file leaf-file-name="Doctors.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/inter/controller/Doctors.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="15.5161295">
+            <state vertical-scroll-proportion="0.0">
               <caret line="200" column="18" selection-start-line="200" selection-start-column="18" selection-end-line="200" selection-end-column="18" />
               <folding />
             </state>
@@ -171,7 +180,6 @@
         <option value="$PROJECT_DIR$/thinkphp/library/think/Loader.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Examclass.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Examproject.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Dcquery.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Operating.php" />
         <option value="$PROJECT_DIR$/public/api.html" />
         <option value="$PROJECT_DIR$/../../../bin/apache/apache2.4.23/conf/extra/httpd-vhosts.conf" />
@@ -188,6 +196,7 @@
         <option value="$PROJECT_DIR$/application/inter/controller/Index.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Doctors.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Writereport.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Dcquery.php" />
       </list>
     </option>
   </component>
@@ -685,7 +694,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="1.0330435">
           <caret line="36" column="90" selection-start-line="36" selection-start-column="90" selection-end-line="36" selection-end-column="90" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -703,13 +711,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Dcquery.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.13114753">
-          <caret line="20" column="14" selection-start-line="20" selection-start-column="9" selection-end-line="20" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Messages.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-2.9672132">
@@ -728,7 +729,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="161" column="39" selection-start-line="161" selection-start-column="32" selection-end-line="161" selection-end-column="39" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -798,13 +798,12 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-2.8387096">
           <caret line="16" column="6" selection-start-line="16" selection-start-column="6" selection-end-line="16" selection-end-column="6" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-10.645162">
+        <state vertical-scroll-proportion="0.0">
           <caret line="38" column="22" selection-start-line="38" selection-start-column="22" selection-end-line="38" selection-end-column="22" />
           <folding>
             <marker date="1541039464853" expanded="true" signature="4426:4470" placeholder="select count... templates" />
@@ -814,7 +813,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Doctors.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="15.5161295">
+        <state vertical-scroll-proportion="0.0">
           <caret line="200" column="18" selection-start-line="200" selection-start-column="18" selection-end-line="200" selection-end-column="18" />
           <folding />
         </state>
@@ -822,12 +821,11 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.32869565">
-          <caret line="282" column="8" selection-start-line="282" selection-start-column="8" selection-end-line="282" selection-end-column="8" />
+        <state vertical-scroll-proportion="-2.9672132">
+          <caret line="60" column="74" selection-start-line="60" selection-start-column="70" selection-end-line="60" selection-end-column="74" />
           <folding>
             <element signature="e#260#2235#0#PHP" expanded="false" />
             <element signature="e#5629#6944#0#PHP" expanded="false" />
-            <element signature="e#6949#7552#0#PHP" expanded="false" />
             <element signature="e#7557#10222#0#PHP" expanded="false" />
             <marker date="1541064875727" expanded="true" signature="6390:6841" placeholder="..." />
             <marker date="1541064875727" expanded="true" signature="8560:10102" placeholder="..." />
@@ -848,6 +846,14 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Dcquery.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.19652174">
+          <caret line="130" column="100" selection-start-line="130" selection-start-column="100" selection-end-line="130" selection-end-column="100" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

application/inter/controller/Dcquery.php

@@ -128,7 +128,7 @@ class Dcquery extends Controller
         $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();
+        $series_list = DB::table('series')->where('study_id',$study_id)->where('modality','not in','SR')->field('id,series_num,seriesuid,description')->order('series_num asc')->select();
         $series = array();
         foreach($series_list as $k=>$v){
             // image_number排序