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

.idea/workspace.xml

@@ -22,17 +22,22 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <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="Application.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.42086956">
-              <caret line="17" column="25" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
-              <folding>
-                <marker date="1539167591915" expanded="true" signature="3289:3433" placeholder="SELECT a.id,... exam" />
-                <marker date="1539167591915" expanded="true" signature="4451:4730" placeholder="SELECT a.id,... exams" />
-                <marker date="1539167591915" expanded="true" signature="4814:4942" placeholder="SELECT count... exams" />
-                <marker date="1539167591915" expanded="true" signature="4859:4942" placeholder="SELECT count... exam" />
-              </folding>
+            <state vertical-scroll-proportion="-22.803278">
+              <caret line="133" column="48" selection-start-line="133" selection-start-column="48" selection-end-line="133" selection-end-column="48" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Inspectregister.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.36695653">
+              <caret line="126" column="64" selection-start-line="126" selection-start-column="64" selection-end-line="126" selection-end-column="64" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -44,16 +49,21 @@
       <list>
         <option value="$PROJECT_DIR$/application/inter/controller/Registerlist.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/Reciveremote.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Index.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Application.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Writereport.php" />
         <option value="$PROJECT_DIR$/application/manage/view/doctors/index.html" />
         <option value="$PROJECT_DIR$/.git/config" />
         <option value="$PROJECT_DIR$/../yuanchengpasc/public/index.php" />
         <option value="$PROJECT_DIR$/application/manage/controller/Doctors.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Report.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Base.php" />
+        <option value="$PROJECT_DIR$/application/common/library/ValidateCode.php" />
+        <option value="$PROJECT_DIR$/application/manage/view/insdoctors/edit.html" />
+        <option value="$PROJECT_DIR$/application/manage/controller/Insdoctors.php" />
+        <option value="$PROJECT_DIR$/application/index/controller/Index.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Writereport.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Application.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Inspectregister.php" />
       </list>
     </option>
   </component>
@@ -103,6 +113,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scratches" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -181,6 +193,120 @@
               <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="manage" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="view" />
+              <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="manage" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="view" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="insdoctors" />
+              <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="manage" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="view" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="doctors" />
+              <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="manage" />
+              <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="manage" />
+              <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" />
@@ -221,10 +347,26 @@
               <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="index" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
-      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -280,9 +422,9 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="false" />
+    <editor active="true" />
     <layout>
-      <window_info id="Project" active="true" 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.19253294" 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" />
@@ -333,13 +475,6 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="php">
-          <url>file://$PROJECT_DIR$/application/inter/controller/Report.php</url>
-          <line>14</line>
-          <option name="timeStamp" value="1" />
-        </line-breakpoint>
-      </breakpoints>
       <option name="time" value="2" />
     </breakpoint-manager>
     <watches-manager />
@@ -378,130 +513,115 @@
         <state vertical-scroll-proportion="0.0">
           <caret line="54" column="45" selection-start-line="54" selection-start-column="45" selection-end-line="54" selection-end-column="45" />
           <folding>
-            <marker date="1539167591915" expanded="true" signature="3289:3433" placeholder="SELECT a.id,... exam" />
-            <marker date="1539167591915" expanded="true" signature="4451:4730" placeholder="SELECT a.id,... exams" />
-            <marker date="1539167591915" expanded="true" signature="4814:4942" placeholder="SELECT count... exams" />
-            <marker date="1539167591915" expanded="true" signature="4859:4942" placeholder="SELECT count... exam" />
+            <marker date="1539418024694" expanded="true" signature="3289:3433" placeholder="SELECT a.id,... exam" />
+            <marker date="1539418024694" expanded="true" signature="4733:4738" placeholder="SELECT a.id,... exams" />
+            <marker date="1539418024694" expanded="true" signature="4822:4950" placeholder="SELECT count... exams" />
+            <marker date="1539418024694" expanded="true" signature="4867:4950" placeholder="SELECT count... exam" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.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="379" column="69" selection-start-line="379" selection-start-column="69" selection-end-line="379" selection-end-column="69" />
-          <folding />
+          <caret line="28" column="65" selection-start-line="28" selection-start-column="65" selection-end-line="28" selection-end-column="65" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Doctors.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
+          <caret line="22" column="24" selection-start-line="22" selection-start-column="24" selection-end-line="22" selection-end-column="24" />
+          <folding>
+            <marker date="1539418024694" expanded="true" signature="3289:3433" placeholder="SELECT a.id,... exam" />
+            <marker date="1539418024694" expanded="true" signature="4733:4738" placeholder="SELECT a.id,... exams" />
+            <marker date="1539418024694" expanded="true" signature="4822:4950" placeholder="SELECT count... exams" />
+            <marker date="1539418024694" expanded="true" signature="4867:4950" placeholder="SELECT count... exam" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Registerlist.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="54" column="57" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
+          <caret line="55" column="34" selection-start-line="55" selection-start-column="34" selection-end-line="55" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Template.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Messages.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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.php">
+    <entry file="file://$PROJECT_DIR$/application/common/library/ResultTools.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="55" column="34" selection-start-line="55" selection-start-column="34" selection-end-line="55" selection-end-column="34" />
-          <folding>
-            <marker date="1539166439117" expanded="true" signature="5043:5509" placeholder="SELECT e.exa... exams" />
-            <marker date="1539166439117" expanded="true" signature="5617:5830" placeholder="SELECT count... exams" />
-          </folding>
+          <caret line="20" column="27" selection-start-line="20" selection-start-column="27" selection-end-line="20" selection-end-column="27" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Messages.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="18" column="39" selection-start-line="18" selection-start-column="39" selection-end-line="18" selection-end-column="39" />
+          <caret line="100" column="50" selection-start-line="100" selection-start-column="50" selection-end-line="100" selection-end-column="50" />
         </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.0">
-          <caret line="48" column="50" selection-start-line="48" selection-start-column="50" selection-end-line="48" selection-end-column="50" />
+          <caret line="40" column="43" selection-start-line="40" selection-start-column="43" selection-end-line="40" selection-end-column="43" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/library/ResultTools.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Template.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="20" column="27" selection-start-line="20" selection-start-column="27" selection-end-line="20" selection-end-column="27" />
+          <caret line="156" column="42" selection-start-line="156" selection-start-column="42" selection-end-line="156" selection-end-column="42" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="28" column="65" selection-start-line="28" selection-start-column="65" selection-end-line="28" selection-end-column="65" />
+          <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/Report.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="54" column="45" selection-start-line="54" selection-start-column="45" selection-end-line="54" selection-end-column="45" />
-          <folding>
-            <marker date="1539167591915" expanded="true" signature="3289:3433" placeholder="SELECT a.id,... exam" />
-            <marker date="1539167591915" expanded="true" signature="4451:4730" placeholder="SELECT a.id,... exams" />
-            <marker date="1539167591915" expanded="true" signature="4814:4942" placeholder="SELECT count... exams" />
-            <marker date="1539167591915" expanded="true" signature="4859:4942" placeholder="SELECT count... exam" />
-          </folding>
+          <caret line="99" column="18" selection-start-line="99" selection-start-column="18" selection-end-line="99" selection-end-column="18" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Dcquery.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="28" column="65" selection-start-line="28" selection-start-column="65" selection-end-line="28" selection-end-column="65" />
+        <state vertical-scroll-proportion="-5.677419">
+          <caret line="14" column="16" selection-start-line="14" selection-start-column="14" selection-end-line="14" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Examclass.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="22" column="24" selection-start-line="22" selection-start-column="24" selection-end-line="22" selection-end-column="24" />
-          <folding>
-            <marker date="1539167591915" expanded="true" signature="3289:3433" placeholder="SELECT a.id,... exam" />
-            <marker date="1539167591915" expanded="true" signature="4451:4730" placeholder="SELECT a.id,... exams" />
-            <marker date="1539167591915" expanded="true" signature="4814:4942" placeholder="SELECT count... exams" />
-            <marker date="1539167591915" expanded="true" signature="4859:4942" placeholder="SELECT count... exam" />
-          </folding>
+          <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/Reciveremote.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Examproject.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="55" column="34" selection-start-line="55" selection-start-column="34" selection-end-line="55" selection-end-column="34" />
-          <folding>
-            <marker date="1539166439117" expanded="true" signature="5043:5509" placeholder="SELECT e.exa... exams" />
-            <marker date="1539166439117" expanded="true" signature="5617:5830" placeholder="SELECT count... exams" />
-          </folding>
+          <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/Messages.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Operating.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.36695653">
+          <caret line="25" column="119" selection-start-line="25" selection-start-column="114" selection-end-line="25" selection-end-column="119" />
         </state>
       </provider>
     </entry>
@@ -512,255 +632,247 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Template.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="100" column="50" selection-start-line="100" selection-start-column="50" selection-end-line="100" selection-end-column="50" />
+          <caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Messages.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="40" column="43" selection-start-line="40" selection-start-column="43" selection-end-line="40" selection-end-column="43" />
-          <folding>
-            <marker date="1539166439117" expanded="true" signature="5043:5509" placeholder="SELECT e.exa... exams" />
-            <marker date="1539166439117" expanded="true" signature="5617:5830" placeholder="SELECT count... exams" />
-          </folding>
+          <caret line="16" column="40" selection-start-line="16" selection-start-column="40" selection-end-line="16" selection-end-column="40" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Template.php">
+    <entry file="file://$PROJECT_DIR$/thinkphp/library/think/Controller.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="156" column="42" selection-start-line="156" selection-start-column="42" selection-end-line="156" selection-end-column="42" />
+        <state vertical-scroll-proportion="0.35130435">
+          <caret line="79" column="23" selection-start-line="79" selection-start-column="23" selection-end-line="79" selection-end-column="23" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.php">
+    <entry file="file://$PROJECT_DIR$/application/database.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.57391304">
+          <caret line="23" column="32" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
+    <entry file="file://$PROJECT_DIR$/.git/config">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="99" column="18" selection-start-line="99" selection-start-column="18" selection-end-line="99" selection-end-column="18" />
+          <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/Dcquery.php">
+    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/index/controller/Index.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-5.677419">
-          <caret line="14" column="16" selection-start-line="14" selection-start-column="14" selection-end-line="14" selection-end-column="16" />
+        <state vertical-scroll-proportion="0.42086956">
+          <caret line="15" column="21" selection-start-line="15" selection-start-column="21" selection-end-line="15" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Examclass.php">
+    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/public/index.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.6504348">
+          <caret line="17" column="0" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Examproject.php">
+    <entry file="file://$PROJECT_DIR$/public/index.html">
       <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.15304348">
+          <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Login.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-3.548387">
-          <caret line="13" column="14" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="14" />
+        <state vertical-scroll-proportion="0.27304348">
+          <caret line="19" column="26" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Operating.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Doctors.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.36695653">
-          <caret line="25" column="119" selection-start-line="25" selection-start-column="114" selection-end-line="25" selection-end-column="119" />
+        <state vertical-scroll-proportion="0.2347826">
+          <caret line="82" column="45" selection-start-line="82" selection-start-column="45" selection-end-line="82" selection-end-column="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/library/ResultTools.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Registerlist.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="20" column="27" selection-start-line="20" selection-start-column="27" selection-end-line="20" selection-end-column="27" />
+        <state vertical-scroll-proportion="0.03826087">
+          <caret line="54" column="57" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Template.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.38260868">
+          <caret line="14" column="12" selection-start-line="14" selection-start-column="12" selection-end-line="14" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Messages.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="16" column="40" selection-start-line="16" selection-start-column="40" selection-end-line="16" selection-end-column="40" />
+        <state vertical-scroll-proportion="-4.2580647">
+          <caret line="12" column="1" selection-start-line="12" selection-start-column="1" selection-end-line="12" selection-end-column="1" />
+          <folding>
+            <marker date="1539418024694" expanded="true" signature="3289:3433" placeholder="SELECT a.id,... exam" />
+            <marker date="1539418024694" expanded="true" signature="4733:4738" placeholder="SELECT a.id,... exams" />
+            <marker date="1539418024694" expanded="true" signature="4822:4950" placeholder="SELECT count... exams" />
+            <marker date="1539418024694" expanded="true" signature="4867:4950" placeholder="SELECT count... exam" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.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="169" column="37" selection-start-line="169" selection-start-column="37" selection-end-line="169" selection-end-column="37" />
+          <caret line="13" column="14" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="14" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Base.php">
+    <entry file="file://$PROJECT_DIR$/public/router.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-5.774194">
-          <caret line="28" column="5" selection-start-line="28" selection-start-column="5" selection-end-line="28" selection-end-column="5" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/thinkphp/library/think/Controller.php">
+    <entry file="file://$PROJECT_DIR$/application/route.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35130435">
-          <caret line="79" column="23" selection-start-line="79" selection-start-column="23" selection-end-line="79" selection-end-column="23" />
+        <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" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Base.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="23" column="105" selection-start-line="23" selection-start-column="105" selection-end-line="23" selection-end-column="105" />
+        <state vertical-scroll-proportion="-2.2258065">
+          <caret line="29" column="61" selection-start-line="29" selection-start-column="61" selection-end-line="29" selection-end-column="61" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/database.php">
+    <entry file="file://$PROJECT_DIR$/application/common/library/ValidateCode.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.57391304">
-          <caret line="23" column="32" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
+        <state vertical-scroll-proportion="0.29391304">
+          <caret line="126" column="29" selection-start-line="126" selection-start-column="29" selection-end-line="126" selection-end-column="29" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.git/config">
+    <entry file="file://$PROJECT_DIR$/application/manage/view/login/index.html">
       <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.5743119">
+          <caret line="58" column="20" selection-start-line="58" selection-start-column="20" selection-end-line="58" selection-end-column="20" />
+          <folding>
+            <element signature="n#style#0;n#input#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#img#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/index/controller/Index.php">
+    <entry file="file://$PROJECT_DIR$/application/manage/controller/Login.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.42086956">
-          <caret line="15" column="21" selection-start-line="15" selection-start-column="21" selection-end-line="15" selection-end-column="21" />
+        <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" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/public/index.php">
+    <entry file="file://$PROJECT_DIR$/application/manage/view/frontmenu/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6504348">
-          <caret line="17" column="0" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
-          <folding>
-            <element signature="e#6#80#0#PHP" expanded="false" />
-          </folding>
+        <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" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/controller/Doctors.php">
+    <entry file="file://$PROJECT_DIR$/application/manage/view/doctors/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.193548">
-          <caret line="312" column="0" selection-start-line="312" selection-start-column="0" selection-end-line="312" selection-end-column="0" />
+        <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" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
+    <entry file="file://$PROJECT_DIR$/application/manage/view/insdoctors/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.483871">
-          <caret line="339" column="0" selection-start-line="339" selection-start-column="0" selection-end-line="339" selection-end-column="0" />
+        <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" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/public/index.html">
+    <entry file="file://$PROJECT_DIR$/application/manage/view/insdoctors/edit.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.15304348">
-          <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
+        <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" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
+    <entry file="file://$PROJECT_DIR$/application/manage/view/doctors/edit.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.27304348">
-          <caret line="19" column="26" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="26" />
-          <folding>
-            <marker date="1538980832890" expanded="true" signature="895:939" placeholder="select count... templates" />
-          </folding>
+        <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" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Doctors.php">
+    <entry file="file://$PROJECT_DIR$/application/manage/controller/Doctors.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.2347826">
-          <caret line="82" column="45" selection-start-line="82" selection-start-column="45" selection-end-line="82" selection-end-column="45" />
+        <state vertical-scroll-proportion="-3.9672132">
+          <caret line="86" column="9" selection-start-line="86" selection-start-column="9" selection-end-line="88" selection-end-column="49" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/view/doctors/index.html">
+    <entry file="file://$PROJECT_DIR$/application/manage/controller/Insdoctors.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.42608696">
-          <caret line="209" column="70" selection-start-line="209" selection-start-column="70" selection-end-line="209" selection-end-column="70" />
+        <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" />
           <folding />
         </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="54" column="57" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
-          <folding>
-            <marker date="1539166436794" expanded="true" signature="2400:2642" placeholder="SELECT e.id,... exams" />
-            <marker date="1539166436794" expanded="true" signature="2673:2962" placeholder="SELECT e.id,... exams" />
-            <marker date="1539166436794" expanded="true" signature="3710:3838" placeholder="SELECT count... exams" />
-          </folding>
+        <state vertical-scroll-proportion="-5.598261">
+          <caret line="212" column="88" selection-start-line="212" selection-start-column="88" selection-end-line="212" selection-end-column="88" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/Desktop/Reciveremote.php">
+    <entry file="file://$PROJECT_DIR$/application/index/controller/Index.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6954128">
-          <caret line="87" column="38" selection-start-line="87" selection-start-column="34" selection-end-line="87" selection-end-column="38" />
-          <folding>
-            <marker date="1539166759076" expanded="true" signature="5043:5509" placeholder="SELECT e.exa... exams" />
-            <marker date="1539166759076" expanded="true" signature="5617:5830" placeholder="SELECT count... exams" />
-          </folding>
+        <state vertical-scroll-proportion="0.22956522">
+          <caret line="10" column="21" selection-start-line="10" selection-start-column="21" selection-end-line="10" selection-end-column="21" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.38260868">
-          <caret line="14" column="12" selection-start-line="14" selection-start-column="12" selection-end-line="14" selection-end-column="12" />
-          <folding>
-            <marker date="1539166439117" expanded="true" signature="5043:5509" placeholder="SELECT e.exa... exams" />
-            <marker date="1539166439117" expanded="true" signature="5617:5830" placeholder="SELECT count... exams" />
-          </folding>
+        <state vertical-scroll-proportion="-22.803278">
+          <caret line="133" column="48" selection-start-line="133" selection-start-column="48" selection-end-line="133" selection-end-column="48" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.42086956">
-          <caret line="17" column="25" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
-          <folding>
-            <marker date="1539167591915" expanded="true" signature="3289:3433" placeholder="SELECT a.id,... exam" />
-            <marker date="1539167591915" expanded="true" signature="4451:4730" placeholder="SELECT a.id,... exams" />
-            <marker date="1539167591915" expanded="true" signature="4814:4942" placeholder="SELECT count... exams" />
-            <marker date="1539167591915" expanded="true" signature="4859:4942" placeholder="SELECT count... exam" />
-          </folding>
+        <state vertical-scroll-proportion="0.36695653">
+          <caret line="126" column="64" selection-start-line="126" selection-start-column="64" selection-end-line="126" selection-end-column="64" />
+          <folding />
         </state>
       </provider>
     </entry>

application/common/library/ValidateCode.php

@@ -22,7 +22,7 @@ class ValidateCode {
     public static $codeSet = '346789ABCDEFGHJKLMNPQRTUVWXY';
     public static $fontSize = 25;  // 验证码字体大小(px)
     public static $useCurve = true; // 是否画混淆曲线
-    public static $useNoise = true; // 是否添加杂点 
+    public static $useNoise = true; // 是否添加杂点
     public static $imageH = 0;  // 验证码图片宽
     public static $imageL = 0;  // 验证码图片长
     public static $length = 4;  // 验证码位数
@@ -54,7 +54,7 @@ class ValidateCode {
         
         if (self::$useNoise) {
             // 绘杂点
-            self::_writeNoise();
+//            self::_writeNoise();
         }
         if (self::$useCurve) {
             // 绘干扰线

application/inter/controller/Application.php

@@ -121,14 +121,14 @@ class Application extends Base
             $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]);
+                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)){
                 log::record('新增远程申请');
                 $application_info['id'] = UUIDs::uuid16();
-                $application_info['ctime'] = date('Y-m-d H:i:s',time());
+                $application_info['createdAt'] = date('Y-m-d H:i:s',time());
                 DB::table('remote_application')->insert($application_info);
                 $report = array();
                 $report['id'] = UUIDs::uuid16();
@@ -138,7 +138,7 @@ 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]);
+            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()]);
@@ -176,7 +176,7 @@ class Application extends Base
         $info['id'] = UUIDs::uuid16();
         $info['report_id'] = $report['id'];
         $info['description'] = $param['description'];
-        $info['ctime'] = date('Y-m-d H:i:s',time());
+        $info['createdAt'] = date('Y-m-d H:i:s',time());
         $info['type'] = 4;
         $info['doctor_id'] = $doctor['id'];
         DB::table('report_record')->insert($info);
@@ -184,7 +184,7 @@ class Application extends Base
         $message['id'] = UUIDs::uuid16();
         $message['title'] = '申请单驳回';
         $message['content'] = $param['description'];
-        $message['ctime'] = date('Y-m-d H:i:s',time());
+        $message['createdAt'] = date('Y-m-d H:i:s',time());
         $did = DB::table('remote_application')->where('exam_id',$id)->field('req_doctor_id,local_institution_id')->find();
         $message['doctor_id'] = $did['req_doctor_id'];
         $message['institution_id'] = $did['local_institution_id'];

application/inter/controller/Base.php

@@ -34,7 +34,7 @@ class Base extends Controller
         log::record('------------------------');
         $admin = Cache::get($sessionid);
         if (!$admin) {
-            return json_encode(['status'=>'fail','code'=>'1010','msg'=>'对不起，您还未进行登录，请先登录']);
+            die(json_encode(['status'=>'fail','code'=>'1010','msg'=>'对不起，您还未进行登录，请先登录']));
             // $this->error('对不起，您还未进行登录，请先登录','inter/index');
         }
     }

application/inter/controller/Inspectregister.php

@@ -128,7 +128,7 @@ class Inspectregister extends Base
                 $patient_info['family_ill']       = $fam;
             }
             if(isset($param['birthday']) && !empty($param['birthday'])){
-                $patient_info['birthday']   =  $param['birthday'];
+                $patient_info['birthday']   =  str_replace('-', '', $param['birthday']);
             }
             $exam_info = array();
             if(isset($param['exam_id']) && !empty($param['exam_id'])){
@@ -160,7 +160,7 @@ class Inspectregister extends Base
             $exam_info['body_part']          = isset($param['body']) ? $param['body'] : '';
             $exam_info['device']             = isset($param['device']) ? $param['device'] : '';
             if(isset($param['checktime']) && !empty($param['checktime'])){
-                $exam_info['exam_datetime']      = $param['checktime'];
+                $exam_info['exam_datetime']      = str_replace('-', '', $param['checktime']);
             }
             $exam_info['dept_id']            = isset($param['department']) ? $param['department'] : '';
             $exam_info['charge']             = isset($param['cost']) ? $param['cost'] : '';
@@ -171,11 +171,11 @@ class Inspectregister extends Base
             $exam_info['remark']             = isset($param['remark']) ? $param['remark'] : '';
             $exam_info['clin_diag']          = isset($param['clin_diag']) ? $param['clin_diag'] : '';
             $exam_info['register'] = $doctor['id'];
-            $exam_info['ctime'] = date('Y-m-d H:i:s',time());
+            $exam_info['createdAt'] = date('Y-m-d H:i:s',time());
             if(isset($param['exam_id']) && !empty($param['exam_id'])){
                 $exam = DB::table('exams')->where('id',$param['exam_id'])->update($exam_info);
             }else{
-                $exam_info['ctime'] = date('Y-m-d H:i:s',time());
+                $exam_info['createdAt'] = date('Y-m-d H:i:s',time());
                 $exam = DB::table('exams')->insert($exam_info);
             }
             return json_encode(['status'=>'ok','code'=>'0000','msg'=>'保存成功','sessionid'=>$sessionid]);

application/inter/controller/Messages.php

@@ -17,7 +17,7 @@ class Messages extends Base
             $param = $_REQUEST['param'];
             $page = $param['page'];
             $number = $param['number'];
-            $info = DB::table('messages')->where('doctor_id',$doctor['id'])->where('status',1)->limit($number)->page($page)->order('is_read asc,ctime desc')->select();
+            $info = DB::table('messages')->where('doctor_id',$doctor['id'])->where('status',1)->limit($number)->page($page)->order('is_read asc,createdAt desc')->select();
             $num = DB::table('messages')->where('doctor_id',$doctor['id'])->where('status',1)->count();
             return json_encode(['status'=>'ok','code'=>'0000','info'=>$info,'sessionid'=>$sessionid,'num'=>$num]);
         }catch(\Exception $e){
@@ -31,7 +31,7 @@ class Messages extends Base
         try{
             $sessionid = $_REQUEST['sessionid'];
             $doctor = Cache::get($sessionid);
-            $info = DB::table('messages')->where('is_read', 0)->where('doctor_id', $doctor['id'])->where('status', 1)->order('ctime desc')->limit(5)->select();
+            $info = DB::table('messages')->where('is_read', 0)->where('doctor_id', $doctor['id'])->where('status', 1)->order('createdAt desc')->limit(5)->select();
             $num =  DB::table('messages')->where('is_read', 0)->where('doctor_id', $doctor['id'])->where('status', 1)->count();
             return json_encode(['status' => 'ok', 'code' => '0000', 'info' => $info, 'num' => $num,'sessionid'=>$sessionid]);
         }catch(\Exception $e){

application/inter/controller/Reciveremote.php

@@ -26,7 +26,7 @@ class Reciveremote extends Base
                     $data = array();
                     $data['id'] = UUIDs::uuid16();
                     $data['exam_id'] = $exam_id;
-                    $data['ctime'] = date('Y-m-d H:i:s',time());
+                    $data['createdAt'] = date('Y-m-d H:i:s',time());
                     DB::table('report')->insert($data);
                 }
             }
@@ -90,7 +90,7 @@ 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.ctime desc";
+                $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";
 //            }
             log::record($sql);
             $list = DB::query($sql);

application/inter/controller/Registerlist.php

@@ -62,7 +62,7 @@ class Registerlist extends Base
             $fnum = ($page-1)*$num;
             $limit = " limit ".$fnum.",".$num;
             log::record("SELECT e.id,e.is_remote,e.study_id,e.patient_num,e.institution_id,e.exam_datetime,e.exam_project,e.exam_status,p.name,p.sex,p.age from exams as e ,patient_infos as p where e.institution_id='".$doctor['institution_id']."' and p.id=e.patient_id".$where);
-            $sql = "SELECT e.id,e.is_remote,e.study_id,e.patient_num,e.institution_id,e.exam_datetime,e.exam_project,e.exam_status,p.name,p.sex,p.age from exams as e ,patient_infos as p where e.institution_id='".$doctor['institution_id']."' and p.id=e.patient_id".$where." order by e.ctime desc,e.urgent desc ".$limit;
+            $sql = "SELECT e.id,e.is_remote,e.study_id,e.patient_num,e.institution_id,e.exam_datetime,e.exam_project,e.exam_status,p.name,p.sex,p.age from exams as e ,patient_infos as p where e.institution_id='".$doctor['institution_id']."' and p.id=e.patient_id".$where." order by e.createdAt desc,e.urgent desc ".$limit;
             $list = DB::query($sql);
             foreach ($list as $k => $v) {
                 $report_info = DB::table('report')->where('exam_id',$v['id'])->field(['report_datetime','report_doctor_id'])->find();

application/inter/controller/Report.php

@@ -22,7 +22,7 @@ class Report extends Base
 //            $is_urgent = $_REQUEST['is_remote'];
             $where = '';
 //            $table = '';
-            $order = ' order by a.urgent desc,a.ctime desc';
+            $order = ' order by a.urgent desc,a.createdAt desc';
             /*if($is_urgent == 1){
                 //是远程报告
                 $table = ',remote_application as r ';
@@ -92,7 +92,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.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.ctime desc".$limit;
+                $sql = "SELECT a.id,a.urgent,a.is_remote,a.patient_num,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;

application/inter/controller/Template.php

@@ -64,7 +64,7 @@ class Template extends Base
                 'checkid'=>$param['checkid'],
                 'impression'=>$param['impression'],
                 'description'=>$param['description'],
-                'ctime'=>date("Y-m-d H:i:s",time())
+                'createdAt'=>date("Y-m-d H:i:s",time())
             ]);
 
             $template->save();
@@ -125,7 +125,7 @@ class Template extends Base
         $info = array();
         $info['id'] = UUIDs::uuid16();
         $info['title'] = $param['label'];
-        $info['ctime'] = date('Y-m-d H:i:s',time());
+        $info['createdAt'] = date('Y-m-d H:i:s',time());
         $info['is_public'] = 2;
         $info['create_user'] = $doctor['id'];
         if(isset($param['id']) && !empty($param['id'])){

application/inter/controller/Writereport.php

@@ -98,7 +98,8 @@ class WriteReport extends Base
             $id = $this->uuids->uuid16();
             //初步报告生成
             $film_type = isset($param['film_type']) ? $param['film_type'] : '';
-            DB::table('exams')->where('id',$param['id'])->update(['exam_status'=>7,'film_type'=>$film_type]);
+            $exam_status = $this->get_exam_status($doctor['id'],7);
+            DB::table('exams')->where('id',$param['id'])->update(['exam_status'=>$exam_status,'film_type'=>$film_type]);
             $patient_info = array();
             $patient_info['id']       = isset($param['pid']) ? $param['pid'] : '';
             $patient_info['name']     = isset($param['name']) ? $param['name'] : '';
@@ -129,7 +130,7 @@ class WriteReport extends Base
             $log['impression'] = isset($param['impression']) ? $param['impression'] : '';
             $log['description'] = isset($param['description']) ? $param['description'] : '';
             $log['report_id'] = $id;
-            $log['ctime'] = date('Y-m-d H:i:s',time());
+            $log['createdAt'] = date('Y-m-d H:i:s',time());
             $log['doctor_id'] = $doctor['id'];
             $log['type'] = 1;  //写报告
             $report_log = DB::table('report_record')->insert($log);
@@ -139,6 +140,16 @@ class WriteReport extends Base
         }
     }
 
+    public function get_exam_status($doctorid,$status){
+        $doctor_class = DB::table('doctor_class')->where('doctor_id',$doctorid)->field('doctor_class')->find();
+        if(strpos($doctor_class['doctor_class'],'9')){
+            return 9;
+        }elseif(strpos($doctor_class['doctor_class'],'8')){
+            return 8;
+        }else{
+            return $status;
+        }
+    }
     public function public_template(){
         $sessionid = $_REQUEST['sessionid'];
         $doctor = Cache::get($sessionid);
@@ -205,12 +216,13 @@ class WriteReport extends Base
             }elseif($status['exam_status'] == 9){
                 return json_encode(['status'=>'fail','code'=>'1034','msg'=>'已经确认过该报告，不可再次确认']);
             }
-            DB::table('exams')->where('id',$id)->update(['exam_status'=>9]);
+            $exam_status = $this->get_exam_status($doctor['id'],9);
+            DB::table('exams')->where('id',$id)->update(['exam_status'=>$exam_status]);
             DB::table('report')->where('exam_id',$id)->update(['confirm_doctor_id'=>$doctor['id'],'confirm_datetime'=>date('Y-m-d H:i:s')]);
             // 添加  确认log日志
             $info = array();
             $info['id'] = UUIDs::uuid16();
-            $info['ctime'] = date('Y-m-d H:i:s',time());
+            $info['createdAt'] = date('Y-m-d H:i:s',time());
             $info['doctor_id'] = $doctor['id'];
             $info['type'] = 3;
             $info['report_id'] = '';
@@ -253,13 +265,14 @@ class WriteReport extends Base
             $info = array();
             $info['id'] = UUIDs::uuid16();
             $info['type'] = 2; //审核
-            $info['ctime'] = date('Y-m-d H:i:s',time());
+            $info['createdAt'] = date('Y-m-d H:i:s',time());
             $info['doctor_id'] = $doctor['id'];
             $info['impression']       = isset($param['impression']) ? $param['impression'] : '';
             $info['description']      = isset($param['description']) ? $param['description'] : '';
             $info['report_id'] = $report['id'];
             DB::table('report_record')->insert($info);
-            DB::table('exams')->where('id',$id)->update(['exam_status'=>8]);
+            $exam_status = $this->get_exam_status($doctor['id'],8);
+            DB::table('exams')->where('id',$id)->update(['exam_status'=>$exam_status]);
             return json_encode(['status'=>'ok','code'=>'0000','msg'=>'已审核']);
         }catch(\Exception $e){
             return json_encode(['status'=>'fail','code'=>'2000','msg'=>$e->getMessage()]);
@@ -326,7 +339,7 @@ class WriteReport extends Base
             $exam_id = $_REQUEST['id'];
             $report = DB::table('report')->where('exam_id',$exam_id)->field('id')->find();
             $log_id = $report['id'];
-            $log = DB::table('report_record')->where('doctor_id',$doctor['id'])->where('report_id',$log_id)->order('ctime asc,type asc')->select();
+            $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) {
                 $doc = DB::table('doctors')->where('id',$v['doctor_id'])->field('realname')->find();
                 $log[$k]['doctor_name'] = $doc['realname'];

application/manage/controller/Exam.php

@@ -166,7 +166,7 @@ class Exam extends Base {
             $this->assign("report", $report);
             // 查询报告流程历史记录表
             if (!empty($report)) {
-                $report_record = Db::table("report_record")->where("report_id", $id)->order("ctime", "asc")->select();
+                $report_record = Db::table("report_record")->where("report_id", $id)->order("createdAt", "asc")->select();
                 $errlist = array();
                 if (count($report_record) > 0) {
                     foreach ($report_record as $key => $val) {

application/manage/controller/Insdoctors.php

@@ -73,7 +73,6 @@ class Insdoctors extends Base {
             echo "not login ?";
             return;
         }
-
         if (isset($_GET["id"])) {
             $id = $_GET["id"];
             if ($id != null) {
@@ -85,10 +84,21 @@ class Insdoctors extends Base {
                         $doctors['doctor_role'] = explode(',', $doctors['doctor_role']);
                     }
                     $this->assign("doctors", $doctors);
+                    // 查询医生的分类
+                    $doctorsCla = Db::table("doctor_class")->where("doctor_id", $id)->find();
+                    if (!empty($doctorsCla)) {
+                        $doctorClaStr = $doctorsCla["doctor_class"];
+                        if (!empty($doctorClaStr)) {
+                            $dc_arr = explode(",", $doctorClaStr);
+                            $this->assign("doctorcla", $dc_arr);
+                        }
+                    }
                 }
             }
         }
-// 
+//
+        $doctorClas = Db::table("constant")->where("parent_id", "doctor_class")->order("ordernum", "1")->select();
+        $this->assign('doctorclas', $doctorClas);
         $institution = DB::table('institution')->where("parent_institution", $insId)->whereOr("id", $insId)->select();
 
         $this->assign('institution', $institution);
@@ -108,6 +118,7 @@ class Insdoctors extends Base {
         }
 
         $info = $_GET;
+        unset($info['doctorcla']);
         $info['doctor_role'] = implode(',', $_GET['doctor_role']);
         $info['password'] = md5($_GET['password']);
         $info["institution_id"] = $insId;
@@ -117,13 +128,33 @@ class Insdoctors extends Base {
             $info['id'] = $id;
             $a = DB::table('doctors')->insert($info);
             SysLogs::log("doctors", "C", json_encode($info));
+            $this->saveDoctorCla($id,$_GET['doctorcla']);
             return 'insert_ok;' . $id;
         } else {
             $a = DB::table('doctors')->where('id', $_GET['id'])->where("institution_id", $insId)->update($info);
             SysLogs::log("doctors", "U", $_GET['id'] . " --> " . json_encode($info));
+            $this->saveDoctorCla($_GET['id'],$_GET['doctorcla']);
             return 'success';
         }
     }
+    protected function saveDoctorCla($doctor_id, $doctorcla) {
+        // doctorcla
+        Db::table("doctor_class")->where("doctor_id", $doctor_id)->delete();
+        if (isset($doctorcla) && count($doctorcla) > 0) {
+            $newrow = array();
+            $newrow["id"] = UUIDs::uuid16();
+            $newrow["doctor_id"] = $doctor_id;
+            $doctorclaStr = json_encode($doctorcla);
+            $doctorclaStr = str_replace('"', '', $doctorclaStr);
+            $doctorclaStr = str_replace('[', '', $doctorclaStr);
+            $doctorclaStr = str_replace(']', '', $doctorclaStr);
+            $doctorclaStr = str_replace(" ", "", $doctorclaStr);
+            $newrow["doctor_class"] = $doctorclaStr;
+            $newrow["status"] = "1";
+            Db::table("doctor_class")->insert($newrow);
+            SysLogs::log("doctors", "C", $doctor_id . " doctorclass --> " . $doctorclaStr);
+        }
+    }
 
     /**
      * 软删除记录

application/manage/controller/Institution.php

@@ -83,12 +83,12 @@ class Institution extends Base {
         if (empty($id)) {
             // 无值，认为是添加
             $data["id"] = UUIDs::uuid16();
-            $data["ctime"] = date("Y-m-d H:i:s");
+            $data["createdAt"] = date("Y-m-d H:i:s");
             Db::table("institution")->insert($data);
             echo "insert_ok;" . $data["id"];
             SysLogs::log("institution", "C", json_encode($data));
         } else {
-            $data["utime"] = date("Y-m-d H:i:s");
+            $data["updatedAt"] = date("Y-m-d H:i:s");
             // 更新
             Db::table("institution")->where("id", $id)->update($data);
             SysLogs::log("institution", "U", "id = " . $id . " --> " . json_encode($data));

application/manage/controller/Manager.php

@@ -104,12 +104,12 @@ class Manager extends Base {
         if (empty($id)) {
             // 无值，认为是添加
             $data["id"] = UUIDs::uuid16();
-            $data["ctime"] = date("Y-m-d H:i:s");
+            $data["createdAt"] = date("Y-m-d H:i:s");
             Db::table("manager")->insert($data);
             SysLogs::log("manager", "C", json_encode($data));
             echo "insert_ok;" . $data["id"];
         } else {
-            $data["utime"] = date("Y-m-d H:i:s");
+            $data["updatedAt"] = date("Y-m-d H:i:s");
             // 更新
             Db::table("manager")->where("id", $id)->update($data);
             SysLogs::log("manager", "U", "id = " . $id . " --> " . json_encode($data));

application/manage/controller/Template.php

@@ -115,7 +115,7 @@ class Template extends Base {
             $template->exam_class_id = $param['exam_class_id'];
             $template->impression = $param['impression'];
             $template->description = $param['description'];
-            $template->ctime = date("Y-m-d H:i:s", time());
+            $template->createdAt = date("Y-m-d H:i:s", time());
             $template->create_user = $user ? $user['id'] : '';
 
             $template->save();

application/manage/model/TemplateModel.php

@@ -8,7 +8,7 @@ class TemplateModel extends Model {
     protected $table = 'templates';
 
     public function queryAll( $wheres, $page, $pageSize){
-        $query = Db::view('templates', 'id, title, is_public, create_user, exam_class_id, impression, description, ctime, parent_id');
+        $query = Db::view('templates', 'id, title, is_public, create_user, exam_class_id, impression, description, createdAt, parent_id');
 
         if (!empty($wheres)){
             $query->where($wheres);
@@ -19,7 +19,7 @@ class TemplateModel extends Model {
 
 
     public function queryAllCount($wheres, $page, $pageSize){
-        $query = Db::view('templates', 'id, title, is_public, create_user, exam_class_id, impression, description, ctime, parent_id');
+        $query = Db::view('templates', 'id, title, is_public, create_user, exam_class_id, impression, description, createdAt, parent_id');
 
         if (!empty($wheres)){
             $query->where($wheres);

application/manage/view/doctors/index.html

@@ -91,8 +91,8 @@
                     {field:'login_failure',title:'登录失败次数',width:"50",align: 'center'},
                     {field:'is_report',title:'是否能写报告',width:"100",align: 'center',formatter:reportFormatter },
                     {field:'login_time',title:'上次登录时间',align: 'center', width:120, formatter:dateFormatter },
-                    {field:'ctime',title:'创建时间',align: 'center', width:120, formatter:dateFormatter },
-                    {field:'utime',title:'修改时间',align: 'center', width:120, formatter:dateFormatter },
+                    {field:'createdAt',title:'创建时间',align: 'center', width:120, formatter:dateFormatter },
+                    {field:'updatedAt',title:'修改时间',align: 'center', width:120, formatter:dateFormatter },
                     {field:'status',title:'删除状态',width:80,align: 'center',formatter:delstatusFormatter },
                     {field:'grid_commands',title:'操作',align: 'center',width:100, formatter:commandsFormatter },
                 ]],

application/manage/view/exam/edit.html

@@ -297,7 +297,7 @@
                     <tr>
                             <th height="32" align="right" >建档时间：</th>
                             <td cols="3" >
-                            <input name="ctime" type="text" class="easyui-textbox" style="width:300px;" size="35" value="{if  isset($report) }{$report.ctime}{/if}" />
+                            <input name="createdAt" type="text" class="easyui-textbox" style="width:300px;" size="35" value="{if  isset($report) }{$report.createdAt}{/if}" />
                             </td>
                     </tr>
                     <tr>
@@ -354,7 +354,7 @@
                     <td>{$val["impression"]}</td>
                     <td>{$val["description"]}</td>
                     <td>{$val["doctor_id_name"]}({$val["doctor_id"]})</td>
-                    <td>{$val["ctime"]}</td>
+                    <td>{$val["createdAt"]}</td>
                 </tr>
                 {/foreach}
                 </table>

application/manage/view/exam/index.html

@@ -134,7 +134,7 @@
                             {field:'register_name',title:'登记人员',width:115  },
                             {field:'register_datetime',title:'登记时间',width:115 , formatter:dateFormatter },
                             {field:'exam_status',title:'检查流程状态',width:115 , formatter:examStatusFormatter  },
-                            {field:'ctime',title:'创建时间',width:115 , formatter:dateFormatter },
+                            {field:'createdAt',title:'创建时间',width:115 , formatter:dateFormatter },
                             {field:'pay_status',title:'支付状态',width:115  },
                             {field:'status',title:'数据状态',width:115 , formatter:statusFormatter },
                             {field:'grid_commands',title:'操作',align: 'center',width:100 },

application/manage/view/insdoctors/edit.html

@@ -131,6 +131,14 @@
                     <input name="status" id="status_0" type="radio" size="35" value="0" {if isset($doctors) && $doctors.status=='0' }checked="check" {/if} /><label for="status_0" >屏蔽</label>
                 </td>
             </tr>
+            <tr>
+                <th height="32" align="right">分类：</th>
+                <td colspan="3" >
+                    {foreach $doctorclas as $key => $val}
+                    <input name="doctorcla[]" id="sorts_{$val.constant_key}" type="checkbox" size="55" value="{$val.constant_key}" {if isset($doctorcla) && in_array($val.constant_key,$doctorcla) }checked{/if}  /><label for="sorts_{$val.constant_key}" >{$val.name}</label>
+                    {/foreach}
+                </td>
+            </tr>
             <tr>
                 <th height="32">&nbsp;</th>
                 <td>

application/manage/view/insdoctors/index.html

@@ -91,8 +91,8 @@
                     {field:'login_failure',title:'登录失败次数',width:"50",align: 'center'},
                     {field:'is_report',title:'是否能写报告',width:"100",align: 'center',formatter:reportFormatter },
                     {field:'login_time',title:'上次登录时间',align: 'center', width:120, formatter:dateFormatter },
-                    {field:'ctime',title:'创建时间',align: 'center', width:120, formatter:dateFormatter },
-                    {field:'utime',title:'修改时间',align: 'center', width:120, formatter:dateFormatter },
+                    {field:'createdAt',title:'创建时间',align: 'center', width:120, formatter:dateFormatter },
+                    {field:'updatedAt',title:'修改时间',align: 'center', width:120, formatter:dateFormatter },
                     {field:'status',title:'删除状态',width:80,align: 'center',formatter:delstatusFormatter },
                     {field:'grid_commands',title:'操作',align: 'center',width:100, formatter:commandsFormatter },
                 ]],

application/manage/view/institution/edit.html

@@ -135,13 +135,13 @@
             </tr>
             {if isset($institution) }
             <tr>
-                    <th height="32" align="right" >{if $institution["ctime"] != null }创建时间：{/if}</th>
-                    <td >{if $institution["ctime"] != null }
-                    <input type="text" readonly="readonly" class="easyui-datetimebox" size="20" value="{$institution['ctime']}" />{/if}
+                    <th height="32" align="right" >{if $institution["createdAt"] != null }创建时间：{/if}</th>
+                    <td >{if $institution["createdAt"] != null }
+                    <input type="text" readonly="readonly" class="easyui-datetimebox" size="20" value="{$institution['createdAt']}" />{/if}
                     </td>            
-                    <th height="32" align="right" >{if $institution["utime"] != null }更新时间：{/if}</th>
-                    <td >{if $institution["utime"] != null }
-                    <input type="text" readonly="readonly" class="easyui-datetimebox" size="20" value="{$institution['utime']}" />{/if}
+                    <th height="32" align="right" >{if $institution["updatedAt"] != null }更新时间：{/if}</th>
+                    <td >{if $institution["updatedAt"] != null }
+                    <input type="text" readonly="readonly" class="easyui-datetimebox" size="20" value="{$institution['updatedAt']}" />{/if}
                     </td>
             </tr>
             {/if}

application/manage/view/institution/index.html

@@ -120,8 +120,8 @@
                             {field:'institution_level',title:'级别',width:80},
                             {field:'charge_mode',title:'收费模式',width:100 , formatter:chargingModeFormatter },
                             {field:'agent_id',title:'代理商',width:120 , formatter:agentFormatter },
-                            {field:'ctime',title:'创建时间',align: 'center', width:135, formatter:dateFormatter },
-                            {field:'utime',title:'更新时间',align: 'center', width:135, formatter:dateFormatter },
+                            {field:'createdAt',title:'创建时间',align: 'center', width:135, formatter:dateFormatter },
+                            {field:'updatedAt',title:'更新时间',align: 'center', width:135, formatter:dateFormatter },
                             {field:'status',title:'状态',width:"100" , statusFormatter },
                             {field:'grid_commands',title:'操作',align: 'center',width:100, formatter:commandsFormatter },
                     ]],

application/manage/view/manager/edit.html

@@ -112,14 +112,14 @@
             <tr>
                     <th height="32" align="right" >创建时间：</th>
                     <td   >
-                    {if $manager["ctime"] != null }
-                    <input type="text" readonly="readonly" class="easyui-datetimebox" size="20" value="{$manager['ctime']}" />
+                    {if $manager["createdAt"] != null }
+                    <input type="text" readonly="readonly" class="easyui-datetimebox" size="20" value="{$manager['createdAt']}" />
                     {/if}
                     </td>
                     <th height="32" align="right" >更新时间：</th>
                     <td >
-                    {if  $manager["utime"] != null }
-                    <input type="text" readonly="readonly" class="easyui-datetimebox" size="20" value="{$manager['utime']}" />
+                    {if  $manager["updatedAt"] != null }
+                    <input type="text" readonly="readonly" class="easyui-datetimebox" size="20" value="{$manager['updatedAt']}" />
                     {/if}
                     </td>
             </tr>

application/manage/view/manager/index.html

@@ -99,8 +99,8 @@
                             {field:'institution_id',title:'机构ID',width:150 ,formatter:insFormatter },
                             {field:'status',title:'状态',width:60 , formatter:statusFormatter },
                             {field:'logintime',title:'登录时间',width:115 , formatter:dateFormatter },
-                            {field:'ctime',title:'创建时间',align: 'center', width:115, formatter:dateFormatter },
-                            {field:'utime',title:'更新时间',align: 'center', width:115, formatter:dateFormatter },
+                            {field:'createdAt',title:'创建时间',align: 'center', width:115, formatter:dateFormatter },
+                            {field:'updatedAt',title:'更新时间',align: 'center', width:115, formatter:dateFormatter },
                             {field:'grid_commands',title:'操作',align: 'center',width:100, formatter:commandsFormatter },
                     ]],
                     onDblClickRow :function(rowIndex,rowData){

application/manage/view/messages/index.html

@@ -63,7 +63,7 @@
                     {field:'doctor_id',title:'所属医生',width:"20%",align: 'center',hidden:true },
                     {field:'doctor_name',title:'所属医生',width:"20%",align: 'center' },
                     {field:'status',title:'删除状态',width:"20%",align: 'center',formatter:delstatusFormatter },
-                    {field:'ctime',title:'创建时间',align: 'center', width:135, formatter:dateFormatter },
+                    {field:'createdAt',title:'创建时间',align: 'center', width:135, formatter:dateFormatter },
                     {field:'grid_commands',title:'操作',align: 'center',width:100, formatter:commandsFormatter },
                 ]],
                 onDblClickRow :function(rowData){

application/manage/view/patientinfo/index.html

@@ -83,7 +83,7 @@
                     {field:'address',title:'联系地址',width:"100",align: 'center' },
                     {field:'temp_patient_id',title:'检查临时患者id',width:"120",align: 'center' },
                     {field:'status',title:'删除状态',width:80,align: 'center',formatter:delstatusFormatter },
-                    {field:'ctime',title:'创建时间',align: 'center', width:135, formatter:dateFormatter },
+                    {field:'createdAt',title:'创建时间',align: 'center', width:135, formatter:dateFormatter },
                     {field:'grid_commands',title:'操作',align: 'center',width:100, formatter:commandsFormatter },
                 ]],
                 onDblClickRow :function(rowIndex,rowData){

application/manage/view/remoteapplication/index.html

@@ -93,7 +93,7 @@
                     {field:'is_urgent',title:'是否急诊',width:"120",align: 'center',formatter:urgentFormatter },
                     {field:'application_status',title:'远程申请状态',width:180,align: 'center',formatter:applicationFormatter },
                     {field:'status',title:'删除状态',width:80,align: 'center',formatter:delstatusFormatter },
-                    {field:'ctime',title:'创建时间',align: 'center', width:135, formatter:dateFormatter },
+                    {field:'createdAt',title:'创建时间',align: 'center', width:135, formatter:dateFormatter },
                     {field:'grid_commands',title:'操作',align: 'center',width:100, formatter:commandsFormatter },
                 ]],
                 onDblClickRow :function(rowIndex,rowData){

application/manage/view/remotereport/index.html

@@ -61,7 +61,7 @@
                     {field:'rejected_reason',title:'驳回原因',align: 'center',width:180},
                     {field:'read_status',title:'已读状态',width:"20%",align: 'center',formatter:readFormatter },
                     {field:'status',title:'删除状态',width:"20%",align: 'center',formatter:delstatusFormatter },
-                    {field:'ctime',title:'创建时间',align: 'center', width:135, formatter:dateFormatter },
+                    {field:'createdAt',title:'创建时间',align: 'center', width:135, formatter:dateFormatter },
                     {field:'grid_commands',title:'操作',align: 'center',width:100, formatter:commandsFormatter },
                 ]],
                 onDblClickRow :function(rowData){

public/index.html

@@ -1,3 +1,3 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>中世康恺远程诊断平台</title><link rel="shortcut icon" href=/favicon.ico><link href=/static/css/app.dbfe7c5a48fe9623fb14603752d831f7.css rel=stylesheet></head><style>body::-webkit-scrollbar{
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>中世康恺远程诊断平台</title><link rel="shortcut icon" href=/favicon.ico><link href=/static/css/app.1494b8bec6e04f97b55b14a904e82e36.css rel=stylesheet></head><style>body::-webkit-scrollbar{
     width: 0;
-  }</style><body><script src=http://libs.baidu.com/jquery/2.0.0/jquery.js></script><script src=/static/tinymce4.7.5/tinymce.min.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.6162d9f752059937b6d4.js></script><script type=text/javascript src=/static/js/vendor.7edea4a4dee5476472dd.js></script><script type=text/javascript src=/static/js/app.3655674601b00d1b5b19.js></script><script type=text/javascript src=/static/js/babel-polyfill.c3ea913f8cb1fddc2567.js></script></body></html>
+  }</style><body><script src=http://libs.baidu.com/jquery/2.0.0/jquery.js></script><script src=/static/tinymce4.7.5/tinymce.min.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.9e0502c6247ed80b32b6.js></script><script type=text/javascript src=/static/js/vendor.7edea4a4dee5476472dd.js></script><script type=text/javascript src=/static/js/app.11741ef9d8a70028e368.js></script><script type=text/javascript src=/static/js/babel-polyfill.c3ea913f8cb1fddc2567.js></script></body></html>

public/static/js/manifest.9e0502c6247ed80b32b6.js

@@ -0,0 +1 @@
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,f){for(var o,d,i,u=0,b=[];u<r.length;u++)d=r[u],c[d]&&b.push(c[d][0]),c[d]=0;for(o in a)Object.prototype.hasOwnProperty.call(a,o)&&(e[o]=a[o]);for(n&&n(r,a,f);b.length;)b.shift()();if(f)for(u=0;u<f.length;u++)i=t(t.s=f[u]);return i};var r={},c={23:0};function t(n){if(r[n])return r[n].exports;var c=r[n]={i:n,l:!1,exports:{}};return e[n].call(c.exports,c,c.exports,t),c.l=!0,c.exports}t.e=function(e){var n=c[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,t){n=c[e]=[r,t]});n[2]=r;var a=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,t.nc&&f.setAttribute("nonce",t.nc),f.src=t.p+"static/js/"+e+"."+{0:"a291b9090c89db275de6",1:"713cbe623f3751bafe91",2:"834783b6cb5ca1000cae",3:"c20576ad6dd50b09446a",4:"8cd7a00a8a4ebb69699c",5:"5e5a4de79f553576d0dc",6:"cfb2b03cb5d3152312e9",7:"a543c02f14ef5b7bc33f",8:"f593dd9000f6c9c33ea8",9:"c59290371641acb0a06c",10:"201f5678446b879a0725",11:"fbfbb993fd660fb0f233",12:"6f6f9d904d26a5c35532",13:"905ad3463009166d6780",14:"2fd13c522e1990ef7d11",15:"9fa9fe7342041e502c58",16:"01c8af0567cf93efa9f9",17:"b94c3ea75f6c030f553f",18:"7edea4a4dee5476472dd",19:"11741ef9d8a70028e368",20:"c3ea913f8cb1fddc2567",21:"a96870a01c21a73ff6df",22:"c601439c3a4f5f2e3c3d"}[e]+".js";var o=setTimeout(d,12e4);function d(){f.onerror=f.onload=null,clearTimeout(o);var n=c[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return f.onerror=f.onload=d,a.appendChild(f),r},t.m=e,t.c=r,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="/",t.oe=function(e){throw console.error(e),e}}([]);