Dcquery

.idea/workspace.xml

@@ -22,68 +22,127 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="Report.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
+      <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="-418.7097">
+              <caret line="598" column="5" selection-start-line="598" selection-start-column="5" selection-end-line="598" selection-end-column="5" />
+              <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="-4.2580647">
-              <caret line="52" column="12" selection-start-line="52" selection-start-column="12" selection-end-line="52" selection-end-column="12" />
+            <state vertical-scroll-proportion="0.0">
+              <caret line="79" column="29" selection-start-line="79" selection-start-column="29" selection-end-line="79" selection-end-column="29" />
               <folding>
-                <marker date="1544599982346" expanded="true" signature="8595:8894" placeholder="SELECT a.id,... exams" />
-                <marker date="1544599982346" expanded="true" signature="8978:9106" placeholder="SELECT count... exams" />
+                <marker date="1544780608357" expanded="true" signature="5339:5594" placeholder="SELECT e.id,... exams" />
+                <marker date="1544780608357" expanded="true" signature="5339:5610" placeholder="SELECT e.id,... exams" />
+                <marker date="1544780608357" expanded="true" signature="5339:5627" placeholder="SELECT e.id,... exams" />
+                <marker date="1544780608357" expanded="true" signature="7142:7270" placeholder="SELECT count... exams" />
+                <marker date="1544780608357" expanded="true" signature="7142:7287" placeholder="SELECT count... exams" />
               </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">
+      <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="-4.967742">
-              <caret line="144" column="41" selection-start-line="144" selection-start-column="41" selection-end-line="144" selection-end-column="41" />
-              <folding />
+            <state vertical-scroll-proportion="0.92347825">
+              <caret line="348" column="1" selection-start-line="348" selection-start-column="1" selection-end-line="348" selection-end-column="1" />
+              <folding>
+                <element signature="e#227#257#0#PHP" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Doctors.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/manage/controller/Doctors.php">
+      <file leaf-file-name="Dcquery.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/inter/controller/Dcquery.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-4.967742">
-              <caret line="118" column="38" selection-start-line="118" selection-start-column="38" selection-end-line="118" selection-end-column="38" />
-              <folding />
+            <state vertical-scroll-proportion="-8.83871">
+              <caret line="185" column="41" selection-start-line="0" selection-start-column="0" selection-end-line="348" selection-end-column="1" />
+              <folding>
+                <element signature="e#227#257#0#PHP" expanded="true" />
+              </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="-14.096774">
+              <caret line="58" column="45" selection-start-line="58" selection-start-column="45" selection-end-line="58" selection-end-column="45" />
+              <folding>
+                <marker date="1543805954537" expanded="true" signature="7753:8228" placeholder="SELECT e.id,... exams" />
+                <marker date="1543805954537" expanded="true" signature="8336:8549" placeholder="SELECT count... exams" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Insdoctors.php" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/application/manage/controller/Insdoctors.php">
+      <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.4173913">
-              <caret line="131" column="36" selection-start-line="131" selection-start-column="36" selection-end-line="131" selection-end-column="36" />
+            <state vertical-scroll-proportion="-6.096774">
+              <caret line="159" column="40" selection-start-line="159" selection-start-column="40" selection-end-line="159" selection-end-column="40" />
               <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">
+      <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="-17.451612">
-              <caret line="117" column="10" selection-start-line="117" selection-start-column="10" selection-end-line="117" selection-end-column="10" />
+            <state vertical-scroll-proportion="71.67742">
+              <caret line="54" column="45" selection-start-line="54" selection-start-column="45" selection-end-line="54" selection-end-column="45" />
               <folding>
-                <marker date="1544611032376" expanded="true" signature="4066:4237" placeholder="SELECT m.id,... menu" />
+                <marker date="1544599982346" expanded="true" signature="8595:8894" placeholder="SELECT a.id,... exams" />
+                <marker date="1544599982346" expanded="true" signature="8978:9106" 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">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="-1.4193548">
+              <caret line="71" column="58" selection-start-line="71" selection-start-column="58" selection-end-line="71" selection-end-column="58" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Version4" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version4">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0">
+              <caret line="6" column="70" selection-start-line="6" selection-start-column="70" selection-end-line="6" selection-end-column="70" />
+              <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="77" column="62" selection-start-line="77" selection-start-column="62" selection-end-line="77" selection-end-column="62" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/../yuanchengpasc/public/index.php" />
-        <option value="$PROJECT_DIR$/application/common/library/ValidateCode.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Base.php" />
         <option value="$PROJECT_DIR$/application/manage/controller/Constant.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/23.log" />
@@ -118,21 +177,23 @@
         <option value="$PROJECT_DIR$/application/admin/command/Upgrade.php" />
         <option value="$PROJECT_DIR$/application/index/controller/Index.php" />
         <option value="$PROJECT_DIR$/application/common/versionsql/Version2" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Application.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/07.log" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Registerlist.php" />
         <option value="$PROJECT_DIR$/application/common/versionsql/Version3" />
-        <option value="$PROJECT_DIR$/application/database.php" />
         <option value="$PROJECT_DIR$/application/manage/view/insdoctors/edit.html" />
         <option value="$PROJECT_DIR$/application/manage/view/doctors/edit.html" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Index.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Writereport.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Dcquery.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Report.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Login.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Inspectregister.php" />
         <option value="$PROJECT_DIR$/application/manage/controller/Doctors.php" />
         <option value="$PROJECT_DIR$/application/manage/controller/Insdoctors.php" />
+        <option value="$PROJECT_DIR$/application/database.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Index.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Inspectregister.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Registerlist.php" />
+        <option value="$PROJECT_DIR$/application/common/versionsql/Version4" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Application.php" />
+        <option value="$PROJECT_DIR$/../yuanchengpasc/application/inter/controller/Dcquery.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Dcquery.php" />
       </list>
     </option>
   </component>
@@ -182,7 +243,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -241,7 +301,7 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="manage" />
+              <option name="myItemId" value="inter" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -263,7 +323,7 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="manage" />
+              <option name="myItemId" value="inter" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -271,6 +331,28 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="yczd" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="yczd" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="yczd" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="application" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="common" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="yczd" />
@@ -284,6 +366,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -381,20 +464,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/extend/.gitignore">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/thinkphp/lang/zh-cn.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.1269565">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/thinkphp/tpl/default_index.tpl">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -529,13 +598,6 @@
         </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.22956522">
-          <caret line="132" column="75" selection-start-line="132" selection-start-column="75" selection-end-line="132" selection-end-column="75" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/common/controller/Version.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.42086956">
@@ -571,13 +633,6 @@
         </state>
       </provider>
     </entry>
-    <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="88" column="42" selection-start-line="88" selection-start-column="42" selection-end-line="88" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/common/library/Verify.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -593,30 +648,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="9.935484">
-          <caret line="17" column="26" selection-start-line="17" selection-start-column="26" selection-end-line="17" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Base.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-12.774194">
           <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>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Registerlist.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-9.935484">
-          <caret line="60" column="37" selection-start-line="60" selection-start-column="37" selection-end-line="60" selection-end-column="37" />
-          <folding>
-            <marker date="1544493433067" expanded="true" signature="5343:5598" placeholder="SELECT e.id,... exams" />
-            <marker date="1544493433067" expanded="true" signature="5343:5615" placeholder="SELECT e.id,... exams" />
-            <marker date="1544493433067" expanded="true" signature="7130:7258" placeholder="SELECT count... exams" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -624,7 +659,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="101.3871">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -632,7 +666,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-1.1478261">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -640,7 +673,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-0.14862385">
           <caret line="88" column="101" selection-start-line="88" selection-start-column="101" selection-end-line="88" selection-end-column="101" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -648,7 +680,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-0.57391304">
           <caret line="63" column="37" selection-start-line="63" selection-start-column="37" selection-end-line="63" selection-end-column="37" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -656,116 +687,171 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-8.935484">
           <caret line="140" column="17" selection-start-line="140" selection-start-column="17" selection-end-line="148" selection-end-column="17" />
-          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Dcquery.php">
+    <entry file="file://$PROJECT_DIR$/application/manage/view/doctors/edit.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-13.4838705">
+          <caret line="136" column="17" selection-start-line="136" selection-start-column="17" selection-end-line="136" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version1">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.31023103">
+          <caret line="47" column="0" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version3">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="1" column="66" selection-start-line="1" selection-start-column="66" selection-end-line="1" selection-end-column="66" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version2">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.18151815">
+          <caret line="5" column="38" selection-start-line="5" selection-start-column="38" selection-end-line="5" selection-end-column="38" />
+        </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="0.5026087">
+          <caret line="56" column="30" selection-start-line="56" selection-start-column="30" selection-end-line="56" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/manage/controller/Doctors.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-5.451613">
-          <caret line="121" column="9" selection-start-line="121" selection-start-column="9" selection-end-line="121" selection-end-column="9" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="118" column="38" selection-start-line="118" selection-start-column="38" selection-end-line="118" selection-end-column="38" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
+    <entry file="file://$PROJECT_DIR$/application/manage/controller/Insdoctors.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-71.064514">
-          <caret line="773" column="14" selection-start-line="773" selection-start-column="14" selection-end-line="773" selection-end-column="14" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="131" column="36" selection-start-line="131" selection-start-column="36" selection-end-line="131" selection-end-column="36" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/application/database.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.36">
+        <state vertical-scroll-proportion="0.0">
           <caret line="21" column="10" selection-start-line="21" selection-start-column="10" selection-end-line="21" selection-end-column="10" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/view/doctors/edit.html">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Login.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-13.4838705">
-          <caret line="136" column="17" selection-start-line="136" selection-start-column="17" selection-end-line="136" selection-end-column="17" />
-          <folding />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="117" column="10" selection-start-line="117" selection-start-column="10" selection-end-line="117" selection-end-column="10" />
+          <folding>
+            <marker date="1544611032376" expanded="true" signature="4066:4237" placeholder="SELECT m.id,... menu" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Doctors.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.15826087">
-          <caret line="29" column="29" selection-start-line="29" selection-start-column="29" selection-end-line="29" selection-end-column="29" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="77" column="62" selection-start-line="77" selection-start-column="62" selection-end-line="77" selection-end-column="62" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version1">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.31023103">
-          <caret line="47" column="0" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="47" />
+        <state vertical-scroll-proportion="-418.7097">
+          <caret line="598" column="5" selection-start-line="598" selection-start-column="5" selection-end-line="598" selection-end-column="5" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version3">
+    <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="1" column="66" selection-start-line="1" selection-start-column="66" selection-end-line="1" selection-end-column="66" />
-          <folding />
+          <caret line="79" column="29" selection-start-line="79" selection-start-column="29" selection-end-line="79" selection-end-column="29" />
+          <folding>
+            <marker date="1544780608357" expanded="true" signature="5339:5594" placeholder="SELECT e.id,... exams" />
+            <marker date="1544780608357" expanded="true" signature="5339:5610" placeholder="SELECT e.id,... exams" />
+            <marker date="1544780608357" expanded="true" signature="5339:5627" placeholder="SELECT e.id,... exams" />
+            <marker date="1544780608357" expanded="true" signature="7142:7270" placeholder="SELECT count... exams" />
+            <marker date="1544780608357" expanded="true" signature="7142:7287" placeholder="SELECT count... exams" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version2">
+    <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version4">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.18151815">
-          <caret line="5" column="38" selection-start-line="5" selection-start-column="38" selection-end-line="5" selection-end-column="38" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="6" column="70" selection-start-line="6" selection-start-column="70" selection-end-line="6" selection-end-column="70" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.2580647">
-          <caret line="52" column="12" selection-start-line="52" selection-start-column="12" selection-end-line="52" selection-end-column="12" />
+        <state vertical-scroll-proportion="-14.096774">
+          <caret line="58" column="45" selection-start-line="58" selection-start-column="45" selection-end-line="58" selection-end-column="45" />
           <folding>
-            <marker date="1544599982346" expanded="true" signature="8595:8894" placeholder="SELECT a.id,... exams" />
-            <marker date="1544599982346" expanded="true" signature="8978:9106" placeholder="SELECT count... exams" />
+            <marker date="1543805954537" expanded="true" signature="7753:8228" placeholder="SELECT e.id,... exams" />
+            <marker date="1543805954537" expanded="true" signature="8336:8549" placeholder="SELECT count... exams" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Login.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-17.451612">
-          <caret line="117" column="10" selection-start-line="117" selection-start-column="10" selection-end-line="117" selection-end-column="10" />
+        <state vertical-scroll-proportion="-6.096774">
+          <caret line="159" column="40" selection-start-line="159" selection-start-column="40" selection-end-line="159" selection-end-column="40" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="71.67742">
+          <caret line="54" column="45" selection-start-line="54" selection-start-column="45" selection-end-line="54" selection-end-column="45" />
           <folding>
-            <marker date="1544611032376" expanded="true" signature="4066:4237" placeholder="SELECT m.id,... menu" />
+            <marker date="1544599982346" expanded="true" signature="8595:8894" placeholder="SELECT a.id,... exams" />
+            <marker date="1544599982346" expanded="true" signature="8978:9106" placeholder="SELECT count... exams" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.967742">
-          <caret line="144" column="41" selection-start-line="144" selection-start-column="41" selection-end-line="144" selection-end-column="41" />
+        <state vertical-scroll-proportion="-1.4193548">
+          <caret line="71" column="58" selection-start-line="71" selection-start-column="58" selection-end-line="71" selection-end-column="58" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/controller/Doctors.php">
+    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/inter/controller/Dcquery.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.967742">
-          <caret line="118" column="38" selection-start-line="118" selection-start-column="38" selection-end-line="118" selection-end-column="38" />
-          <folding />
+        <state vertical-scroll-proportion="-8.83871">
+          <caret line="185" column="41" selection-start-line="0" selection-start-column="0" selection-end-line="348" selection-end-column="1" />
+          <folding>
+            <element signature="e#227#257#0#PHP" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/controller/Insdoctors.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Dcquery.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4173913">
-          <caret line="131" column="36" selection-start-line="131" selection-start-column="36" selection-end-line="131" selection-end-column="36" />
-          <folding />
+        <state vertical-scroll-proportion="0.92347825">
+          <caret line="348" column="1" selection-start-line="348" selection-start-column="1" selection-end-line="348" selection-end-column="1" />
+          <folding>
+            <element signature="e#227#257#0#PHP" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

application/inter/controller/Dcquery.php

@@ -43,7 +43,7 @@ class Dcquery extends Controller
                     $seriesListData=array();
                     foreach($series as $key=>$val){
                         $seriesData=array();
-                        
+
                         $seriesData["seriesInstanceUid"]=$val["seriesuid"];
                         $seriesData["seriesDescription"]=$val["description"];
                         $imgs=Db::table("images")->where("series_id",$val["id"])->field("id,columns,image_number,rows,sop_uid,url,metadata")->select();
@@ -81,7 +81,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,image_number as instanceNumber,rows,image_id as sopInstanceUid,url')->select();
+            $image = DB::table('images')->where('series_id',$v['id'])->field('columns,image_number as instanceNumber,rows,image_id as sopInstanceUid,url,frame')->select();
             foreach($image as $key=>$value){
                 $image[$key]['url'] = 'http://dcm.pacsonline.cn/'.$value['url'];
             }
@@ -196,7 +196,94 @@ class Dcquery extends Controller
             echo $e->getMessage();
         }
     }
-    
+
+
+    public function generateSeries($study_id, $url) {
+        $series = array();
+        $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();
+        $seriesIndex = 0;
+        $series = array();
+        while($seriesIndex < count($series_list)) {
+            $series = array_merge($series, $this->generateSeriesSingle($series_list[$seriesIndex], $url));
+            $seriesIndex++;
+        }
+        return $series;
+    }
+
+    public function generateSeriesSingle($serie, $url) {
+        $images_list = DB::table('images')->where('series_id',$serie['id'])->field('remote_url,local_url,status,columns,image_number as instanceNumber,rows,image_id as sopInstanceUid,metadata,url,frame')->order('image_number asc')->select();
+        $series = array();
+        $images = array();
+        $seriesCount = 0;
+        $imagesIndex = 0;
+        while($imagesIndex < count($images_list)) {
+            $image = $images_list[$imagesIndex];
+            $imageUrl = $this->generateUrl($image['url'], $url, $image['remote_url'], $image['local_url'], $image['status'], $image['metadata']);
+            $frame = $image['frame'];
+            if($frame === 0) {
+                array_push($images, $this->generateImage($image, $imageUrl));
+            } else {
+                if(count($images) != 0) {
+                    array_push($series, [
+                        'instances' => $images,
+                        'seriesInstanceUid' => $serie['seriesuid'],
+                        'seriesDescription' => $serie['description'],
+                        'seriesNumber' => $serie['series_num'].'-'.$seriesCount
+                    ]);
+                    $seriesCount++;
+                    $images = array();
+                }
+                $frameIndex = 0;
+                while($frameIndex < $frame) {
+                    array_push($images, $this->generateImage($image, $imageUrl, $frameIndex));
+                    $frameIndex++;
+                }
+                array_push($series, [
+                    'instances' => $images,
+                    'seriesInstanceUid' => $serie['seriesuid'],
+                    'seriesDescription' => $serie['description'],
+                    'seriesNumber' => $serie['series_num'].'-'.$seriesCount
+                ]);
+                $seriesCount++;
+                $images = array();
+            }
+            $imagesIndex++;
+        }
+        if(count($images) != 0) {
+            array_push($series, [
+                'instances' => $images,
+                'seriesInstanceUid' => $serie['seriesuid'],
+                'seriesDescription' => $serie['description'],
+                'seriesNumber' => $serie['series_num'].'-'.$seriesCount
+            ]);
+        }
+        return $series;
+    }
+
+    public function generateImage($image,$url,$frameIndex = -1) {
+        $image_url = $url;
+        $imageNumber = $image['instanceNumber'];
+        if($frameIndex !== -1) {
+            $image_url = $url.'?frame='.$frameIndex;
+            $imageNumber = $frameIndex + 1;
+        }
+        return [
+            'remote_url' => $image['remote_url'],
+            'local_url' => $image['local_url'],
+            'status' => $image['status'],
+            'columns' => $image['columns'],
+            'rows' => $image['rows'],
+            'instanceNumber' => $imageNumber,
+            'imageNumber' => $imageNumber,
+            'sopInstanceUid' => $image['sopInstanceUid'],
+            'metadata' => $image['metadata'],
+            'url' => $image_url,
+            'frame' => $image['frame'],
+            'frameIndex' => $frameIndex,
+        ];
+    }
+
+
     public function generateUrl($url, $address, $remote_url, $local_url, $status, $metadata) {
         if(empty($address)) {
             return self::generateNormalUrl($url);
@@ -212,18 +299,24 @@ class Dcquery extends Controller
         }else{
             //获取ip
             $ip = $this->getIpbyAddress($address);
-            if(in_array($ip,json_decode(LC_IPS,TRUE))) {
+            if(in_array($ip,json_decode(LC_WAN_IPS,TRUE))) {
                 //浪潮政务云访问
                 return "dicomweb://$address/$remote_url";
             }
-            if($status & STATUS_LOCAL) {
-                //内网url有效
-                return "dicomweb://$address/$local_url";
+            if(in_array($ip,json_decode(LC_LAN_IPS,TRUE))) {
+                if($status & STATUS_LOCAL) {
+                    //内网url有效
+                    return "dicomweb://$address/$local_url";
+                }
+                if($status & STATUS_REMOTE) {
+                    //外网url有效
+                    return "dicomweb://$address/".REMOTE_FLAG."/$remote_url";
+                }
             }
-            if($status & STATUS_REMOTE) {
-                //外网url有效
-                return "dicomweb://$address/".REMOTE_FLAG."/$remote_url";
+            if($status & (STATUS_LOCAL | STATUS_REMOTE)) {
+                return "dicomweb://$address/$url";
             }
+            //浪潮政务云访问
             return  null;
         }
     }