xiugai

.idea/workspace.xml

@@ -22,24 +22,36 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="Reciveremote.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.php">
+      <file leaf-file-name="Openapplication.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/admin/controller/Openapplication.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-0.7096774">
-              <caret line="70" column="42" selection-start-line="70" selection-start-column="42" selection-end-line="70" selection-end-column="42" />
+            <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>
-                <marker date="1540865902230" expanded="true" signature="7641:8111" placeholder="SELECT e.exa... exams" />
-                <marker date="1540865902230" expanded="true" signature="8219:8432" placeholder="SELECT count... exams" />
+                <element signature="e#40#74#0#PHP" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Dcquery.php" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/application/inter/controller/Dcquery.php">
+      <file leaf-file-name="Report.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.5026087">
-              <caret line="129" column="25" selection-start-line="129" selection-start-column="25" selection-end-line="129" selection-end-column="25" />
+            <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>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Inspectregister.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="-5.032258">
+              <caret line="402" column="71" selection-start-line="402" selection-start-column="51" selection-end-line="402" selection-end-column="71" />
               <folding />
             </state>
           </provider>
@@ -74,17 +86,21 @@
         <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/Reciveremote.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Template.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Report.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/Writereport.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" />
       </list>
     </option>
   </component>
@@ -133,8 +149,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
-      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -148,6 +162,10 @@
               <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" />
@@ -158,12 +176,16 @@
               <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="public" />
+              <option name="myItemId" value="application" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -172,6 +194,10 @@
               <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" />
@@ -180,12 +206,20 @@
               <option name="myItemId" value="application" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="inter" />
+              <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" />
@@ -198,12 +232,20 @@
               <option name="myItemId" value="inter" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="controller" />
+              <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" />
@@ -213,22 +255,30 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="inter" />
+              <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="controller" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+              <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>
         </subPane>
       </pane>
+      <pane id="Scope" />
+      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../shenqingxinxi" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.colors.Font" />
+    <property name="settings.editor.selected.configurable" value="web-ide.project.structure" />
     <property name="settings.editor.splitter.proportion" value="0.2" />
     <property name="js-jscs-nodeInterpreter" value="D:\node.js\node.exe" />
   </component>
@@ -334,95 +384,11 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="9" />
+      <option name="time" value="10" />
     </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/application/manage/controller/Login.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.2626087">
-          <caret line="54" column="59" selection-start-line="54" selection-start-column="51" selection-end-line="54" selection-end-column="59" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/view/frontmenu/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.187826">
-          <caret line="6" column="44" selection-start-line="6" selection-start-column="42" selection-end-line="6" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/view/doctors/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.7096774">
-          <caret line="72" column="6" selection-start-line="72" selection-start-column="6" selection-end-line="72" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/view/insdoctors/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="24.838709">
-          <caret line="72" column="7" selection-start-line="72" selection-start-column="7" selection-end-line="72" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/view/insdoctors/edit.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-11.451612">
-          <caret line="132" column="17" selection-start-line="132" selection-start-column="17" selection-end-line="132" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/view/doctors/edit.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.806452">
-          <caret line="124" column="40" selection-start-line="124" selection-start-column="30" selection-end-line="124" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/controller/Insdoctors.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-5.387097">
-          <caret line="135" column="65" selection-start-line="135" selection-start-column="65" selection-end-line="135" selection-end-column="65" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/vendor/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35130435">
-          <caret line="77" column="20" selection-start-line="77" selection-start-column="20" selection-end-line="77" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/library/SysLogs.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.15304348">
-          <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/thinkphp/library/think/App.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35130435">
-          <caret line="37" column="18" selection-start-line="37" selection-start-column="18" selection-end-line="37" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/thinkphp/library/think/Debug.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35130435">
-          <caret line="35" column="27" selection-start-line="35" selection-start-column="27" selection-end-line="35" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/thinkphp/library/think/Hook.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.42782608">
-          <caret line="112" column="20" selection-start-line="112" selection-start-column="20" selection-end-line="112" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/common/library/Sms.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.03826087">
@@ -571,13 +537,6 @@
         </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="8.761739">
-          <caret line="238" column="40" selection-start-line="238" selection-start-column="23" selection-end-line="238" selection-end-column="40" />
-        </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="1.0330435">
@@ -620,128 +579,198 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="125" column="34" selection-start-line="118" selection-start-column="34" selection-end-line="125" selection-end-column="34" />
-          <folding>
-            <marker date="1540968561181" expanded="true" signature="8028:8325" placeholder="SELECT a.id,... exams" />
-            <marker date="1540968561181" expanded="true" signature="8409:8537" placeholder="SELECT count... exams" />
-          </folding>
+        <state vertical-scroll-proportion="-23.419355">
+          <caret line="38" column="22" selection-start-line="38" selection-start-column="22" selection-end-line="38" selection-end-column="22" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/database.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Login.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-2.8387096">
-          <caret line="16" column="6" selection-start-line="16" selection-start-column="6" selection-end-line="16" selection-end-column="6" />
+        <state vertical-scroll-proportion="0.03826087">
+          <caret line="34" column="39" selection-start-line="34" selection-start-column="32" selection-end-line="34" selection-end-column="39" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Registerlist.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" />
-          <folding>
-            <marker date="1541039464853" expanded="true" signature="4426:4470" placeholder="select count... templates" />
-          </folding>
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Doctors.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.21100917">
-          <caret line="57" column="46" selection-start-line="57" selection-start-column="46" selection-end-line="57" selection-end-column="46" />
-          <folding>
-            <element signature="e#260#2235#0#PHP" expanded="false" />
-            <element signature="e#5629#6944#0#PHP" expanded="false" />
-            <element signature="e#7557#10222#0#PHP" expanded="false" />
-            <marker date="1541064875727" expanded="true" signature="6390:6841" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="8560:10102" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="8678:10102" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="8796:10102" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="8913:10102" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="9030:10102" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="9154:10102" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="9279:10102" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="9400:10102" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="9522:10102" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="19448:20014" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="22676:23497" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="22800:23497" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="22925:23497" placeholder="..." />
-            <marker date="1541064875727" expanded="true" signature="23047:23497" placeholder="..." />
-          </folding>
+        <state 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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Login.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Dcquery.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" />
-          <folding>
-            <marker date="1540865309911" expanded="true" signature="4055:4226" placeholder="SELECT m.id,... menu" />
-          </folding>
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/manage/controller/Doctors.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.03826087">
-          <caret line="396" column="99" selection-start-line="396" selection-start-column="99" selection-end-line="396" selection-end-column="99" />
-          <folding />
+          <caret line="137" column="70" selection-start-line="137" selection-start-column="70" selection-end-line="137" selection-end-column="70" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Registerlist.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.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" />
+          <caret line="83" column="47" selection-start-line="83" selection-start-column="12" selection-end-line="83" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/database.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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/admin/library/traits/Backend.php">
+      <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="1540979388512" expanded="true" signature="5197:5452" placeholder="SELECT e.id,... exams" />
-            <marker date="1540979388512" expanded="true" signature="5483:5789" placeholder="SELECT e.id,... exams" />
-            <marker date="1540979388512" expanded="true" signature="6713:6841" placeholder="SELECT count... exams" />
+            <marker date="1541473454289" expanded="true" signature="9395:9502" placeholder="SELECT COLUM... COLUMNS" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/admin/controller/Index.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" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../test_sockets.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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/.git/config">
+      <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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/admin/model/Openapplication.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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/common/controller/Backend.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>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.03826087">
-          <caret line="290" column="57" selection-start-line="290" selection-start-column="57" selection-end-line="290" selection-end-column="57" />
-          <folding>
-            <element signature="e#13107#14413#0#PHP" expanded="false" />
-          </folding>
+        <state 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" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.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.7096774">
-          <caret line="70" column="42" selection-start-line="70" selection-start-column="42" selection-end-line="70" selection-end-column="42" />
+        <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" />
           <folding>
-            <marker date="1540865902230" expanded="true" signature="7641:8111" placeholder="SELECT e.exa... exams" />
-            <marker date="1540865902230" expanded="true" signature="8219:8432" placeholder="SELECT count... exams" />
+            <element signature="e#38#68#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Doctors.php">
+    <entry file="file://$PROJECT_DIR$/application/common/library/Ems.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="1.4156522">
+          <caret line="37" column="50" selection-start-line="37" selection-start-column="50" selection-end-line="37" selection-end-column="50" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Dcquery.php">
+    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/database.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5026087">
-          <caret line="129" column="25" selection-start-line="129" selection-start-column="25" selection-end-line="129" selection-end-column="25" />
+        <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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/common/library/Auth.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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/index/controller/User.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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.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" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/admin/controller/Openapplication.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" />
+          <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>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

.idea/yczd.iml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$/../../shenqingxinxi" />
     <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

application/inter/controller/Reciveremote.php

@@ -86,6 +86,9 @@ class Reciveremote extends Base
                             $where .= " and p.name  like '".$v."%' ";
                             break;
                         case 'applicationtime':
+                            if(empty($v)){
+                                break;
+                            }
                             $where .= " and ra.req_date_time between '$v[0]' and '$v[1]'";
                             break;
                         case 'is_urgent':
@@ -127,13 +130,19 @@ class Reciveremote extends Base
                 $sql3 = "SELECT e.exam_status,e.exam_class,e.body_part,e.device,e.exam_sub_class,e.exam_datetime,p.name,p.sex,p.temp_patient_id,p.age,ra.*,r.report_doctor_id,r.report_datetime,r.report_result,e.id from exams as e,remote_application as ra,patient_infos as p,report as r where ra.exam_id=e.id and e.patient_id=p.id and r.exam_id=e.id and ra.remote_institution_id='" . $doctor['institution_id'] . "'and e.exam_status not in (".$dclass['doctor_class'].")";
                 $sql = '('.$sql1.') union ('.$sql2.') union ('.$sql3.')'.$limit;
             }else{*/
-                $sql = "SELECT e.exam_status,e.exam_class,e.exam_sub_class,e.body_part,e.device,e.exam_datetime,p.name,p.sex,p.temp_patient_id,p.age,ra.*,r.report_doctor_id,r.report_datetime,r.report_result,e.id from exams as e,remote_application as ra,patient_infos as p,report as r where ra.exam_id=e.id and e.patient_id=p.id and r.exam_id=e.id and ra.remote_institution_id='" . $doctor['institution_id']."'".$where." order by field(e.exam_status,6,7,8,4,9),ra.is_urgent desc,e.createdAt desc";
+                $sql = "SELECT e.id,e.exam_status,e.exam_class,e.exam_sub_class,e.body_part,e.device,e.exam_datetime,p.name,p.sex,p.temp_patient_id,p.age,ra.*,r.report_doctor_id,r.report_datetime,r.report_result,e.id from exams as e,remote_application as ra,patient_infos as p,report as r where ra.exam_id=e.id and e.patient_id=p.id and r.exam_id=e.id and ra.remote_institution_id='" . $doctor['institution_id']."'".$where." order by field(e.exam_status,6,7,8,4,9),ra.is_urgent desc,e.createdAt desc";
 //            }
             log::record($sql);
             $list = DB::query($sql);
             $csql = "SELECT count(1) from exams as e,remote_application as ra,patient_infos as p,report as r where ra.exam_id=e.id and e.patient_id=p.id and r.exam_id=e.id and ra.remote_institution_id='" . $doctor['institution_id']."'".$where;
             $count = DB::query($csql);
             foreach ($list as $k => $v) {
+                $cache_key = $doctor['id'].'_'.$v['id'];
+                if(Cache::get($cache_key)){
+                    $list[$k]['status'] = 1;
+                }else{
+                    $list[$k]['status'] = 0;
+                }
                 //申请医院
                 $local_institution = DB::table('institution')->where('id',$v['local_institution_id'])->cache(300)->field('name')->find();
                 $list[$k]['local_institution_name'] = $local_institution['name'];

application/inter/controller/Report.php

@@ -110,7 +110,9 @@ class Report extends Base
                             if(empty($v)){
                                 break;
                             }
-                            $where = " and a.exam_datetime between '$v[0]' and '$v[1]'";
+                            $data1 = str_replace('-', '',$v[0]);
+                            $data2 = str_replace('-', '',$v[1]);
+                            $where = " and a.exam_datetime between '$data1' and '$data2'";
                             break;
                         case 'exam_status':
                             if($v != 10 && !empty($v)){
@@ -146,7 +148,7 @@ class Report extends Base
 
                 $sql = '('.$sql1.') union ('.$sql2.') union ('.$sql3.')'.$limit;
             }else{*/
-                $sql = "SELECT a.id,a.urgent,a.is_remote,a.patient_num,a.exam_report,a.study_id,a.exam_datetime,a.exam_project,a.exam_status,a.exam_class,p.name,p.sex,p.age FROM exams as a,patient_infos as p where a.institution_id='".$doctor['institution_id']."' and p.id=a.patient_id ".$where." order by a.createdAt desc".$limit;
+                $sql = "SELECT a.id,a.urgent,a.is_remote,a.accession_num,a.exam_report,a.study_id,a.exam_datetime,a.exam_project,a.exam_status,a.exam_class,p.name,p.sex,p.age FROM exams as a,patient_infos as p where a.institution_id='".$doctor['institution_id']."' and p.id=a.patient_id ".$where." order by a.createdAt desc".$limit;
 //            }
             $list = DB::query($sql);
             $csql = "SELECT count(1) FROM exams as a,patient_infos as p where a.institution_id='".$doctor['institution_id']."' and p.id=a.patient_id ".$where;
@@ -156,6 +158,12 @@ class Report extends Base
             log::record('请求到的数据');
             log::record($list);
             foreach ($list as $k => $v) {
+                $cache_key = $doctor['id'].'_'.$v['id'];
+                if(Cache::get($cache_key)){
+                    $list[$k]['status'] = 1;
+                }else{
+                    $list[$k]['status'] = 0;
+                }
                 if($v['is_remote'] == 1){
                     // 远程报告   获取发送的报告医院
                     $remote = DB::table('remote_application')->where('exam_id',$v['id'])->field('remote_institution_id')->find();

application/inter/controller/Writereport.php

@@ -58,7 +58,7 @@ class Writereport extends Base
             $institution = DB::table('institution')->where('id',$doctor['institution_id'])->field('name,report_subtitle')->find();
             $param = $_REQUEST['param'];
             $id = $param['id'];
-            $info = DB::table('exams')->where('id',$id)->field(['id','study_id','exam_class','exam_datetime','exam_sub_class','body_part','accession_num','patient_id','film_type'])->find();
+            $info = DB::table('exams')->where('id',$id)->field(['id','study_id','exam_class','exam_status','exam_datetime','exam_sub_class','body_part','accession_num','patient_id','film_type'])->find();
             $exam_class = DB::table('constant')->where('id',$info['exam_class'])->field('constant_value')->find();
             $info['exam_class'] = $exam_class['constant_value'];
             $exam_subclass = DB::table('exam_subclass')->where('id',$info['exam_sub_class'])->field('name')->find();
@@ -188,6 +188,10 @@ class Writereport extends Base
                 return json_encode(['status'=>'fail','code'=>'1029','msg'=>'没有操作权限']);
             }
             $param = $_REQUEST['param'];
+            $status = DB::table('exams')->where('id',$param['id'])->field('exam_status')->find();
+            if($status['exam_status'] > 6){
+                return json_encode(['status'=>'fail','code'=>'1034','msg'=>'报告已被保存，无法再次被修改']);
+            }
 //            Verify::wreportCheck($param);
             $doctor = Cache::get($sessionid);
             $remote_app = DB::table('remote_application')->where('exam_id',$param['id'])->field('remote_doctor_id')->find();
@@ -199,7 +203,7 @@ class Writereport extends Base
             $this->uuids = new UUIDs();
             //初步报告生成
             $film_type = isset($param['film_type']) ? $param['film_type'] : '';
-            $exam_status = $this->get_exam_status($doctor['id'],7);
+            // $exam_status = $this->get_exam_status($doctor['id'],7);
             $patient_info = array();
             $patient_info['id']       = isset($param['pid']) ? $param['pid'] : '';
             $patient_info['name']     = isset($param['name']) ? $param['name'] : '';
@@ -215,7 +219,7 @@ class Writereport extends Base
             }else{
                 $info['report_result'] = 1;
             }
-            DB::table('exams')->where('id',$param['id'])->update(['exam_status'=>$exam_status,'film_type'=>$film_type,'exam_report'=>$info['report_result']]);
+            DB::table('exams')->where('id',$param['id'])->update(['exam_status'=>'7','film_type'=>$film_type,'exam_report'=>$info['report_result']]);
             $info['report_datetime']  = date('Y-m-d H:i:s',time());
             $info['report_doctor_id'] = $doctor['id'];
             $report_info = DB::table('report')->where('exam_id',$param['id'])->find();
@@ -383,18 +387,33 @@ class Writereport extends Base
      **/
     public function confirm(){
         try{
+            $is_remote = $_REQUEST['is_remote'];
+            if($is_remote == 1){
+                return json_encode(['status'=>'fail','code'=>'1133','msg'=>'远程无法确诊报告']);
+            }
             $sessionid = $_REQUEST['sessionid'];
             $doctor = Cache::get($sessionid);
-            $id = $_REQUEST['id'];
+            $param = $_REQUEST['param'];
+            $id = $param['id'];
             $status = DB::table('exams')->where('id',$id)->field('exam_status')->find();
             if($status['exam_status'] < 8 ){
                 return json_encode(['status'=>'fail','code'=>'1033','msg'=>'只能确认通过审核的报告']);
             }elseif($status['exam_status'] == 9){
                 return json_encode(['status'=>'fail','code'=>'1034','msg'=>'已经确认过该报告，不可再次确认']);
             }
-            $exam_status = $this->get_exam_status($doctor['id'],9);
-            DB::table('exams')->where('id',$id)->update(['exam_status'=>$exam_status,'film_type'=>$_REQUEST['film_type']]);
-            DB::table('report')->where('exam_id',$id)->update(['confirm_doctor_id'=>$doctor['id'],'confirm_datetime'=>date('Y-m-d H:i:s')]);
+            $rinfo = array();
+            $rinfo['impression']       = isset($param['impression']) ? $param['impression'] : '';
+            $rinfo['description']      = isset($param['description']) ? $param['description'] : '';
+            if(isset($param['r_result']) && $param['r_result'] == 'true'){
+                $rinfo['report_result'] = 2;
+            }else{
+                $rinfo['report_result'] = 1;
+            }
+            $rinfo['confirm_datetime']  = date('Y-m-d H:i:s',time());
+            $rinfo['confirm_doctor_id'] = $doctor['id'];
+            // $exam_status = $this->get_exam_status($doctor['id'],9);
+            DB::table('exams')->where('id',$id)->update(['exam_status'=>'9','film_type'=>$_REQUEST['param']['film_type']]);
+            DB::table('report')->where('exam_id',$id)->update($rinfo);
             $cache_key = $doctor['id'].'_'.$id;
             if(Cache::get($cache_key)){
                 Cache::rm($cache_key);
@@ -487,8 +506,8 @@ class Writereport extends Base
             $info['description']      = isset($param['description']) ? $param['description'] : '';
             $info['report_id'] = $report['id'];
             DB::table('report_record')->insert($info);
-            $exam_status = $this->get_exam_status($doctor['id'],8);
-            DB::table('exams')->where('id',$id)->update(['exam_status'=>$exam_status,'film_type'=>$param['film_type']]);
+            // $exam_status = $this->get_exam_status($doctor['id'],8);
+            DB::table('exams')->where('id',$id)->update(['exam_status'=>'8','film_type'=>$param['film_type']]);
             return json_encode(['status'=>'ok','code'=>'0000','msg'=>'已审核']);
         }catch(\Exception $e){
             return json_encode(['status'=>'fail','code'=>'2000','msg'=>$e->getMessage()]);
@@ -739,7 +758,7 @@ class Writereport extends Base
         $sessionid = $_REQUEST['sessionid'];
         $doctor = Cache::get($sessionid);
         $param = $_REQUEST['param'];
-        $exam_id = $param['exam_id'];
+        $exam_id = $param['id'];
         $key = $doctor['id'].'_'.$exam_id;
         Cache::set($key,$param);
         return json_encode(['status'=>'ok','msg'=>'保存成功','code'=>'0000']);