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

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="svn" />
-  </component>
-</project>

.idea/workspace.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" readonly="true" id="572cf67f-4e6a-4be2-bb2d-307df6beb1ce" name="默认的" comment="" />
+    <list default="true" id="572cf67f-4e6a-4be2-bb2d-307df6beb1ce" name="默认的" comment="" />
     <ignored path="yczd.iws" />
     <ignored path=".idea/workspace.xml" />
     <ignored path=".idea/dataSources.local.xml" />
@@ -22,23 +22,82 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="Openapplication.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/admin/controller/Openapplication.php">
+      <file leaf-file-name="Upgrade.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/admin/command/Upgrade.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-6.7419353">
-              <caret line="73" column="81" selection-start-line="73" selection-start-column="81" selection-end-line="73" selection-end-column="81" />
+            <state vertical-scroll-proportion="-3.6451614">
+              <caret line="34" column="37" selection-start-line="34" selection-start-column="37" selection-end-line="34" selection-end-column="37" />
               <folding>
-                <element signature="e#40#74#0#PHP" expanded="true" />
+                <element signature="e#36#62#0#PHP" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Report.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="version1" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/application/common/versionsql/version1">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.18151815">
+              <caret line="5" column="40" selection-start-line="5" selection-start-column="40" selection-end-line="5" selection-end-column="40" />
+              <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="-30.516129">
+              <caret line="94" column="29" selection-start-line="94" selection-start-column="29" selection-end-line="94" selection-end-column="29" />
+              <folding>
+                <marker date="1542944172383" expanded="true" signature="5524:5779" placeholder="SELECT e.id,... exams" />
+                <marker date="1542944172383" expanded="true" signature="5810:6116" placeholder="SELECT e.id,... exams" />
+                <marker date="1542944172383" expanded="true" signature="7040:7168" placeholder="SELECT count... exams" />
+              </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="90" column="29" selection-start-line="90" selection-start-column="29" selection-end-line="90" selection-end-column="29" />
+              <folding>
+                <marker date="1542881005370" expanded="true" signature="7753:8228" placeholder="SELECT e.id,... exams" />
+                <marker date="1542881005370" expanded="true" signature="8336:8549" 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="-12.064516">
+              <caret line="47" column="31" selection-start-line="47" selection-start-column="31" selection-end-line="47" selection-end-column="31" />
+              <folding>
+                <element signature="e#39#60#0#PHP" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Dcquery.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/inter/controller/Dcquery.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="-4.354839">
+              <caret line="122" column="24" selection-start-line="122" selection-start-column="24" selection-end-line="122" selection-end-column="24" />
+              <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.42608696">
-              <caret line="113" column="64" selection-start-line="113" selection-start-column="64" selection-end-line="113" selection-end-column="64" />
+            <state vertical-scroll-proportion="0.0">
+              <caret line="177" column="82" selection-start-line="177" selection-start-column="82" selection-end-line="177" selection-end-column="82" />
               <folding>
                 <marker date="1541502492085" expanded="true" signature="8160:8459" placeholder="SELECT a.id,... exams" />
                 <marker date="1541502492085" expanded="true" signature="8543:8671" placeholder="SELECT count... exams" />
@@ -47,11 +106,11 @@
           </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="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="-5.032258">
-              <caret line="402" column="71" selection-start-line="402" selection-start-column="51" selection-end-line="402" selection-end-column="71" />
+            <state vertical-scroll-proportion="0.0">
+              <caret line="347" column="43" selection-start-line="347" selection-start-column="43" selection-end-line="347" selection-end-column="43" />
               <folding />
             </state>
           </provider>
@@ -75,32 +134,39 @@
         <option value="$PROJECT_DIR$/application/inter/controller/23.log" />
         <option value="$PROJECT_DIR$/application/manage/view/device/index.html" />
         <option value="$USER_HOME$/Desktop/database.php" />
-        <option value="$PROJECT_DIR$/application/command.php" />
-        <option value="$PROJECT_DIR$/application/admin/command/Api.php" />
         <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/Operating.php" />
         <option value="$PROJECT_DIR$/public/api.html" />
         <option value="$PROJECT_DIR$/../../../bin/apache/apache2.4.23/conf/extra/httpd-vhosts.conf" />
         <option value="$PROJECT_DIR$/../../yanzhengma.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Login.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Messages.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Template.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Inspectregister.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Application.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Registerlist.php" />
-        <option value="$PROJECT_DIR$/application/database.php" />
         <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/Dcquery.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Writereport.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Reciveremote.php" />
         <option value="$PROJECT_DIR$/../../shenqingxinxi/application/database.php" />
         <option value="$PROJECT_DIR$/../../test_sockets.php" />
         <option value="$PROJECT_DIR$/../../shenqingxinxi/.git/config" />
-        <option value="$PROJECT_DIR$/../../shenqingxinxi/application/admin/controller/Openapplication.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Report.php" />
+        <option value="$PROJECT_DIR$/../../shenqingxinxi/application/admin/controller/Openapplication.php" />
+        <option value="$PROJECT_DIR$/application/command.php" />
+        <option value="$PROJECT_DIR$/application/admin/command/Api.php" />
+        <option value="$PROJECT_DIR$/application/manage/view/examsubclass/edit.html" />
+        <option value="$PROJECT_DIR$/application/manage/controller/Examsubclass.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Inspectregister.php" />
+        <option value="$USER_HOME$/Desktop/oss_callbacks.sql" />
+        <option value="$PROJECT_DIR$/application/database.php" />
+        <option value="$PROJECT_DIR$/application/common/controller/Version.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Application.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Operating.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Writereport.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Login.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Reciveremote.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Dcquery.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Registerlist.php" />
+        <option value="$PROJECT_DIR$/application/admin/command/Upgrade.php" />
+        <option value="$USER_HOME$/Desktop/version.sql" />
+        <option value="$PROJECT_DIR$/application/common/versionsql/version1" />
       </list>
     </option>
   </component>
@@ -149,6 +215,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scratches" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -237,28 +305,6 @@
               <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" />
@@ -271,14 +317,12 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
-      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="last_opened_file_path" value="$PROJECT_DIR$/../../shenqingxinxi" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="settings.editor.selected.configurable" value="web-ide.project.structure" />
+    <property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.colors.Font" />
     <property name="settings.editor.splitter.proportion" value="0.2" />
     <property name="js-jscs-nodeInterpreter" value="D:\node.js\node.exe" />
   </component>
@@ -330,46 +374,27 @@
     <frame x="-9" y="0" width="1382" height="744" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19253294" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21522693" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="版本控制" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="版本控制" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32913387" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="层次结构" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329429" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="调试" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="调试" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="运行" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="运行" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
     </layout>
-    <layout-to-restore>
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19253294" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="版本控制" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-    </layout-to-restore>
   </component>
   <component name="Vcs.Log.UiProperties">
     <option name="RECENTLY_FILTERED_USER_GROUPS">
@@ -389,385 +414,387 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/application/common/library/Sms.php">
+    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/api/controller/Ems.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.03826087">
-          <caret line="55" column="27" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+        <state vertical-scroll-proportion="0.22956522">
+          <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/controller/Index.php">
+    <entry file="file://$PROJECT_DIR$/application/common/library/Ems.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-1.3773913">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state vertical-scroll-proportion="1.4156522">
+          <caret line="37" column="50" selection-start-line="37" selection-start-column="50" selection-end-line="37" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/database.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-6.451613">
+          <caret line="26" column="59" selection-start-line="26" selection-start-column="59" selection-end-line="26" selection-end-column="59" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/controller/Constant.php">
+    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/common/library/Auth.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-3.1704347">
-          <caret line="43" column="19" selection-start-line="43" selection-start-column="19" selection-end-line="43" selection-end-column="19" />
+        <state vertical-scroll-proportion="-12.903226">
+          <caret line="272" column="60" selection-start-line="272" selection-start-column="60" selection-end-line="272" selection-end-column="60" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/controller/Department.php">
+    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/index/controller/User.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-3.2469566">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state vertical-scroll-proportion="-8.612904">
+          <caret line="213" column="24" selection-start-line="213" selection-start-column="24" selection-end-line="213" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/controller/Device.php">
+    <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/com/jetbrains/php/lang/psi/stubs/data/json.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.68869567">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.35130435">
+          <caret line="88" column="9" selection-start-line="88" selection-start-column="9" selection-end-line="88" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/controller/Stats.php">
+    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/admin/model/Openapplication.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="35" column="31" selection-start-line="35" selection-start-column="31" selection-end-line="35" selection-end-column="31" />
+        <state vertical-scroll-proportion="-4.2580647">
+          <caret line="6" column="31" selection-start-line="6" selection-start-column="31" selection-end-line="6" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/view/device/index.html">
+    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/thinkphp/library/think/Model.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7321739">
-          <caret line="28" column="10" selection-start-line="28" selection-start-column="10" selection-end-line="28" selection-end-column="10" />
+        <state vertical-scroll-proportion="3.68">
+          <caret line="183" column="20" selection-start-line="183" selection-start-column="20" selection-end-line="183" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/common.php">
+    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/admin/controller/Openapplication.php">
       <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" />
+          <caret line="12" column="32" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/command.php">
+    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/thinkphp/library/think/Controller.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.11478261">
-          <caret line="11" column="9" selection-start-line="11" selection-start-column="9" selection-end-line="11" selection-end-column="9" />
+        <state vertical-scroll-proportion="0.34434783">
+          <caret line="18" column="6" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/admin/command/Api.php">
+    <entry file="file://$PROJECT_DIR$/thinkphp/library/think/Controller.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.57391304">
-          <caret line="21" column="82" selection-start-line="21" selection-start-column="82" selection-end-line="21" selection-end-column="82" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="16" column="12" selection-start-line="16" selection-start-column="12" selection-end-line="16" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/thinkphp/library/think/Loader.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="25.481739">
-          <caret line="674" column="1" selection-start-line="674" selection-start-column="1" selection-end-line="674" selection-end-column="1" />
+        <state vertical-scroll-proportion="5.548387">
+          <caret line="376" column="5" selection-start-line="376" selection-start-column="5" selection-end-line="376" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/library/ResultTools.php">
+    <entry file="file://$PROJECT_DIR$/application/admin/command/Api/template/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44173914">
-          <caret line="13" column="68" selection-start-line="13" selection-start-column="64" selection-end-line="13" selection-end-column="68" />
+        <state vertical-scroll-proportion="-13.429565">
+          <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$/public/api.html">
+    <entry file="file://$PROJECT_DIR$/thinkphp/library/think/console/Command.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="286.0">
-          <caret line="9397" column="33" selection-start-line="9403" selection-start-column="115" selection-end-line="9403" selection-end-column="120" />
+        <state vertical-scroll-proportion="0.35130435">
+          <caret line="307" column="20" selection-start-line="307" selection-start-column="20" selection-end-line="307" selection-end-column="20" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../testmysql.php">
+    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/thinkphp/library/think/console/input/Option.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.2580647">
-          <caret line="6" column="17" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
+        <state vertical-scroll-proportion="0.35130435">
+          <caret line="18" column="10" selection-start-line="18" selection-start-column="10" selection-end-line="18" selection-end-column="10" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/com/jetbrains/php/lang/psi/stubs/data/mysqli.php">
+    <entry file="file://$PROJECT_DIR$/application/command.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="5.548387">
-          <caret line="317" column="22" selection-start-line="317" selection-start-column="22" selection-end-line="317" selection-end-column="22" />
+        <state vertical-scroll-proportion="0.15304348">
+          <caret line="12" column="31" selection-start-line="12" selection-start-column="31" selection-end-line="12" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../bin/apache/apache2.4.23/conf/httpd.conf">
+    <entry file="file://$PROJECT_DIR$/application/manage/view/examsubclass/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.866667">
-          <caret line="72" column="18" selection-start-line="72" selection-start-column="18" selection-end-line="72" selection-end-column="18" />
+        <state vertical-scroll-proportion="-1.7217392">
+          <caret line="33" column="45" selection-start-line="33" selection-start-column="45" selection-end-line="33" selection-end-column="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../bin/apache/apache2.4.23/conf/extra/httpd-vhosts.conf">
+    <entry file="file://$PROJECT_DIR$/application/manage/view/examsubclass/edit.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5808581">
-          <caret line="16" column="24" selection-start-line="16" selection-start-column="24" selection-end-line="16" selection-end-column="24" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="52" column="57" selection-start-line="52" selection-start-column="57" selection-end-line="52" selection-end-column="57" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/com/jetbrains/php/lang/psi/stubs/data/gd.php">
+    <entry file="file://$PROJECT_DIR$/application/manage/controller/Examsubclass.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35130435">
-          <caret line="1696" column="9" selection-start-line="1696" selection-start-column="9" selection-end-line="1696" selection-end-column="9" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="84" column="100" selection-start-line="84" selection-start-column="100" selection-end-line="84" selection-end-column="100" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../yanzhengma.php">
+    <entry file="file://$PROJECT_DIR$/application/admin/command/Api/library/Extractor.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.354839">
-          <caret line="8" column="79" selection-start-line="8" selection-start-column="79" selection-end-line="8" selection-end-column="79" />
+        <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$/application/common/library/UUIDs.php">
+    <entry file="file://$PROJECT_DIR$/application/admin/command/Api/library/Builder.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44173914">
-          <caret line="33" column="27" selection-start-line="33" selection-start-column="27" selection-end-line="33" selection-end-column="27" />
-          <folding />
+        <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$/application/index/controller/Index.php">
+    <entry file="file://$PROJECT_DIR$/application/admin/command/Api/lang/zh-cn.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.34434783">
-          <caret line="15" column="29" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" />
+        <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$/application/inter/controller/Base.php">
+    <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/com/jetbrains/php/lang/psi/stubs/data/standard_defines.php">
       <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" />
+        <state vertical-scroll-proportion="-55.48387">
+          <caret line="724" column="18" selection-start-line="724" selection-start-column="18" selection-end-line="724" selection-end-column="18" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Examclass.php">
+    <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/com/jetbrains/php/lang/psi/stubs/data/basic.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.7096774">
-          <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.38782609">
+          <caret line="144" column="25" selection-start-line="144" selection-start-column="25" selection-end-line="144" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Examproject.php">
+    <entry file="file://$PROJECT_DIR$/thinkphp/base.php">
       <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 vertical-scroll-proportion="0.26782608">
+          <caret line="15" column="25" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Messages.php">
+    <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/com/jetbrains/php/lang/psi/stubs/data/Core_d.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-2.9672132">
-          <caret line="112" column="39" selection-start-line="112" selection-start-column="32" selection-end-line="112" selection-end-column="39" />
+        <state vertical-scroll-proportion="0.3321739">
+          <caret line="297" column="9" selection-start-line="297" selection-start-column="9" selection-end-line="297" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Operating.php">
+    <entry file="file://$PROJECT_DIR$/application/common/controller/Backend.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-3.5081968">
-          <caret line="27" column="16" selection-start-line="27" selection-start-column="11" selection-end-line="27" selection-end-column="16" />
+        <state vertical-scroll-proportion="0.34434783">
+          <caret line="9" column="28" selection-start-line="9" selection-start-column="28" selection-end-line="9" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Template.php">
+    <entry file="file://$PROJECT_DIR$/application/common/controller/Frontend.php">
       <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" />
+          <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$/application/inter/controller/Index.php">
+    <entry file="file://$PROJECT_DIR$/application/common/controller/Api.php">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state vertical-scroll-proportion="0.30608696">
+          <caret line="16" column="3" selection-start-line="16" selection-start-column="3" selection-end-line="16" selection-end-column="3" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Login.php">
+    <entry file="file://$PROJECT_DIR$/application/route.php">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state vertical-scroll-proportion="0.34434783">
+          <caret line="17" column="57" selection-start-line="17" selection-start-column="57" selection-end-line="17" selection-end-column="57" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Registerlist.php">
+    <entry file="file://$PROJECT_DIR$/application/admin/command/Api.php">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Doctors.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.php">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state vertical-scroll-proportion="0.453211">
+          <caret line="386" column="13" selection-start-line="386" selection-start-column="13" selection-end-line="386" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Dcquery.php">
+    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/thinkphp/library/think/Db.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.42086956">
-          <caret line="72" column="0" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.03826087">
+          <caret line="39" column="26" selection-start-line="39" selection-start-column="19" selection-end-line="39" selection-end-column="26" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.php">
+    <entry file="file://$PROJECT_DIR$/thinkphp/library/think/Db.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.26782608">
-          <caret line="144" column="17" selection-start-line="144" selection-start-column="17" selection-end-line="144" selection-end-column="17" />
+        <state vertical-scroll-proportion="0.03826087">
+          <caret line="46" column="53" selection-start-line="46" selection-start-column="53" selection-end-line="46" selection-end-column="53" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/controller/Doctors.php">
+    <entry file="file://$USER_HOME$/Desktop/oss_callbacks.sql">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.03826087">
-          <caret line="137" column="70" selection-start-line="137" selection-start-column="70" selection-end-line="137" selection-end-column="70" />
+        <state vertical-scroll-proportion="0.17272727">
+          <caret line="16" column="66" selection-start-line="16" selection-start-column="2" selection-end-line="16" selection-end-column="66" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
+    <entry file="file://$PROJECT_DIR$/extend/.gitignore">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.03826087">
-          <caret line="83" column="47" selection-start-line="83" selection-start-column="12" selection-end-line="83" selection-end-column="47" />
+        <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$/application/database.php">
+    <entry file="file://$PROJECT_DIR$/thinkphp/lang/zh-cn.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4973913">
-          <caret line="24" column="9" selection-start-line="24" selection-start-column="9" selection-end-line="24" selection-end-column="9" />
+        <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$/../../shenqingxinxi/application/admin/library/traits/Backend.php">
+    <entry file="file://$PROJECT_DIR$/thinkphp/tpl/default_index.tpl">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.8747826">
-          <caret line="84" column="58" selection-start-line="84" selection-start-column="58" selection-end-line="84" selection-end-column="58" />
-          <folding>
-            <marker date="1541473454289" expanded="true" signature="9395:9502" placeholder="SELECT COLUM... COLUMNS" />
-          </folding>
+        <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$/../../shenqingxinxi/application/admin/controller/Index.php">
+    <entry file="file://$PROJECT_DIR$/application/common/controller/Version.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.34862384">
-          <caret line="17" column="26" selection-start-line="17" selection-start-column="14" selection-end-line="17" selection-end-column="26" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="10" column="20" selection-start-line="10" selection-start-column="20" selection-end-line="10" selection-end-column="20" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../test_sockets.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.10956522">
-          <caret line="5" column="42" selection-start-line="5" selection-start-column="42" selection-end-line="5" selection-end-column="42" />
-          <folding />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="177" column="82" selection-start-line="177" selection-start-column="82" selection-end-line="177" selection-end-column="82" />
+          <folding>
+            <marker date="1541502492085" expanded="true" signature="8160:8459" placeholder="SELECT a.id,... exams" />
+            <marker date="1541502492085" expanded="true" signature="8543:8671" placeholder="SELECT count... exams" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/.git/config">
+    <entry file="file://$PROJECT_DIR$/application/database.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="8" column="61" selection-start-line="8" selection-start-column="61" selection-end-line="8" selection-end-column="61" />
-          <folding />
+        <state vertical-scroll-proportion="0.03826087">
+          <caret line="19" column="31" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/admin/model/Openapplication.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Operating.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.22956522">
-          <caret line="6" column="21" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="21" />
-          <folding />
+        <state vertical-scroll-proportion="0.69391304">
+          <caret line="71" column="5" selection-start-line="71" selection-start-column="5" selection-end-line="71" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/common/controller/Backend.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Login.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-62.225807">
-          <caret line="130" column="20" selection-start-line="130" selection-start-column="20" selection-end-line="130" selection-end-column="20" />
-          <folding />
+        <state vertical-scroll-proportion="0.92347825">
+          <caret line="156" column="5" selection-start-line="156" selection-start-column="5" selection-end-line="156" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5026087">
-          <caret line="283" column="8" selection-start-line="258" selection-start-column="4" selection-end-line="283" selection-end-column="8" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="347" column="43" selection-start-line="347" selection-start-column="43" selection-end-line="347" selection-end-column="43" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/api/controller/Ems.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.22956522">
-          <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="90" column="29" selection-start-line="90" selection-start-column="29" selection-end-line="90" selection-end-column="29" />
           <folding>
-            <element signature="e#38#68#0#PHP" expanded="true" />
+            <marker date="1542881005370" expanded="true" signature="7753:8228" placeholder="SELECT e.id,... exams" />
+            <marker date="1542881005370" expanded="true" signature="8336:8549" placeholder="SELECT count... exams" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/library/Ems.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Dcquery.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.4156522">
-          <caret line="37" column="50" selection-start-line="37" selection-start-column="50" selection-end-line="37" selection-end-column="50" />
+        <state vertical-scroll-proportion="-4.354839">
+          <caret line="122" column="24" selection-start-line="122" selection-start-column="24" selection-end-line="122" selection-end-column="24" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/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="-6.451613">
-          <caret line="26" column="59" selection-start-line="26" selection-start-column="59" selection-end-line="26" selection-end-column="59" />
-          <folding />
+        <state vertical-scroll-proportion="-12.064516">
+          <caret line="47" column="31" selection-start-line="47" selection-start-column="31" selection-end-line="47" selection-end-column="31" />
+          <folding>
+            <element signature="e#39#60#0#PHP" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/common/library/Auth.php">
+    <entry file="file://$PROJECT_DIR$/application/admin/command/Upgrade.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-12.903226">
-          <caret line="272" column="60" selection-start-line="272" selection-start-column="60" selection-end-line="272" selection-end-column="60" />
-          <folding />
+        <state vertical-scroll-proportion="-3.6451614">
+          <caret line="34" column="37" selection-start-line="34" selection-start-column="37" selection-end-line="34" selection-end-column="37" />
+          <folding>
+            <element signature="e#36#62#0#PHP" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/index/controller/User.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Registerlist.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-8.612904">
-          <caret line="213" column="24" selection-start-line="213" selection-start-column="24" selection-end-line="213" selection-end-column="24" />
-          <folding />
+        <state vertical-scroll-proportion="-30.516129">
+          <caret line="94" column="29" selection-start-line="94" selection-start-column="29" selection-end-line="94" selection-end-column="29" />
+          <folding>
+            <marker date="1542944172383" expanded="true" signature="5524:5779" placeholder="SELECT e.id,... exams" />
+            <marker date="1542944172383" expanded="true" signature="5810:6116" placeholder="SELECT e.id,... exams" />
+            <marker date="1542944172383" expanded="true" signature="7040:7168" placeholder="SELECT count... exams" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.php">
+    <entry file="file://$USER_HOME$/Desktop/version.sql">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-5.032258">
-          <caret line="402" column="71" selection-start-line="402" selection-start-column="51" selection-end-line="402" selection-end-column="71" />
+        <state vertical-scroll-proportion="0.72">
+          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="40" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/admin/controller/Openapplication.php">
+    <entry file="file://$PROJECT_DIR$/application/common/versionsql/version1">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.7419353">
-          <caret line="73" column="81" selection-start-line="73" selection-start-column="81" selection-end-line="73" selection-end-column="81" />
-          <folding>
-            <element signature="e#40#74#0#PHP" expanded="true" />
-          </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="0.42608696">
-          <caret line="113" column="64" selection-start-line="113" selection-start-column="64" selection-end-line="113" selection-end-column="64" />
-          <folding>
-            <marker date="1541502492085" expanded="true" signature="8160:8459" placeholder="SELECT a.id,... exams" />
-            <marker date="1541502492085" expanded="true" signature="8543:8671" placeholder="SELECT count... exams" />
-          </folding>
+        <state vertical-scroll-proportion="0.18151815">
+          <caret line="5" column="40" selection-start-line="5" selection-start-column="40" selection-end-line="5" selection-end-column="40" />
+          <folding />
         </state>
       </provider>
     </entry>

application/admin/command/Upgrade.php

@@ -0,0 +1,74 @@
+<?php
+namespace app\admin\command;
+
+use think\console\Command;
+use think\console\Input;
+use think\Db;
+use think\console\Output;
+use app\common\controller\Version;
+
+class Upgrade extends Command
+{
+
+    protected function configure()
+    {
+        $this->setName('upgrade')->setDescription('Version upgrades');
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+        // 旧版本号
+        $version = DB::table('version')->where('id',1)->field('version')->find();
+        // 新版本号
+        $oldversion = Version::getVersion();
+        $output->writeln($version);
+        if($version['version'] < $oldversion){
+            $output->writeln('存在版本差异');
+            $errarr = array();
+            $ver = '';
+            // 新版本大于旧版本
+            for($version['version'];$version['version'] < $oldversion;$version['version']++){
+                $name = "Version".$version['version'];
+                $output->writeln("版本更新中...");
+                if(file_exists(__DIR__."\\..\\..\\common\\versionsql\\".$name)){
+                    $info = file_get_contents(__DIR__."\\..\\..\\common\\versionsql\\".$name);
+                    if(empty($info)){
+                        $output->writeln("找到版本文件");
+                        continue;
+                    }else{
+                        $output->writeln("\033[31m 没有找到对应文件 \033[0m");
+                    }
+                    $sqlarr = explode(';',$info);
+                    foreach ($sqlarr as $k => $v) {
+                        if(empty($v)){
+                            continue;
+                        }
+                        $output->writeln("执行版本文件");
+                        try{
+                            $result = DB::execute($v);
+                            if($result == 0){
+                                // 执行成功
+                                $output->writeln("执行成功，版本");
+                            }else{
+                                $errarr[] = $v;
+                                $output->writeln("\033[31m 执行失败 \033[0m");
+                            }
+                        }catch(\Exception $e){
+                            $output->writeln("\033[31m SQL错误，".$e->getMessage()." \033[0m");
+                        }
+                    }
+                }else{
+                    $output->writeln("\033[31m 未找到版本更新文件 \033[0m");
+                }
+                $ver = $oldversion;
+            }
+            if(empty($errarr)){
+                //  没有执行错误
+                // 数据库版本更新
+                DB::table('version')->where('id',1)->update(['version'=>$ver]);
+            }else{
+                $output->writeln("\033[31m $errarr \033[0m");
+            }
+        }
+    }
+}

application/command.php

@@ -9,6 +9,7 @@
 // | Author: yunwuxin <448901948@qq.com>
 // +----------------------------------------------------------------------
 return [
-    'app\admin\command\Api'
+    'app\admin\command\Api',
+    'app\admin\command\Upgrade'
 ];
 

application/common/controller/Version.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace app\common\controller;
+
+use think\Controller;
+
+/**
+ * 前台控制器基类
+ */
+class Version extends Controller{
+    static function getVersion(){
+        $version = '2';
+        return $version;
+    }
+}

application/common/versionsql/version1

@@ -0,0 +1,73 @@
+CREATE TABLE if not exists `version` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `version` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
+INSERT INTO `version` VALUES ('1', '1');
+CREATE TABLE  if not exists `oss_callbacks`(
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `md5` varchar(255) NOT NULL,
+  `url` varchar(255) NOT NULL,
+  `region` varchar(255) NOT NULL,
+  `bucket` varchar(255) NOT NULL,
+  `size` int(11) NOT NULL,
+  `hospital_id` varchar(255) NOT NULL,
+  `status` int(11) NOT NULL DEFAULT '1',
+  `remark` varchar(255) DEFAULT NULL,
+  `x_real_ip` varchar(255) DEFAULT NULL,
+  `x_forwarded_for_ip` varchar(255) DEFAULT NULL,
+  `request_date` varchar(255) DEFAULT NULL,
+  `x_oss_request_id` varchar(255) DEFAULT NULL,
+  `x_oss_requester` varchar(255) DEFAULT NULL,
+  `x_oss_pub_key_url` varchar(255) DEFAULT NULL,
+  `authorization` varchar(255) DEFAULT NULL,
+  `content_md5` varchar(255) DEFAULT NULL,
+  `createdAt` datetime NOT NULL,
+  `updatedAt` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `md5_index` (`md5`),
+  UNIQUE KEY `url_index` (`url`),
+  KEY `oss_callbacks_hospital_id` (`hospital_id`),
+  KEY `oss_callbacks_bucket` (`bucket`),
+  KEY `oss_callbacks_status` (`status`),
+  KEY `oss_callbacks_x_real_ip` (`x_real_ip`),
+  KEY `oss_callbacks_region` (`region`),
+  KEY `oss_callbacks_x_forwarded_for_ip` (`x_forwarded_for_ip`),
+  KEY `oss_callbacks_x_oss_request_id` (`x_oss_request_id`),
+  KEY `oss_callbacks_x_oss_requester` (`x_oss_requester`),
+  KEY `oss_callbacks_authorization` (`authorization`),
+  KEY `oss_callbacks_x_oss_pub_key_url` (`x_oss_pub_key_url`)
+) ENGINE=InnoDB AUTO_INCREMENT=48 DEFAULT CHARSET=utf8;
+ALTER  TABLE  `constant`  ADD  INDEX constant_value (  `constant_value`  );
+ALTER  TABLE  `doctors`  ADD  INDEX doc_username (  `username`  );
+ALTER  TABLE  `dr_cla_permission`  ADD  INDEX dr_pass (  `pass`  );
+ALTER  TABLE  `dr_cla_permission`  ADD  INDEX dr_type (  `type`  );
+ALTER  TABLE  `exams`  ADD  INDEX exam_report (  `exam_report`  );
+ALTER  TABLE  `exams`  ADD  INDEX exam_project (  `exam_project`  );
+ALTER  TABLE  `exams`  ADD  INDEX exam_device (  `device`  );
+ALTER  TABLE  `exams`  ADD  INDEX exam_body (  `body_part`  );
+ALTER  TABLE  `exams`  ADD  INDEX exams_exam_datetime (  `exam_datetime`  );
+ALTER  TABLE  `exams`  ADD  INDEX exams_exam_class (  `exam_class`  );
+ALTER  TABLE  `exams`  ADD  INDEX exams_exam_status (  `exam_status`  );
+ALTER  TABLE  `exams`  ADD  INDEX exams_patient_num (  `patient_num`  );
+ALTER  TABLE  `exams`  ADD  INDEX exams_patient_id (  `patient_id`  );
+ALTER  TABLE  `images`  ADD  size varchar(255);
+ALTER  TABLE  `images`  ADD  institution_id varchar(100);
+ALTER  TABLE  `images`  ADD  INDEX series_id_index (  `series_id`  );
+ALTER  TABLE  `images`  ADD  INDEX images_owner (  `owner`  );
+ALTER  TABLE  `images`  ADD  INDEX images_institution_id (  `institution_id`  );
+ALTER  TABLE  `images`  ADD  INDEX images_url (  `url`  );
+ALTER  TABLE  `images`  ADD  INDEX images_series_id (  `series_id`  );
+ALTER  TABLE  `manager`  ADD  INDEX institution (  `institution_id`  );
+ALTER  TABLE  `operating`  ADD  INDEX month (  `month`  );
+ALTER  TABLE  `patient_infos`  ADD  INDEX card_num (  `card_num`  );
+ALTER  TABLE  `patient_infos`  ADD  INDEX patient_infos_institution_id (  `institution_id`  );
+ALTER  TABLE  `series`  ADD  INDEX series_modality (  `modality`  );
+ALTER  TABLE  `series`  ADD  INDEX series_study_id (  `study_id`  );
+ALTER  TABLE  `studies`  ADD  INDEX studies_institution_name (  `institution_name`  );
+ALTER  TABLE  `studies`  ADD  INDEX studies_patient_id (  `patient_id`  );
+ALTER  TABLE  `studies`  ADD  INDEX studies_studydate (  `studydate`  );
+ALTER  TABLE  `studies`  ADD  INDEX studies_modality (  `modality`  );
+ALTER  TABLE  `studies`  ADD  INDEX studies_status (  `status`  );
+ALTER  TABLE  `studies`  ADD  INDEX studies_studyid (  `studyid`  );
+ALTER  TABLE  `studies`  ADD  INDEX studies_accession_num (  `accession_num`  );

application/inter/controller/Application.php

@@ -50,7 +50,7 @@ class Application extends Base
             if(isset($_REQUEST['is_remote']) && $_REQUEST['is_remote']==1){
                 $is_remote = 1;
             }
-            $info = DB::table('exams')->where('id',$id)->field('id,study_id,patient_id,register_datetime,exam_class,exam_sub_class,exam_project,device,exam_datetime')->find();
+            $info = DB::table('exams')->where('id',$id)->field('id,study_id,patient_id,register_datetime,exam_class,exam_sub_class,exam_project,device,exam_datetime,exam_status')->find();
             $exam_class = DB::table('constant')->where('id',$info['exam_class'])->field('constant_value')->find();
             $exam_subclass = DB::table('exam_subclass')->where('id',$info['exam_sub_class'])->cache(300)->find();
             $exam_project = DB::table('exam_project')->where('id',$info['exam_project'])->cache(300)->find();
@@ -80,7 +80,7 @@ class Application extends Base
             }
             $info['parent_hospital'] = $parent_name;
             //申请信息
-            $application = DB::table('remote_application')->where('exam_id',$id)->field(['attachment','req_doctor_id','illness_desc','phys_sign','clin_symp','anamnesis','family_ill','remark','clin_diag'])->find();
+            $application = DB::table('remote_application')->where('exam_id',$id)->field(['application_desc','attachment','req_doctor_id','illness_desc','phys_sign','clin_symp','anamnesis','family_ill','remark','clin_diag'])->find();
             if($is_remote == 1){
                 //远程申请点击进入
                 $dinfo = DB::table('doctors')->where('id',$application['req_doctor_id'])->field('department_id')->find();
@@ -202,7 +202,7 @@ class Application extends Base
                 DB::table('remote_application')->where('exam_id',$param['id'])->update($application_info);
             }
             if(isset($param['apply']) && !empty($param['apply'])){
-                //保存  未申请
+                //保存  申请
                 DB::table('exams')->where('id',$param['id'])->update(['exam_status'=>4,'updatedAt'=>date('Y-m-d H:i:s',time())]);
             }
             return json_encode(['status'=>'ok','code'=>'0000','sessionid'=>$sessionid]);

application/inter/controller/Dcquery.php

@@ -121,14 +121,22 @@ class Dcquery extends Controller
             $url = 'dcm.pacsonline.cn';
         }
         $info = array();
-        $study_info = DB::table('studies')->where('id',$study_id)->field('studyuid,studyid,patient_id')->find();
+        if(strlen($study_id) == '16'){
+            $study_info = DB::table('studies')->where('id',$study_id)->field('studyuid,studyid,patient_id')->find();
+        }else{
+            $study_info = DB::table('studies')->where('studyuid',$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('birthday,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();
+        if(strlen($study_id) == '16'){
+            $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();
+        }else{
+            $series_list = DB::table('series')->where('studyuid',$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排序

application/inter/controller/Inspectregister.php

@@ -356,18 +356,18 @@ class Inspectregister extends Base
             $patient_info['sex']             = isset($param['sex']) ? $param['sex'] : '';
             $patient_info['age']             = isset($param['age']) ? $param['age'] : '';
             $patient_info['card_num']        = isset($param['card_num']) ? $param['card_num'] : '';
+            $exam_info = array();
             if(isset($param['anamnesis']) && !empty($param['anamnesis'])){
                 $ana = implode(',',$param['anamnesis']);
-                $patient_info['anamnesis']       = $ana;
+                $exam_info['anamnesis']       = $ana;
             }
-            if(isset($patient_info['family_ill']) && !empty($patient_info['family_ill'])){
-                $fam = implode(',',$patient_info['family_ill']);
-                $patient_info['family_ill']       = $fam;
+            if(isset($param['family_ill']) && !empty($param['family_ill'])){
+                $fam = implode(',',$param['family_ill']);
+                $exam_info['family_ill']       = $fam;
             }
             if(isset($param['birthday']) && !empty($param['birthday'])){
                 $patient_info['birthday']   =  str_replace('-', '', $param['birthday']);
             }
-            $exam_info = array();
             if(isset($param['exam_id']) && !empty($param['exam_id'])){
                 $pid = DB::table('exams')->where('id',$param['exam_id'])->field('patient_id,exam_status')->find();
                 if($pid['exam_status'] >= 3){

application/inter/controller/Login.php

@@ -144,4 +144,15 @@ class Login extends Controller
         Cache::clear();
         return json_encode(['status'=>'ok','code'=>'0000']);
     }
+
+
+    public function change(){
+        $id = $_REQUEST['id'];
+        $a = DB::table('exams')->where('id',$id)->update(['exam_status'=>'3']);
+        if($a){
+            echo '已更改';
+        }else{
+            echo '更改失败';
+        }
+    }
 }

application/inter/controller/Registerlist.php

@@ -81,7 +81,13 @@ class Registerlist extends Base
                             if(empty($v)){
                                 break;
                             }
-                            $where .= " and e.exam_datetime between '$v[0]' and '$v[1]'";
+                            $data1 = str_replace('-', '',$v[0]);
+                            $data2 = str_replace('-', '',$v[1]);
+                            if($data1 == $data2){
+                                $where .= " and e.exam_datetime ='$data2'";
+                            }else{
+                                $where .= " and e.exam_datetime between '$data1' and '$data2'";
+                            }
                             break;
                         case 'exam_class' :
                             if(empty($v)){

application/inter/controller/Writereport.php

@@ -63,7 +63,7 @@ class Writereport extends Base
             $info['exam_class'] = $exam_class['constant_value'];
             $exam_subclass = DB::table('exam_subclass')->where('id',$info['exam_sub_class'])->field('name')->find();
             $info['exam_sub_class'] = $exam_subclass['name'];
-            $patient_info = DB::table('patient_infos')->where('id',$info['patient_id'])->field(['id','temp_patient_id','name','sex','age'])->find();
+            $patient_info = DB::table('patient_infos')->where('id',$info['patient_id'])->field(['id','temp_patient_id','name','phone','sex','age'])->find();
             $info['pid'] = $patient_info['temp_patient_id'];
             $info['name'] = $patient_info['name'];
             $info['sex'] = $patient_info['sex'];
@@ -86,10 +86,11 @@ class Writereport extends Base
                 $cache = Cache::get($cache_key);
                 $info['description'] = $cache['description'];
                 $info['impression'] = $cache['impression'];
-                $info['report_result'] = $cache['report_result'];
+                $info['report_result'] = $cache['r_result'];
                 $info['name'] = $cache['name'];
                 $info['sex'] = $cache['sex'];
                 $info['age'] = $cache['age'];
+                $info['phone'] = $cache['phone'];
             }
             return json_encode(['status'=>'ok','code'=>'0000','info'=>$info,'sessionid'=>$sessionid,'is_remote'=>$is_remote]);
         }catch(\Exception $e){
@@ -208,6 +209,7 @@ class Writereport extends Base
             $patient_info['id']       = isset($param['pid']) ? $param['pid'] : '';
             $patient_info['name']     = isset($param['name']) ? $param['name'] : '';
             $patient_info['age']      = isset($param['age']) ? $param['age'] : '';
+            $patient_info['phone']    = isset($param['phone']) ? $param['phone'] : '';
             $patient_info['sex']      = isset($param['sex']) ? $param['sex'] : '';
             $patient = DB::table('patient_infos')->where('id',$param['pid'])->update($patient_info);
             $info = array();
@@ -621,6 +623,9 @@ class Writereport extends Base
             $doctor = Cache::get($sessionid);
             $exam_id = $_REQUEST['id'];
             $report = DB::table('report')->where('exam_id',$exam_id)->field('id')->find();
+            if(empty($report)){
+                return json_encode(['status'=>'ok','code'=>'0000','info'=>'','msg'=>'无数据']);
+            }
             $log_id = $report['id'];
             $log = DB::table('report_record')->where('doctor_id',$doctor['id'])->where('report_id',$log_id)->order('createdAt asc,type asc')->select();
             foreach ($log as $k => $v) {

application/manage/controller/Examsubclass.php

@@ -81,10 +81,11 @@ class Examsubclass extends Base {
                 }
             }
         }
-        $class = DB::view('exam_class', 'id, institution_id, name ')
+        /*$class = DB::view('exam_class', 'id, institution_id, name ')
                 ->view("institution", "name as insName", "exam_class.institution_id=institution.id")
                 ->order(array("institution.id","1"))
-                ->select();
+                ->select();*/
+        $class = DB::table('constant')->where('parent_id','exam_class')->field('id,constant_value as insName')->select();
         $this->assign("class", $class);
         return $this->fetch('edit');
     }

application/manage/view/examsubclass/edit.html

@@ -51,7 +51,7 @@
                     <td colspan="3" >
                         <select name="exam_class_id" class="easyui-combobox" style="width:150px;" >
                             {volist name="class" id="cl"}
-                                <option value="{$cl.id}" {if  isset($exam_subclass) }{if $cl.id==$exam_subclass.exam_class_id}selected{/if}{/if}>{$cl.insName}-{$cl.name}</option>
+                                <option value="{$cl.id}" {if  isset($exam_subclass) }{if $cl.id==$exam_subclass.exam_class_id}selected{/if}{/if}>{$cl.insName}</option>
                             {/volist}
                         </select>
                     </td>