Merge branch 'dev' of http://code.pacsonline.cn/zskk_bg/yuanchengpasc into pro

.idea/workspace.xml

@@ -22,55 +22,14 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <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="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" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Report.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="125" column="34" selection-start-line="118" selection-start-column="34" selection-end-line="125" selection-end-column="34" />
-              <folding>
-                <marker date="1540968561181" expanded="true" signature="8028:8325" placeholder="SELECT a.id,... exams" />
-                <marker date="1540968561181" expanded="true" signature="8409:8537" placeholder="SELECT count... exams" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Writereport.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
+      <file leaf-file-name="Reciveremote.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.php">
           <provider selected="true" editor-type-id="text-editor">
-            <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" />
+            <state vertical-scroll-proportion="-0.7096774">
+              <caret line="70" column="42" selection-start-line="70" selection-start-column="42" selection-end-line="70" selection-end-column="42" />
               <folding>
-                <element signature="e#260#2235#0#PHP" expanded="false" />
-                <element signature="e#5629#6944#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="..." />
-                <marker date="1541064875727" expanded="true" signature="8678:10102" placeholder="..." />
-                <marker date="1541064875727" expanded="true" signature="8796:10102" placeholder="..." />
-                <marker date="1541064875727" expanded="true" signature="8913:10102" placeholder="..." />
-                <marker date="1541064875727" expanded="true" signature="9030:10102" placeholder="..." />
-                <marker date="1541064875727" expanded="true" signature="9154:10102" placeholder="..." />
-                <marker date="1541064875727" expanded="true" signature="9279:10102" placeholder="..." />
-                <marker date="1541064875727" expanded="true" signature="9400:10102" placeholder="..." />
-                <marker date="1541064875727" expanded="true" signature="9522:10102" placeholder="..." />
-                <marker date="1541064875727" expanded="true" signature="19448:20014" placeholder="..." />
-                <marker date="1541064875727" expanded="true" signature="22676:23497" placeholder="..." />
-                <marker date="1541064875727" expanded="true" signature="22800:23497" placeholder="..." />
-                <marker date="1541064875727" expanded="true" signature="22925:23497" placeholder="..." />
-                <marker date="1541064875727" expanded="true" signature="23047:23497" placeholder="..." />
+                <marker date="1540865902230" expanded="true" signature="7641:8111" placeholder="SELECT e.exa... exams" />
+                <marker date="1540865902230" expanded="true" signature="8219:8432" placeholder="SELECT count... exams" />
               </folding>
             </state>
           </provider>
@@ -79,84 +38,13 @@
       <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">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="34" column="39" selection-start-line="34" selection-start-column="32" selection-end-line="34" selection-end-column="39" />
-              <folding>
-                <marker date="1540865309911" expanded="true" signature="4055:4226" placeholder="SELECT m.id,... menu" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Inspectregister.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="396" column="99" selection-start-line="396" selection-start-column="99" selection-end-line="396" selection-end-column="99" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Registerlist.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/inter/controller/Registerlist.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="101" column="39" selection-start-line="101" selection-start-column="39" selection-end-line="101" selection-end-column="39" />
-              <folding>
-                <marker date="1540979388512" expanded="true" signature="5197:5452" placeholder="SELECT e.id,... exams" />
-                <marker date="1540979388512" expanded="true" signature="5483:5789" placeholder="SELECT e.id,... exams" />
-                <marker date="1540979388512" expanded="true" signature="6713:6841" placeholder="SELECT count... exams" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Application.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="290" column="57" selection-start-line="290" selection-start-column="57" selection-end-line="290" selection-end-column="57" />
-              <folding>
-                <element signature="e#13107#14413#0#PHP" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <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="0.0">
-              <caret line="200" column="18" selection-start-line="200" selection-start-column="18" selection-end-line="200" selection-end-column="18" />
+            <state vertical-scroll-proportion="0.5026087">
+              <caret line="129" column="25" selection-start-line="129" selection-start-column="25" selection-end-line="129" selection-end-column="25" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Reciveremote.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="76" column="34" selection-start-line="76" selection-start-column="34" selection-end-line="83" selection-end-column="34" />
-              <folding>
-                <marker date="1540865902230" expanded="true" signature="7641:8111" placeholder="SELECT e.exa... exams" />
-                <marker date="1540865902230" expanded="true" signature="8219:8432" placeholder="SELECT count... exams" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="IdeDocumentHistory">
@@ -732,38 +620,64 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="76" column="34" selection-start-line="76" selection-start-column="34" selection-end-line="83" selection-end-column="34" />
+          <caret line="125" column="34" selection-start-line="118" selection-start-column="34" selection-end-line="125" selection-end-column="34" />
           <folding>
-            <marker date="1540865902230" expanded="true" signature="7641:8111" placeholder="SELECT e.exa... exams" />
-            <marker date="1540865902230" expanded="true" signature="8219:8432" placeholder="SELECT count... exams" />
+            <marker date="1540968561181" expanded="true" signature="8028:8325" placeholder="SELECT a.id,... exams" />
+            <marker date="1540968561181" expanded="true" signature="8409:8537" placeholder="SELECT count... exams" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.php">
+    <entry file="file://$PROJECT_DIR$/application/database.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="396" column="99" selection-start-line="396" selection-start-column="99" selection-end-line="396" selection-end-column="99" />
-          <folding />
+        <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" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="290" column="57" selection-start-line="290" selection-start-column="57" selection-end-line="290" selection-end-column="57" />
+        <state vertical-scroll-proportion="-23.419355">
+          <caret line="38" column="22" selection-start-line="38" selection-start-column="22" selection-end-line="38" selection-end-column="22" />
           <folding>
-            <element signature="e#13107#14413#0#PHP" expanded="false" />
+            <marker date="1541039464853" expanded="true" signature="4426:4470" placeholder="select count... templates" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.21100917">
+          <caret line="57" column="46" selection-start-line="57" selection-start-column="46" selection-end-line="57" selection-end-column="46" />
+          <folding>
+            <element signature="e#260#2235#0#PHP" expanded="false" />
+            <element signature="e#5629#6944#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="..." />
+            <marker date="1541064875727" expanded="true" signature="8678:10102" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="8796:10102" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="8913:10102" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="9030:10102" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="9154:10102" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="9279:10102" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="9400:10102" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="9522:10102" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="19448:20014" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="22676:23497" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="22800:23497" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="22925:23497" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="23047:23497" placeholder="..." />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Login.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state vertical-scroll-proportion="0.03826087">
           <caret line="34" column="39" selection-start-line="34" selection-start-column="32" selection-end-line="34" selection-end-column="39" />
           <folding>
             <marker date="1540865309911" expanded="true" signature="4055:4226" placeholder="SELECT m.id,... menu" />
@@ -771,20 +685,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="125" column="34" selection-start-line="118" selection-start-column="34" selection-end-line="125" selection-end-column="34" />
-          <folding>
-            <marker date="1540968561181" expanded="true" signature="8028:8325" placeholder="SELECT a.id,... exams" />
-            <marker date="1540968561181" expanded="true" signature="8409:8537" placeholder="SELECT count... exams" />
-          </folding>
+        <state vertical-scroll-proportion="0.03826087">
+          <caret line="396" column="99" selection-start-line="396" selection-start-column="99" selection-end-line="396" selection-end-column="99" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Registerlist.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state vertical-scroll-proportion="0.03826087">
           <caret line="101" column="39" selection-start-line="101" selection-start-column="39" selection-end-line="101" selection-end-column="39" />
           <folding>
             <marker date="1540979388512" expanded="true" signature="5197:5452" placeholder="SELECT e.id,... exams" />
@@ -794,62 +705,39 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/database.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
       <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" />
+        <state vertical-scroll-proportion="0.03826087">
+          <caret line="290" column="57" selection-start-line="290" selection-start-column="57" selection-end-line="290" selection-end-column="57" />
+          <folding>
+            <element signature="e#13107#14413#0#PHP" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.php">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state vertical-scroll-proportion="-0.7096774">
+          <caret line="70" column="42" selection-start-line="70" selection-start-column="42" selection-end-line="70" selection-end-column="42" />
           <folding>
-            <marker date="1541039464853" expanded="true" signature="4426:4470" placeholder="select count... templates" />
+            <marker date="1540865902230" expanded="true" signature="7641:8111" placeholder="SELECT e.exa... exams" />
+            <marker date="1540865902230" expanded="true" signature="8219:8432" placeholder="SELECT count... exams" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Doctors.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state vertical-scroll-proportion="-18.064516">
           <caret line="200" column="18" selection-start-line="200" selection-start-column="18" selection-end-line="200" selection-end-column="18" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <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#7557#10222#0#PHP" expanded="false" />
-            <marker date="1541064875727" expanded="true" signature="6390:6841" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="8560:10102" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="8678:10102" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="8796:10102" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="8913:10102" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="9030:10102" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="9154:10102" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="9279:10102" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="9400:10102" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="9522:10102" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="19448:20014" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="22676:23497" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="22800:23497" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="22925:23497" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="23047:23497" placeholder="..." />
-          </folding>
-        </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" />
+        <state vertical-scroll-proportion="0.5026087">
+          <caret line="129" column="25" selection-start-line="129" selection-start-column="25" selection-end-line="129" selection-end-column="25" />
           <folding />
         </state>
       </provider>

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','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','PR,SR')->field('id,series_num,seriesuid,description')->order('series_num asc')->select();
         $series = array();
         foreach($series_list as $k=>$v){
             // image_number排序