xiugai baocun

.idea/workspace.xml

@@ -25,44 +25,66 @@
       <file leaf-file-name="Index.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-0.0">
-              <caret line="36" column="28" selection-start-line="36" selection-start-column="28" selection-end-line="36" selection-end-column="28" />
+            <state vertical-scroll-proportion="-10.645162">
+              <caret line="38" column="22" selection-start-line="38" selection-start-column="22" selection-end-line="38" selection-end-column="22" />
               <folding>
-                <marker date="1540868903918" expanded="true" signature="3084:3128" placeholder="select count... templates" />
+                <marker date="1541039464853" expanded="true" signature="4426:4470" placeholder="select count... templates" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Template.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/inter/controller/Template.php">
+      <file leaf-file-name="Report.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="161" column="39" selection-start-line="161" selection-start-column="32" selection-end-line="161" selection-end-column="39" />
-              <folding />
+              <caret line="125" column="34" selection-start-line="118" selection-start-column="34" selection-end-line="125" selection-end-column="34" />
+              <folding>
+                <marker date="1540968561181" expanded="true" signature="8028:8325" placeholder="SELECT a.id,... exams" />
+                <marker date="1540968561181" expanded="true" signature="8409:8537" placeholder="SELECT count... exams" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Report.php" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
+      <file leaf-file-name="Writereport.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.84695655">
-              <caret line="124" column="45" selection-start-line="124" selection-start-column="45" selection-end-line="124" selection-end-column="45" />
+            <state vertical-scroll-proportion="0.44347826">
+              <caret line="615" column="5" selection-start-line="615" selection-start-column="5" selection-end-line="615" selection-end-column="5" />
               <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" />
+                <element signature="e#260#2235#0#PHP" expanded="false" />
+                <element signature="e#5629#6944#0#PHP" expanded="false" />
+                <element signature="e#6949#7552#0#PHP" expanded="false" />
+                <element signature="e#7557#10222#0#PHP" expanded="false" />
+                <marker date="1541054804855" expanded="true" signature="6390:6841" placeholder="..." />
+                <marker date="1541054804855" expanded="true" signature="8560:10102" placeholder="..." />
+                <marker date="1541054804855" expanded="true" signature="8678:10102" placeholder="..." />
+                <marker date="1541054804855" expanded="true" signature="8796:10102" placeholder="..." />
+                <marker date="1541054804855" expanded="true" signature="8913:10102" placeholder="..." />
+                <marker date="1541054804855" expanded="true" signature="9030:10102" placeholder="..." />
+                <marker date="1541054804855" expanded="true" signature="9154:10102" placeholder="..." />
+                <marker date="1541054804855" expanded="true" signature="9279:10102" placeholder="..." />
+                <marker date="1541054804855" expanded="true" signature="9400:10102" placeholder="..." />
+                <marker date="1541054804855" expanded="true" signature="9522:10102" placeholder="..." />
+                <marker date="1541054804855" expanded="true" signature="19316:19882" placeholder="..." />
+                <marker date="1541054804855" expanded="true" signature="22544:23365" placeholder="..." />
+                <marker date="1541054804855" expanded="true" signature="22668:23365" placeholder="..." />
+                <marker date="1541054804855" expanded="true" signature="22793:23365" placeholder="..." />
+                <marker date="1541054804855" expanded="true" signature="22915:23365" placeholder="..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Writereport.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
+      <file leaf-file-name="Login.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/inter/controller/Login.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-8.645162">
-              <caret line="441" column="60" selection-start-line="441" selection-start-column="60" selection-end-line="441" selection-end-column="60" />
-              <folding />
+            <state vertical-scroll-proportion="0.0">
+              <caret line="34" column="39" selection-start-line="34" selection-start-column="32" selection-end-line="34" selection-end-column="39" />
+              <folding>
+                <marker date="1540865309911" expanded="true" signature="4055:4226" placeholder="SELECT m.id,... menu" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -71,7 +93,7 @@
         <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.php">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="401" column="13" selection-start-line="401" selection-start-column="13" selection-end-line="401" selection-end-column="13" />
+              <caret line="396" column="99" selection-start-line="396" selection-start-column="99" selection-end-line="396" selection-end-column="99" />
               <folding />
             </state>
           </provider>
@@ -80,12 +102,12 @@
       <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="-2.935484">
-              <caret line="103" column="54" selection-start-line="103" selection-start-column="54" selection-end-line="103" selection-end-column="54" />
+            <state vertical-scroll-proportion="0.0">
+              <caret line="101" column="39" selection-start-line="101" selection-start-column="39" selection-end-line="101" selection-end-column="39" />
               <folding>
-                <marker date="1540885428008" expanded="true" signature="4877:5132" placeholder="SELECT e.id,... exams" />
-                <marker date="1540885428008" expanded="true" signature="5163:5469" placeholder="SELECT e.id,... exams" />
-                <marker date="1540885428008" expanded="true" signature="6393:6521" placeholder="SELECT count... exams" />
+                <marker date="1540979388512" expanded="true" signature="5197:5452" placeholder="SELECT e.id,... exams" />
+                <marker date="1540979388512" expanded="true" signature="5483:5789" placeholder="SELECT e.id,... exams" />
+                <marker date="1540979388512" expanded="true" signature="6713:6841" placeholder="SELECT count... exams" />
               </folding>
             </state>
           </provider>
@@ -94,21 +116,29 @@
       <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="-14.193548">
-              <caret line="27" column="35" selection-start-line="27" selection-start-column="28" selection-end-line="27" selection-end-column="35" />
+            <state vertical-scroll-proportion="0.0">
+              <caret line="290" column="57" selection-start-line="290" selection-start-column="57" selection-end-line="290" selection-end-column="57" />
               <folding>
-                <element signature="e#9243#13221#0#PHP" expanded="false" />
-                <element signature="e#13228#14534#0#PHP" expanded="false" />
-                <element signature="e#18108#19444#0#PHP" expanded="false" />
+                <element signature="e#13107#14413#0#PHP" expanded="false" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="Doctors.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/inter/controller/Doctors.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="15.5161295">
+              <caret line="200" column="18" selection-start-line="200" selection-start-column="18" selection-end-line="200" selection-end-column="18" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </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="-6.516129">
+            <state vertical-scroll-proportion="0.0">
               <caret line="76" column="34" selection-start-line="76" selection-start-column="34" selection-end-line="83" selection-end-column="34" />
               <folding>
                 <marker date="1540865902230" expanded="true" signature="7641:8111" placeholder="SELECT e.exa... exams" />
@@ -147,16 +177,17 @@
         <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/Application.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Doctors.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Inspectregister.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/Writereport.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Index.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Registerlist.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" />
       </list>
     </option>
   </component>
@@ -170,8 +201,7 @@
   </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
   <component name="ProjectFrameBounds">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
+    <option name="x" value="-9" />
     <option name="width" value="1382" />
     <option name="height" value="744" />
   </component>
@@ -206,6 +236,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
@@ -293,87 +324,8 @@
               <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.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="admin" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="command" />
-              <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.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="admin" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="command" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Api" />
-              <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.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="admin" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="command" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Api" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="library" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -428,7 +380,7 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
+    <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" />
@@ -490,13 +442,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/application/manage/view/login/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5743119">
-          <caret line="58" column="20" selection-start-line="58" selection-start-column="20" selection-end-line="58" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/manage/controller/Login.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-0.2626087">
@@ -662,7 +607,6 @@
       <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" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -741,6 +685,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="1.0330435">
           <caret line="36" column="90" selection-start-line="36" selection-start-column="90" selection-end-line="36" selection-end-column="90" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -765,110 +710,140 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Doctors.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Messages.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-2.9672132">
-          <caret line="160" column="39" selection-start-line="160" selection-start-column="32" selection-end-line="160" selection-end-column="39" />
+          <caret line="112" column="39" selection-start-line="112" selection-start-column="32" selection-end-line="112" selection-end-column="39" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Login.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Operating.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-2.9672132">
-          <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="-3.5081968">
+          <caret line="27" column="16" selection-start-line="27" selection-start-column="11" selection-end-line="27" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Messages.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Template.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.0">
+          <caret line="161" column="39" selection-start-line="161" selection-start-column="32" selection-end-line="161" selection-end-column="39" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Operating.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.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.0">
+          <caret line="76" column="34" selection-start-line="76" selection-start-column="34" selection-end-line="83" selection-end-column="34" />
+          <folding>
+            <marker date="1540865902230" expanded="true" signature="7641:8111" placeholder="SELECT e.exa... exams" />
+            <marker date="1540865902230" expanded="true" signature="8219:8432" placeholder="SELECT count... exams" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="401" column="13" selection-start-line="401" selection-start-column="13" selection-end-line="401" selection-end-column="13" />
+          <caret line="396" column="99" selection-start-line="396" selection-start-column="99" selection-end-line="396" selection-end-column="99" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="36" column="28" selection-start-line="36" selection-start-column="28" selection-end-line="36" selection-end-column="28" />
+          <caret line="290" column="57" selection-start-line="290" selection-start-column="57" selection-end-line="290" selection-end-column="57" />
           <folding>
-            <marker date="1540868903918" expanded="true" signature="3084:3128" placeholder="select count... templates" />
+            <element signature="e#13107#14413#0#PHP" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Template.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Login.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="161" column="39" selection-start-line="161" selection-start-column="32" selection-end-line="161" selection-end-column="39" />
-          <folding />
+          <caret line="34" column="39" selection-start-line="34" selection-start-column="32" selection-end-line="34" selection-end-column="39" />
+          <folding>
+            <marker date="1540865309911" expanded="true" signature="4055:4226" placeholder="SELECT m.id,... menu" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-8.645162">
-          <caret line="441" column="60" selection-start-line="441" selection-start-column="60" selection-end-line="441" selection-end-column="60" />
-          <folding />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="125" column="34" selection-start-line="118" selection-start-column="34" selection-end-line="125" selection-end-column="34" />
+          <folding>
+            <marker date="1540968561181" expanded="true" signature="8028:8325" placeholder="SELECT a.id,... exams" />
+            <marker date="1540968561181" expanded="true" signature="8409:8537" placeholder="SELECT count... exams" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Registerlist.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-2.935484">
-          <caret line="103" column="54" selection-start-line="103" selection-start-column="54" selection-end-line="103" selection-end-column="54" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="101" column="39" selection-start-line="101" selection-start-column="39" selection-end-line="101" selection-end-column="39" />
           <folding>
-            <marker date="1540885428008" expanded="true" signature="4877:5132" placeholder="SELECT e.id,... exams" />
-            <marker date="1540885428008" expanded="true" signature="5163:5469" placeholder="SELECT e.id,... exams" />
-            <marker date="1540885428008" expanded="true" signature="6393:6521" placeholder="SELECT count... exams" />
+            <marker date="1540979388512" expanded="true" signature="5197:5452" placeholder="SELECT e.id,... exams" />
+            <marker date="1540979388512" expanded="true" signature="5483:5789" placeholder="SELECT e.id,... exams" />
+            <marker date="1540979388512" expanded="true" signature="6713:6841" placeholder="SELECT count... exams" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
+    <entry file="file://$PROJECT_DIR$/application/database.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-14.193548">
-          <caret line="27" column="35" selection-start-line="27" selection-start-column="28" selection-end-line="27" selection-end-column="35" />
-          <folding>
-            <element signature="e#9243#13221#0#PHP" expanded="false" />
-            <element signature="e#13228#14534#0#PHP" expanded="false" />
-            <element signature="e#18108#19444#0#PHP" expanded="false" />
-          </folding>
+        <state vertical-scroll-proportion="-2.8387096">
+          <caret line="16" column="6" selection-start-line="16" selection-start-column="6" selection-end-line="16" selection-end-column="6" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.516129">
-          <caret line="76" column="34" selection-start-line="76" selection-start-column="34" selection-end-line="83" selection-end-column="34" />
+        <state vertical-scroll-proportion="-10.645162">
+          <caret line="38" column="22" selection-start-line="38" selection-start-column="22" selection-end-line="38" selection-end-column="22" />
           <folding>
-            <marker date="1540865902230" expanded="true" signature="7641:8111" placeholder="SELECT e.exa... exams" />
-            <marker date="1540865902230" expanded="true" signature="8219:8432" placeholder="SELECT count... exams" />
+            <marker date="1541039464853" expanded="true" signature="4426:4470" placeholder="select count... templates" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Doctors.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.84695655">
-          <caret line="124" column="45" selection-start-line="124" selection-start-column="45" selection-end-line="124" selection-end-column="45" />
+        <state vertical-scroll-proportion="15.5161295">
+          <caret line="200" column="18" selection-start-line="200" selection-start-column="18" selection-end-line="200" selection-end-column="18" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44347826">
+          <caret line="615" column="5" selection-start-line="615" selection-start-column="5" selection-end-line="615" selection-end-column="5" />
           <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" />
+            <element signature="e#260#2235#0#PHP" expanded="false" />
+            <element signature="e#5629#6944#0#PHP" expanded="false" />
+            <element signature="e#6949#7552#0#PHP" expanded="false" />
+            <element signature="e#7557#10222#0#PHP" expanded="false" />
+            <marker date="1541054804855" expanded="true" signature="6390:6841" placeholder="..." />
+            <marker date="1541054804855" expanded="true" signature="8560:10102" placeholder="..." />
+            <marker date="1541054804855" expanded="true" signature="8678:10102" placeholder="..." />
+            <marker date="1541054804855" expanded="true" signature="8796:10102" placeholder="..." />
+            <marker date="1541054804855" expanded="true" signature="8913:10102" placeholder="..." />
+            <marker date="1541054804855" expanded="true" signature="9030:10102" placeholder="..." />
+            <marker date="1541054804855" expanded="true" signature="9154:10102" placeholder="..." />
+            <marker date="1541054804855" expanded="true" signature="9279:10102" placeholder="..." />
+            <marker date="1541054804855" expanded="true" signature="9400:10102" placeholder="..." />
+            <marker date="1541054804855" expanded="true" signature="9522:10102" placeholder="..." />
+            <marker date="1541054804855" expanded="true" signature="19316:19882" placeholder="..." />
+            <marker date="1541054804855" expanded="true" signature="22544:23365" placeholder="..." />
+            <marker date="1541054804855" expanded="true" signature="22668:23365" placeholder="..." />
+            <marker date="1541054804855" expanded="true" signature="22793:23365" placeholder="..." />
+            <marker date="1541054804855" expanded="true" signature="22915:23365" placeholder="..." />
           </folding>
         </state>
       </provider>

application/inter/controller/Application.php

@@ -186,10 +186,6 @@ class Application extends Base
             $application_info['req_doctor_id'] = $doctor['id'];
             $application_info['remote_doctor_id'] = isset($param['remote_doctor_id']) ? $param['remote_doctor_id'] : '';
             $application_info['attachment'] = isset($param['attachment']) ? $param['attachment'] : '';
-            if(isset($param['apply']) && !empty($param['apply'])){
-                //保存  未申请
-                DB::table('exams')->where('id',$param['id'])->update(['status'=>4,'updatedAt'=>date('Y-m-d H:i:s',time())]);
-            }
             $remote_application = DB::table('remote_application')->where('exam_id',$param['id'])->select();
             // 申请远程
             if(empty($remote_application)){
@@ -205,7 +201,10 @@ class Application extends Base
                 log::record('修改远程申请');
                 DB::table('remote_application')->where('exam_id',$param['id'])->update($application_info);
             }
-            DB::table('exams')->where('id',$param['id'])->update(['exam_status'=>4,'updatedAt'=>date('Y-m-d H:i:s',time())]);
+            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]);
         }catch(\Exception $e){
             return json_encode(['status'=>'fail','code'=>'2000','msg'=>$e->getMessage()]);

application/inter/controller/Doctors.php

@@ -196,4 +196,48 @@ class Doctors extends Base
         }
 
     }
+
+    /**
+     * 获取本地左侧菜单第一项
+     *
+     * @ApiTitle            (获取本地左侧菜单第一项)
+     * @ApiSummary          (获取本地左侧菜单第一项)
+     * @ApiSector           (远程诊断)
+     * @ApiMethod           (POST)
+     * @ApiRoute            (/inter/doctors/getmenu)
+     * @ApiHeaders        (name="sign", type="string", required=true, description="请求头-校验key")
+     * @ApiHeaders        (name="nonce", type="string", required=true, description="请求头-随机数")
+     * @ApiHeaders        (name="timestamp", type=string, required=true, description="请求头-时间戳s")
+     * @ApiParams         (name="sessionid",                 type="string",      required=true,      description="参数json字符串")
+     * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
+     * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
+     * @ApiReturnParams   (name="info",                      type="object",      sample="{}",        description="左侧菜单的列表id")
+     * @ApiReturn   (data="
+    {
+    'status': ok,
+    'code': '0000',
+    'info': 'bdb52c21d1687709'
+    }
+     *")
+     **/
+    public function getmenu(){
+        $sessionid = $_REQUEST['sessionid'];
+        $doctor = Cache::get($sessionid);
+        $dr = DB::table('dr_cla_permission')->where('doctor_id',$doctor['id'])->field('pass')->select();
+        $first = array();
+        $second = array();
+        $third = array();
+        $first['pass'] = 'bdb52c21d1687709'; //预约登记
+        if(in_array($first,$dr)){
+            return  json_encode(['status'=>'ok','code'=>'0000','info'=>'bdb52c21d1687709']);
+        }
+        $second['pass'] = '0eac42ef01de23ff'; //登记列表
+        if(in_array($second,$dr)){
+            return  json_encode(['status'=>'ok','code'=>'0000','info'=>'0eac42ef01de23ff']);
+        }
+        $third['pass'] = '80ddb7d09ebc44b4'; //科室报告
+        if(in_array($third,$dr)){
+            return  json_encode(['status'=>'ok','code'=>'0000','info'=>'80ddb7d09ebc44b4']);
+        }
+    }
 }

application/inter/controller/Index.php

@@ -28,6 +28,42 @@ class Index extends Controller
     }
 
     public function  index(){
+        /*$a = DB::table('doctors')->where('institution_id','73090001')->select();
+        foreach($a as $k=>$v){
+            $c = DB::table('dr_cla_permission')->where('doctor_id',$v['id'])->where('pass','bdb52c21d1687709')->delete();
+            $d = DB::table('dr_cla_permission')->where('doctor_id',$v['id'])->where('pass','0eac42ef01de23ff')->delete();
+        }
+        // bdb52c21d1687709  预约登记
+        // 0eac42ef01de23ff 登记列表*/
+        die;
+        $doctor = '1';
+        $dr = DB::table('dr_cla_permission')->where('doctor_id',1)->field('pass')->select();
+        $a = array();
+        $a['pass'] = '0eac42ef01de23ff';
+        if(in_array($a,$dr)){
+            echo 1;die;
+        }
+        foreach ($dr as $k => $v) {
+
+            /*if($v['pass'] ==  'bdb52c21d1687709'){
+                //预约登记
+                return json_encode(['status'=>'ok','code'=>'0000','info'=>'修改成功']);
+            }*/
+            /*switch($v['pass']){
+                case 'bdb52c21d1687709':
+                    return '预约登记';
+                    break;
+                case '0eac42ef01de23ff':
+                    //登记列表
+                    return '登记列表';
+                    break;
+                case '80ddb7d09ebc44b4':
+                    //科室报告
+                    return '科室报告';
+                    break;
+            }*/
+        }
+        die;
         // DR->DX
         $a = DB::table('templates')->where('is_public','1')->where('exam_class_id','DR')->select();
         foreach ($a as $k => $v) {

application/inter/controller/Inspectregister.php

@@ -303,6 +303,7 @@ class Inspectregister extends Base
      * @ApiParams         (name="param[phone]",              type="string",      sample="",          description="手机号<选填>")
      * @ApiParams         (name="param[sex]",              type="string",      sample="",          description="性别<选填>")
      * @ApiParams         (name="param[age]",              type="string",      sample="",          description="年龄<选填>")
+     * @ApiParams         (name="param[card_num]",              type="string",      sample="",          description="身份证号<选填>")
      * @ApiParams         (name="param[anamnesis]",            type="string",      sample="",          description="既往史<选填>")
      * @ApiParams         (name="param[family_ill]",           type="string",      sample="",          description="家族史<选填>")
      * @ApiParams         (name="param[birthday]",              type="string",      sample="",          description="生日<选填>")
@@ -354,6 +355,7 @@ class Inspectregister extends Base
             $patient_info['phone']           = isset($param['phone']) ? $param['phone'] : '';
             $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'] : '';
             if(isset($param['anamnesis']) && !empty($param['anamnesis'])){
                 $ana = implode(',',$param['anamnesis']);
                 $patient_info['anamnesis']       = $ana;

application/inter/controller/Registerlist.php

@@ -83,6 +83,13 @@ class Registerlist extends Base
                             }
                             $where .= " and e.exam_datetime between '$v[0]' and '$v[1]'";
                             break;
+                        case 'exam_class' :
+                            if(empty($v)){
+                                break;
+                            }
+                            $ex = implode('\',\'',$v);
+                            $where .= " and e.exam_class in ('".$ex."')";
+                            break;
                         default:
                             if(empty($v)){
                                 break;

application/inter/controller/Writereport.php

@@ -81,6 +81,16 @@ class Writereport extends Base
             $info['description'] = $report['description'];
             $info['impression'] = $report['impression'];
             $info['report_result'] = $report['report_result'];
+            $cache_key = $doctor['id'].'_'.$id;
+            if(Cache::get($cache_key)){
+                $cache = Cache::get($cache_key);
+                $info['description'] = $cache['description'];
+                $info['impression'] = $cache['impression'];
+                $info['report_result'] = $cache['report_result'];
+                $info['name'] = $cache['name'];
+                $info['sex'] = $cache['sex'];
+                $info['age'] = $cache['age'];
+            }
             return json_encode(['status'=>'ok','code'=>'0000','info'=>$info,'sessionid'=>$sessionid,'is_remote'=>$is_remote]);
         }catch(\Exception $e){
             return json_encode(['status'=>'fail','code'=>'2000','msg'=>$e->getMessage()]);
@@ -218,6 +228,10 @@ class Writereport extends Base
                 $info['createdAt'] = date('Y-m-d H:i:s',time());
                 $report = DB::table('report')->insert($info);
             }
+            $cache_key = $doctor['id'].'_'.$param['id'];
+            if(Cache::get($cache_key)){
+                Cache::rm($cache_key);
+            }
             //写入log日志
             log::record('----日志写入----');
             $log = array();
@@ -355,6 +369,7 @@ class Writereport extends Base
      * @ApiHeaders        (name="timestamp", type=string, required=true, description="请求头-时间戳s")
      * @ApiParams         (name="sessionid",                 type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="id",        type="string",      sample="",          description="exams表id值<必填>")
+     * @ApiParams         (name="film_type",        type="string",      sample="",          description="胶片类型<必填>")
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="msg",                       type="string",      required=true,      sample="返回成功", description="返回消息")
@@ -378,8 +393,12 @@ class Writereport extends Base
                 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]);
+            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')]);
+            $cache_key = $doctor['id'].'_'.$id;
+            if(Cache::get($cache_key)){
+                Cache::rm($cache_key);
+            }
             // 添加  确认log日志
             $info = array();
             $info['id'] = UUIDs::uuid16();
@@ -455,6 +474,10 @@ class Writereport extends Base
             $report_info['review_datetime']  =  date('Y-m-d H:i:s',time());
             $report_info['review_doctor_id'] = $doctor['id'];
             DB::table('report')->where('id',$report['id'])->update($report_info);
+            $cache_key = $doctor['id'].'_'.$id;
+            if(Cache::get($cache_key)){
+                Cache::rm($cache_key);
+            }
             $info = array();
             $info['id'] = UUIDs::uuid16();
             $info['type'] = 2; //审核
@@ -465,7 +488,7 @@ class Writereport extends Base
             $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]);
+            DB::table('exams')->where('id',$id)->update(['exam_status'=>$exam_status,'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()]);
@@ -711,4 +734,14 @@ class Writereport extends Base
         DB::table('exams')->where('id',$id)->update(['film_type'=>$film]);
         return json_encode(['status'=>'ok','info'=>$film,'code'=>'0000']);
     }
+
+    public function draft(){
+        $sessionid = $_REQUEST['sessionid'];
+        $doctor = Cache::get($sessionid);
+        $param = $_REQUEST['param'];
+        $exam_id = $param['exam_id'];
+        $key = $doctor['id'].'_'.$exam_id;
+        Cache::set($key,$param);
+        return json_encode(['status'=>'ok','msg'=>'保存成功','code'=>'0000']);
+    }
 }