xiugai

.idea/workspace.xml

@@ -22,136 +22,39 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="Inspectregister.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-418.7097">
-              <caret line="598" column="5" selection-start-line="598" selection-start-column="5" selection-end-line="598" selection-end-column="5" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Registerlist.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/inter/controller/Registerlist.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="79" column="29" selection-start-line="79" selection-start-column="29" selection-end-line="79" selection-end-column="29" />
-              <folding>
-                <marker date="1544780608357" expanded="true" signature="5339:5594" placeholder="SELECT e.id,... exams" />
-                <marker date="1544780608357" expanded="true" signature="5339:5610" placeholder="SELECT e.id,... exams" />
-                <marker date="1544780608357" expanded="true" signature="5339:5627" placeholder="SELECT e.id,... exams" />
-                <marker date="1544780608357" expanded="true" signature="7142:7270" placeholder="SELECT count... exams" />
-                <marker date="1544780608357" expanded="true" signature="7142:7287" placeholder="SELECT count... exams" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Dcquery.php" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/application/inter/controller/Dcquery.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.92347825">
-              <caret line="348" column="1" selection-start-line="348" selection-start-column="1" selection-end-line="348" selection-end-column="1" />
-              <folding>
-                <element signature="e#227#257#0#PHP" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Dcquery.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/inter/controller/Dcquery.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-8.83871">
-              <caret line="185" column="41" selection-start-line="0" selection-start-column="0" selection-end-line="348" selection-end-column="1" />
-              <folding>
-                <element signature="e#227#257#0#PHP" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="Reciveremote.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-14.096774">
-              <caret line="58" column="45" selection-start-line="58" selection-start-column="45" selection-end-line="58" selection-end-column="45" />
+            <state vertical-scroll-proportion="-7.096774">
+              <caret line="59" column="41" selection-start-line="59" selection-start-column="41" selection-end-line="69" selection-end-column="17" />
               <folding>
-                <marker date="1543805954537" expanded="true" signature="7753:8228" placeholder="SELECT e.id,... exams" />
-                <marker date="1543805954537" expanded="true" signature="8336:8549" placeholder="SELECT count... exams" />
+                <marker date="1545296632263" expanded="true" signature="8097:8597" placeholder="SELECT e.id,... exams" />
+                <marker date="1545296632263" expanded="true" signature="8705:8918" placeholder="SELECT count... exams" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Application.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
+      <file leaf-file-name="Reciveremote.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/inter/controller/Reciveremote.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-6.096774">
-              <caret line="159" column="40" selection-start-line="159" selection-start-column="40" selection-end-line="159" selection-end-column="40" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="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="71.67742">
-              <caret line="54" column="45" selection-start-line="54" selection-start-column="45" selection-end-line="54" selection-end-column="45" />
+            <state vertical-scroll-proportion="0.6504348">
+              <caret line="66" column="38" selection-start-line="66" selection-start-column="38" selection-end-line="66" selection-end-column="38" />
               <folding>
-                <marker date="1544599982346" expanded="true" signature="8595:8894" placeholder="SELECT a.id,... exams" />
-                <marker date="1544599982346" expanded="true" signature="8978:9106" placeholder="SELECT count... exams" />
+                <marker date="1545808692651" expanded="true" signature="7896:8188" placeholder="SELECT e.id,... exams" />
+                <marker date="1545808692651" expanded="true" signature="7896:8231" placeholder="SELECT e.id,... exams" />
+                <marker date="1545808692651" expanded="true" signature="7896:8450" placeholder="SELECT e.id,... exams" />
+                <marker date="1545808692651" expanded="true" signature="8558:8843" placeholder="SELECT count... exams" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Writereport.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-1.4193548">
-              <caret line="71" column="58" selection-start-line="71" selection-start-column="58" selection-end-line="71" selection-end-column="58" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Version4" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version4">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="6" column="70" selection-start-line="6" selection-start-column="70" selection-end-line="6" selection-end-column="70" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Doctors.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/inter/controller/Doctors.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="77" column="62" selection-start-line="77" selection-start-column="62" selection-end-line="77" selection-end-column="62" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/application/inter/controller/Base.php" />
-        <option value="$PROJECT_DIR$/application/manage/controller/Constant.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/23.log" />
-        <option value="$PROJECT_DIR$/application/manage/view/device/index.html" />
-        <option value="$USER_HOME$/Desktop/database.php" />
-        <option value="$PROJECT_DIR$/thinkphp/library/think/Loader.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Examclass.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Examproject.php" />
-        <option value="$PROJECT_DIR$/public/api.html" />
         <option value="$PROJECT_DIR$/../../../bin/apache/apache2.4.23/conf/extra/httpd-vhosts.conf" />
         <option value="$PROJECT_DIR$/../../yanzhengma.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Messages.php" />
@@ -171,7 +74,6 @@
         <option value="$PROJECT_DIR$/application/common/versionsql/version1" />
         <option value="$PROJECT_DIR$/../yuanchengpasc/application/database.php" />
         <option value="$PROJECT_DIR$/../../shenqingxinxi/application/admin/controller/Openapplication.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Reciveremote.php" />
         <option value="$PROJECT_DIR$/application/common/controller/Version.php" />
         <option value="$PROJECT_DIR$/application/common.php" />
         <option value="$PROJECT_DIR$/application/admin/command/Upgrade.php" />
@@ -181,19 +83,29 @@
         <option value="$PROJECT_DIR$/application/common/versionsql/Version3" />
         <option value="$PROJECT_DIR$/application/manage/view/insdoctors/edit.html" />
         <option value="$PROJECT_DIR$/application/manage/view/doctors/edit.html" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Writereport.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Report.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Login.php" />
-        <option value="$PROJECT_DIR$/application/manage/controller/Doctors.php" />
-        <option value="$PROJECT_DIR$/application/manage/controller/Insdoctors.php" />
-        <option value="$PROJECT_DIR$/application/database.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Index.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Inspectregister.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Registerlist.php" />
+        <option value="$USER_HOME$/Desktop/bbs.sql" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Reciveremote.php" />
+        <option value="$PROJECT_DIR$/../yuanchengpasc/application/inter/controller/Login.php" />
+        <option value="$PROJECT_DIR$/application/common/versionsql/Version5" />
+        <option value="$PROJECT_DIR$/../yuanchengpasc/application/common/library/AliyunSms.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Base.php" />
+        <option value="$PROJECT_DIR$/application/database.php" />
+        <option value="$PROJECT_DIR$/../yuanchengpasc/application/common/library/send_message.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Index.php" />
         <option value="$PROJECT_DIR$/application/common/versionsql/Version4" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Application.php" />
+        <option value="$PROJECT_DIR$/application/manage/controller/Doctors.php" />
+        <option value="$PROJECT_DIR$/application/manage/controller/Insdoctors.php" />
         <option value="$PROJECT_DIR$/../yuanchengpasc/application/inter/controller/Dcquery.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Login.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Dcquery.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Application.php" />
+        <option value="$PROJECT_DIR$/../yuanchengpasc/application/inter/controller/Application.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Writereport.php" />
+        <option value="$PROJECT_DIR$/../yuanchengpasc/application/inter/controller/Writereport.php" />
+        <option value="$PROJECT_DIR$/../yuanchengpasc/application/inter/controller/Reciveremote.php" />
       </list>
     </option>
   </component>
@@ -243,6 +155,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
+      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -261,7 +175,7 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="yczd" />
+              <option name="myItemId" value="yuanchengpasc" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -275,7 +189,7 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="yczd" />
+              <option name="myItemId" value="yuanchengpasc" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -293,7 +207,7 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="yczd" />
+              <option name="myItemId" value="yuanchengpasc" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -315,7 +229,7 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="yczd" />
+              <option name="myItemId" value="yuanchengpasc" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -331,6 +245,60 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="yczd" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="yczd" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="yczd" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="yczd" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="yczd" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="yczd" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="application" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="yczd" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="yczd" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="yczd" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="application" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="inter" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="yczd" />
@@ -349,7 +317,11 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="common" />
+              <option name="myItemId" value="inter" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="controller" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -365,14 +337,12 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
-      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../shenqingxinxi" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../yuanchengpasc" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.colors.Font" />
+    <property name="settings.editor.selected.configurable" value="web-ide.project.structure" />
     <property name="settings.editor.splitter.proportion" value="0.2" />
     <property name="js-jscs-nodeInterpreter" value="D:\node.js\node.exe" />
   </component>
@@ -421,7 +391,7 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
+    <frame x="-8" y="-8" 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.21522693" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -459,398 +429,445 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="12" />
+      <option name="time" value="19" />
     </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/thinkphp/tpl/default_index.tpl">
+    <entry file="file://$PROJECT_DIR$/application/command.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.15742397">
+          <caret line="12" column="31" selection-start-line="12" selection-start-column="31" selection-end-line="12" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Operating.php">
+    <entry file="file://$PROJECT_DIR$/application/common.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.69391304">
-          <caret line="71" column="5" selection-start-line="71" selection-start-column="5" selection-end-line="71" selection-end-column="5" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/common/versionsql/createversion">
+    <entry file="file://$PROJECT_DIR$/application/admin/command/Upgrade.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.14521453">
-          <caret line="4" column="54" selection-start-line="4" selection-start-column="54" selection-end-line="4" selection-end-column="54" />
+        <state vertical-scroll-proportion="-39.741936">
+          <caret line="56" column="28" selection-start-line="56" selection-start-column="28" selection-end-line="56" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/thinkphp/library/think/Db.php">
+    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/common/versionsql/Version2">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80347824">
-          <caret line="30" column="3" selection-start-line="30" selection-start-column="3" selection-end-line="30" selection-end-column="3" />
-          <folding />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="105" selection-start-line="0" selection-start-column="82" selection-end-line="0" selection-end-column="105" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/database.php">
+    <entry file="file://$PROJECT_DIR$/application/manage/controller/Remoteapplication.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.26782608">
-          <caret line="15" column="35" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
+        <state vertical-scroll-proportion="-1.4921739">
+          <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$/runtime/cache/1f/a950409ef9a40288e34443cf7a15df.php">
+    <entry file="file://$PROJECT_DIR$/application/common/library/Verify.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <caret line="128" column="5" selection-start-line="128" selection-start-column="5" selection-end-line="128" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/runtime/cache/11/4dee00169d5717c43f41a0f66a0a6e.php">
+    <entry file="file://$PROJECT_DIR$/application/index/controller/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" />
+          <caret line="93" column="31" selection-start-line="93" selection-start-column="20" selection-end-line="93" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/runtime/cache/53/6c8ff6798a0eab5d441d5f6a72d27d.php">
+    <entry file="file://$PROJECT_DIR$/application/manage/view/insdoctors/permissions.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
+        <state vertical-scroll-proportion="101.3871">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/versionsql/createversion">
+    <entry file="file://$PROJECT_DIR$/application/manage/view/insdoctors/stats.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.10891089">
-          <caret line="3" column="20" selection-start-line="3" selection-start-column="20" selection-end-line="3" selection-end-column="20" />
+        <state vertical-scroll-proportion="-1.1478261">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/thinkphp/library/think/console/Command.php">
+    <entry file="file://$PROJECT_DIR$/application/manage/view/insdoctors/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35130435">
-          <caret line="330" column="20" selection-start-line="330" selection-start-column="20" selection-end-line="330" selection-end-column="20" />
+        <state vertical-scroll-proportion="-0.14862385">
+          <caret line="88" column="101" selection-start-line="88" selection-start-column="101" selection-end-line="88" selection-end-column="101" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/admin/controller/Openapplication.php">
+    <entry file="file://$PROJECT_DIR$/application/manage/view/doctors/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="14.096774">
-          <caret line="43" column="33" selection-start-line="43" selection-start-column="33" selection-end-line="43" selection-end-column="33" />
+        <state vertical-scroll-proportion="-0.57391304">
+          <caret line="63" column="37" selection-start-line="63" selection-start-column="37" selection-end-line="63" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/application/admin/controller/Addon.php">
+    <entry file="file://$PROJECT_DIR$/application/manage/view/insdoctors/edit.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.80347824">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state vertical-scroll-proportion="-8.935484">
+          <caret line="140" column="17" selection-start-line="140" selection-start-column="17" selection-end-line="148" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/public/assets/js/backend/openapplication.js">
+    <entry file="file://$PROJECT_DIR$/application/manage/view/doctors/edit.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.10891089">
-          <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="-13.4838705">
+          <caret line="136" column="17" selection-start-line="136" selection-start-column="17" selection-end-line="136" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/tags.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="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state vertical-scroll-proportion="-418.7097">
+          <caret line="598" column="5" selection-start-line="598" selection-start-column="5" selection-end-line="598" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/com/jetbrains/php/lang/psi/stubs/data/filter.php">
+    <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version3">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3506261">
-          <caret line="304" column="35" selection-start-line="304" selection-start-column="35" selection-end-line="304" selection-end-column="35" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="1" column="66" selection-start-line="1" selection-start-column="66" selection-end-line="1" selection-end-column="66" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/config.php">
+    <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version2">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="151.58064">
-          <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.0">
+          <caret line="5" column="38" selection-start-line="5" selection-start-column="38" selection-end-line="5" selection-end-column="38" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/com/jetbrains/php/lang/psi/stubs/data/basic.php">
+    <entry file="file://$PROJECT_DIR$/application/common/library/ResultTools.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4257603">
-          <caret line="144" column="9" selection-start-line="144" selection-start-column="9" selection-end-line="144" selection-end-column="9" />
+        <state vertical-scroll-proportion="-7.483871">
+          <caret line="12" column="27" selection-start-line="12" selection-start-column="27" selection-end-line="12" selection-end-column="27" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/public/router.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Template.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35420394">
-          <caret line="18" column="35" selection-start-line="18" selection-start-column="35" selection-end-line="18" selection-end-column="35" />
+        <state vertical-scroll-proportion="0.52">
+          <caret line="140" column="62" selection-start-line="140" selection-start-column="62" selection-end-line="140" selection-end-column="62" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/command.php">
+    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/vendor/overtrue/wechat/src/Core/Exception.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.15742397">
-          <caret line="12" column="31" selection-start-line="12" selection-start-column="31" selection-end-line="12" selection-end-column="31" />
+        <state vertical-scroll-proportion="0.7095652">
+          <caret line="28" column="6" selection-start-line="28" selection-start-column="6" selection-end-line="28" selection-end-column="6" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/controller/Version.php">
+    <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version1">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.42086956">
-          <caret line="11" column="23" selection-start-line="11" selection-start-column="23" selection-end-line="11" selection-end-column="23" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="44" selection-start-line="0" selection-start-column="44" selection-end-line="0" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/common.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="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
+          <caret line="66" column="75" selection-start-line="66" selection-start-column="75" selection-end-line="66" selection-end-column="75" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/admin/command/Upgrade.php">
+    <entry file="file://$PROJECT_DIR$/application/common/versionsql/createversion">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-39.741936">
-          <caret line="56" column="28" selection-start-line="56" selection-start-column="28" selection-end-line="56" selection-end-column="28" />
+        <state vertical-scroll-proportion="0.10891089">
+          <caret line="3" column="20" selection-start-line="3" selection-start-column="20" selection-end-line="3" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/common/versionsql/Version2">
+    <entry file="file://$PROJECT_DIR$/application/common/controller/Version.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="105" selection-start-line="0" selection-start-column="82" selection-end-line="0" selection-end-column="105" />
+        <state vertical-scroll-proportion="-7.806452">
+          <caret line="11" column="23" selection-start-line="11" selection-start-column="23" selection-end-line="11" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/controller/Remoteapplication.php">
+    <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version5">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-1.4921739">
-          <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.32673267">
+          <caret line="9" column="58" selection-start-line="9" selection-start-column="58" selection-end-line="9" selection-end-column="58" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/library/Verify.php">
+    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/common/library/api_sdk/lib/Core/Exception/ServerException.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="128" column="5" selection-start-line="128" selection-start-column="5" selection-end-line="128" selection-end-column="5" />
-          <folding />
+        <state vertical-scroll-proportion="-6.516129">
+          <caret line="10" column="21" selection-start-line="10" selection-start-column="21" selection-end-line="10" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/index/controller/Index.php">
+    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/common/library/api_sdk/lib/Core/DefaultAcsClient.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="93" column="31" selection-start-line="93" selection-start-column="20" selection-end-line="93" selection-end-column="31" />
+        <state vertical-scroll-proportion="0.3321739">
+          <caret line="104" column="18" selection-start-line="104" selection-start-column="18" selection-end-line="104" selection-end-column="18" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Base.php">
+    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/inter/controller/Inspectregister.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-12.774194">
-          <caret line="36" column="90" selection-start-line="36" selection-start-column="90" selection-end-line="36" selection-end-column="90" />
+        <state vertical-scroll-proportion="13.429565">
+          <caret line="359" column="25" selection-start-line="359" selection-start-column="12" selection-end-line="359" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/view/insdoctors/permissions.html">
+    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/common/library/AliyunSms.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="101.3871">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.52">
+          <caret line="81" column="41" selection-start-line="81" selection-start-column="41" selection-end-line="81" selection-end-column="41" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/view/insdoctors/stats.html">
+    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/inter/controller/Login.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-1.1478261">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.26782608">
+          <caret line="139" column="9" selection-start-line="139" selection-start-column="9" selection-end-line="139" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/view/insdoctors/index.html">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Base.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.14862385">
-          <caret line="88" column="101" selection-start-line="88" selection-start-column="101" selection-end-line="88" selection-end-column="101" />
+        <state vertical-scroll-proportion="-13.83871">
+          <caret line="37" column="14" selection-start-line="37" selection-start-column="14" selection-end-line="37" selection-end-column="14" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/view/doctors/index.html">
+    <entry file="file://$PROJECT_DIR$/application/database.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.57391304">
-          <caret line="63" column="37" selection-start-line="63" selection-start-column="37" selection-end-line="63" selection-end-column="37" />
+        <state vertical-scroll-proportion="-7.096774">
+          <caret line="18" column="38" selection-start-line="18" selection-start-column="38" selection-end-line="18" selection-end-column="38" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/view/insdoctors/edit.html">
+    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/inter/controller/Index.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-8.935484">
-          <caret line="140" column="17" selection-start-line="140" selection-start-column="17" selection-end-line="148" selection-end-column="17" />
+        <state vertical-scroll-proportion="0.57391304">
+          <caret line="35" column="35" selection-start-line="35" selection-start-column="35" selection-end-line="35" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/view/doctors/edit.html">
+    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/common/library/send_message.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-13.4838705">
-          <caret line="136" column="17" selection-start-line="136" selection-start-column="17" selection-end-line="136" selection-end-column="17" />
+        <state vertical-scroll-proportion="-11.451612">
+          <caret line="36" column="27" selection-start-line="36" selection-start-column="27" selection-end-line="36" selection-end-column="27" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version1">
+    <entry file="file://$PROJECT_DIR$/application/manage/controller/Index.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.31023103">
-          <caret line="47" column="0" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="47" />
+        <state vertical-scroll-proportion="-0.45913044">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version3">
+    <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="1" column="66" selection-start-line="1" selection-start-column="66" selection-end-line="1" selection-end-column="66" />
+        <state vertical-scroll-proportion="0.2521739">
+          <caret line="30" column="67" selection-start-line="30" selection-start-column="67" selection-end-line="30" selection-end-column="67" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version2">
+    <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version4">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.18151815">
-          <caret line="5" column="38" selection-start-line="5" selection-start-column="38" selection-end-line="5" selection-end-column="38" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
+    <entry file="file://$PROJECT_DIR$/application/manage/controller/Insdoctors.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5026087">
-          <caret line="56" column="30" selection-start-line="56" selection-start-column="30" selection-end-line="56" selection-end-column="30" />
+        <state vertical-scroll-proportion="0.30608696">
+          <caret line="126" column="72" selection-start-line="126" selection-start-column="72" selection-end-line="126" selection-end-column="72" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/application/manage/controller/Doctors.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="118" column="38" selection-start-line="118" selection-start-column="38" selection-end-line="118" selection-end-column="38" />
-          <folding />
+        <state vertical-scroll-proportion="1.2086957">
+          <caret line="112" column="42" selection-start-line="112" selection-start-column="42" selection-end-line="112" selection-end-column="42" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/controller/Insdoctors.php">
+    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/inter/controller/Report.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="131" column="36" selection-start-line="131" selection-start-column="36" selection-end-line="131" selection-end-column="36" />
-          <folding />
+        <state vertical-scroll-proportion="-5.7773914">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/database.php">
+    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/inter/controller/Template.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="21" column="10" selection-start-line="21" selection-start-column="10" selection-end-line="21" selection-end-column="10" />
-          <folding />
+        <state vertical-scroll-proportion="211.3871">
+          <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/Login.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="117" column="10" selection-start-line="117" selection-start-column="10" selection-end-line="117" selection-end-column="10" />
+        <state vertical-scroll-proportion="0.6173913">
+          <caret line="129" column="54" selection-start-line="129" selection-start-column="54" selection-end-line="129" selection-end-column="54" />
           <folding>
-            <marker date="1544611032376" expanded="true" signature="4066:4237" placeholder="SELECT m.id,... menu" />
+            <element signature="e#39#60#0#PHP" expanded="true" />
+            <marker date="1545788594932" expanded="true" signature="4066:4237" placeholder="SELECT m.id,... menu" />
           </folding>
         </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="77" column="62" selection-start-line="77" selection-start-column="62" selection-end-line="77" selection-end-column="62" />
-          <folding />
+        <state vertical-scroll-proportion="3.451613">
+          <caret line="178" column="32" selection-start-line="178" selection-start-column="31" selection-end-line="178" selection-end-column="32" />
+          <folding>
+            <marker date="1544599982346" expanded="true" signature="8595:8894" placeholder="SELECT a.id,... exams" />
+            <marker date="1544599982346" expanded="true" signature="8978:9106" placeholder="SELECT count... exams" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.php">
+    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/inter/controller/Dcquery.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-418.7097">
-          <caret line="598" column="5" selection-start-line="598" selection-start-column="5" selection-end-line="598" selection-end-column="5" />
+        <state vertical-scroll-proportion="0.21217391">
+          <caret line="343" column="55" selection-start-line="343" selection-start-column="55" selection-end-line="343" selection-end-column="55" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Registerlist.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="79" column="29" selection-start-line="79" selection-start-column="29" selection-end-line="79" selection-end-column="29" />
-          <folding>
-            <marker date="1544780608357" expanded="true" signature="5339:5594" placeholder="SELECT e.id,... exams" />
-            <marker date="1544780608357" expanded="true" signature="5339:5610" placeholder="SELECT e.id,... exams" />
-            <marker date="1544780608357" expanded="true" signature="5339:5627" placeholder="SELECT e.id,... exams" />
-            <marker date="1544780608357" expanded="true" signature="7142:7270" placeholder="SELECT count... exams" />
-            <marker date="1544780608357" expanded="true" signature="7142:7287" placeholder="SELECT count... exams" />
-          </folding>
+        <state vertical-scroll-proportion="0.7704348">
+          <caret line="402" column="1" selection-start-line="402" selection-start-column="1" selection-end-line="402" selection-end-column="1" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version4">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Doctors.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="6" column="70" selection-start-line="6" selection-start-column="70" selection-end-line="6" selection-end-column="70" />
+        <state vertical-scroll-proportion="4.5913043">
+          <caret line="126" column="12" selection-start-line="126" selection-start-column="12" selection-end-line="140" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.php">
+    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/inter/controller/Application.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-14.096774">
-          <caret line="58" column="45" selection-start-line="58" selection-start-column="45" selection-end-line="58" selection-end-column="45" />
+        <state vertical-scroll-proportion="0.2173913">
+          <caret line="429" column="41" selection-start-line="429" selection-start-column="41" selection-end-line="429" selection-end-column="41" />
           <folding>
-            <marker date="1543805954537" expanded="true" signature="7753:8228" placeholder="SELECT e.id,... exams" />
-            <marker date="1543805954537" expanded="true" signature="8336:8549" placeholder="SELECT count... exams" />
+            <element signature="e#39#60#0#PHP" expanded="true" />
+            <marker date="1545805652577" expanded="true" signature="18068:18519" placeholder="..." />
+            <marker date="1545805652577" expanded="true" signature="20131:20845" placeholder="..." />
+            <marker date="1545805652577" expanded="true" signature="20266:20845" placeholder="..." />
+            <marker date="1545805652577" expanded="true" signature="20401:20845" placeholder="..." />
+            <marker date="1545805652577" expanded="true" signature="24041:24485" placeholder="..." />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-6.096774">
-          <caret line="159" column="40" selection-start-line="159" selection-start-column="40" selection-end-line="159" selection-end-column="40" />
-          <folding />
+        <state vertical-scroll-proportion="0.14086956">
+          <caret line="430" column="30" selection-start-line="430" selection-start-column="30" selection-end-line="430" selection-end-column="30" />
+          <folding>
+            <element signature="e#39#60#0#PHP" expanded="true" />
+            <marker date="1545805644193" expanded="true" signature="7823:9951" placeholder="..." />
+            <marker date="1545805644193" expanded="true" signature="7948:9951" placeholder="..." />
+            <marker date="1545805644193" expanded="true" signature="8075:9951" placeholder="..." />
+            <marker date="1545805644193" expanded="true" signature="8201:9951" placeholder="..." />
+            <marker date="1545805644193" expanded="true" signature="8327:9951" placeholder="..." />
+            <marker date="1545805644193" expanded="true" signature="8452:9951" placeholder="..." />
+            <marker date="1545805644193" expanded="true" signature="8584:9951" placeholder="..." />
+            <marker date="1545805644193" expanded="true" signature="8711:9951" placeholder="..." />
+            <marker date="1545805644193" expanded="true" signature="8844:9951" placeholder="..." />
+            <marker date="1545805644193" expanded="true" signature="8978:9951" placeholder="..." />
+            <marker date="1545805644193" expanded="true" signature="9105:9951" placeholder="..." />
+            <marker date="1545805644193" expanded="true" signature="9238:9951" placeholder="..." />
+            <marker date="1545805644193" expanded="true" signature="9363:9951" placeholder="..." />
+            <marker date="1545805644193" expanded="true" signature="9507:9951" placeholder="..." />
+            <marker date="1545805644193" expanded="true" signature="18068:18519" placeholder="..." />
+            <marker date="1545805644193" expanded="true" signature="20131:20845" placeholder="..." />
+            <marker date="1545805644193" expanded="true" signature="20266:20845" placeholder="..." />
+            <marker date="1545805644193" expanded="true" signature="20401:20845" placeholder="..." />
+            <marker date="1545805644193" expanded="true" signature="24041:24485" placeholder="..." />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="71.67742">
-          <caret line="54" column="45" selection-start-line="54" selection-start-column="45" selection-end-line="54" selection-end-column="45" />
+        <state vertical-scroll-proportion="0.048695654">
+          <caret line="950" column="38" selection-start-line="950" selection-start-column="38" selection-end-line="950" selection-end-column="38" />
           <folding>
-            <marker date="1544599982346" expanded="true" signature="8595:8894" placeholder="SELECT a.id,... exams" />
-            <marker date="1544599982346" expanded="true" signature="8978:9106" placeholder="SELECT count... exams" />
+            <element signature="e#74#95#0#PHP" expanded="true" />
+            <marker date="1545808554742" expanded="true" signature="7267:7718" placeholder="..." />
+            <marker date="1545808554742" expanded="true" signature="9437:10979" placeholder="..." />
+            <marker date="1545808554742" expanded="true" signature="9555:10979" placeholder="..." />
+            <marker date="1545808554742" expanded="true" signature="9673:10979" placeholder="..." />
+            <marker date="1545808554742" expanded="true" signature="9790:10979" placeholder="..." />
+            <marker date="1545808554742" expanded="true" signature="9907:10979" placeholder="..." />
+            <marker date="1545808554742" expanded="true" signature="10031:10979" placeholder="..." />
+            <marker date="1545808554742" expanded="true" signature="10156:10979" placeholder="..." />
+            <marker date="1545808554742" expanded="true" signature="10277:10979" placeholder="..." />
+            <marker date="1545808554742" expanded="true" signature="10399:10979" placeholder="..." />
+            <marker date="1545808554742" expanded="true" signature="22490:23056" placeholder="..." />
+            <marker date="1545808554742" expanded="true" signature="22606:23056" placeholder="..." />
+            <marker date="1545808554742" expanded="true" signature="27424:28245" placeholder="..." />
+            <marker date="1545808554742" expanded="true" signature="27548:28245" placeholder="..." />
+            <marker date="1545808554742" expanded="true" signature="27673:28245" placeholder="..." />
+            <marker date="1545808554742" expanded="true" signature="27795:28245" placeholder="..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
+    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/inter/controller/Writereport.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-1.4193548">
-          <caret line="71" column="58" selection-start-line="71" selection-start-column="58" selection-end-line="71" selection-end-column="58" />
-          <folding />
+        <state vertical-scroll-proportion="0.04521739">
+          <caret line="950" column="44" selection-start-line="950" selection-start-column="44" selection-end-line="950" selection-end-column="44" />
+          <folding>
+            <element signature="e#74#95#0#PHP" expanded="true" />
+            <marker date="1545808554735" expanded="true" signature="22490:23056" placeholder="..." />
+            <marker date="1545808554735" expanded="true" signature="22606:23056" placeholder="..." />
+            <marker date="1545808554735" expanded="true" signature="27424:28245" placeholder="..." />
+            <marker date="1545808554735" expanded="true" signature="27548:28245" placeholder="..." />
+            <marker date="1545808554735" expanded="true" signature="27673:28245" placeholder="..." />
+            <marker date="1545808554735" expanded="true" signature="27795:28245" placeholder="..." />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/inter/controller/Dcquery.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-8.83871">
-          <caret line="185" column="41" selection-start-line="0" selection-start-column="0" selection-end-line="348" selection-end-column="1" />
+        <state vertical-scroll-proportion="-7.096774">
+          <caret line="59" column="41" selection-start-line="59" selection-start-column="41" selection-end-line="69" selection-end-column="17" />
           <folding>
-            <element signature="e#227#257#0#PHP" expanded="true" />
+            <marker date="1545296632263" expanded="true" signature="8097:8597" placeholder="SELECT e.id,... exams" />
+            <marker date="1545296632263" expanded="true" signature="8705:8918" placeholder="SELECT count... exams" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Dcquery.php">
+    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/inter/controller/Reciveremote.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.92347825">
-          <caret line="348" column="1" selection-start-line="348" selection-start-column="1" selection-end-line="348" selection-end-column="1" />
+        <state vertical-scroll-proportion="0.6504348">
+          <caret line="66" column="38" selection-start-line="66" selection-start-column="38" selection-end-line="66" selection-end-column="38" />
           <folding>
-            <element signature="e#227#257#0#PHP" expanded="true" />
+            <marker date="1545808692651" expanded="true" signature="7896:8188" placeholder="SELECT e.id,... exams" />
+            <marker date="1545808692651" expanded="true" signature="7896:8231" placeholder="SELECT e.id,... exams" />
+            <marker date="1545808692651" expanded="true" signature="7896:8450" placeholder="SELECT e.id,... exams" />
+            <marker date="1545808692651" expanded="true" signature="8558:8843" placeholder="SELECT count... exams" />
           </folding>
         </state>
       </provider>

.idea/yczd.iml

@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$/../../shenqingxinxi" />
     <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$/../yuanchengpasc" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>

application/common/versionsql/Version4

@@ -1,7 +0,0 @@
-ALTER  TABLE `patient_infos` ADD Unique index patient_i_t(institution_id,temp_patient_id);
-alter table studies engine=innodb;
-ALTER  TABLE `studies` ADD Unique index studies_ss(studyuid,patient_id,modality);
-alter table series engine=innodb;
-ALTER  TABLE `series` ADD Unique index studies_ss(study_id,seriesuid);
-alter table images engine=innodb;
-ALTER  TABLE `images` ADD Unique index images_s_i(series_id,image_id);

application/common/versionsql/Version5

@@ -0,0 +1,19 @@
+ALTER  TABLE  `report`  ADD  type varchar(10);
+ALTER  TABLE  `report`  ADD  remote_application_id  varchar(50);
+ALTER  TABLE  `remote_application`  ADD  report_status  varchar(10);
+CREATE TABLE  if not exists `bbs` (
+      `id` varchar(50) NOT NULL,
+      `initiator` varchar(50) DEFAULT NULL COMMENT '发起人',
+      `reply` varchar(50) DEFAULT NULL COMMENT '回复人',
+      `remote_application_id` varchar(50) DEFAULT NULL COMMENT '申请单id',
+      `content` varchar(3000) DEFAULT NULL COMMENT '内容',
+      `attachment` varchar(255) DEFAULT NULL COMMENT '附件',
+      `createdAt` datetime DEFAULT NULL COMMENT '创建时间',
+      PRIMARY KEY (`id`),
+      KEY `bbs_initiator` (`initiator`),
+      KEY `bbs_reply` (`reply`),
+      KEY `bbs_applicaition` (`remote_application_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+ALTER  TABLE  `institution`  ADD  msg_phone  varchar(50);
+ALTER  TABLE  `institution`  ADD  urgent_time  varchar(50);
+ALTER  TABLE  `institution`  ADD  not_urgent_time  varchar(50);

application/inter/controller/Application.php

@@ -9,6 +9,7 @@ use think\Cache;
 use think\Log;
 use app\common\library\Verify;
 use think\File;
+use app\common\library\send_message;
 class Application extends Base
 {
     /**
@@ -81,7 +82,13 @@ class Application extends Base
             }
             $info['parent_hospital'] = $parent_name;
             //申请信息
-            $application = DB::table('remote_application')->where('exam_id',$id)->field(['remote_doctor_id','application_desc','attachment','req_doctor_id','illness_desc','phys_sign','clin_symp','anamnesis','family_ill','remark','clin_diag'])->find();
+            if(isset($param['rid']) && !empty($param['rid'])){
+                $rid = $param['rid'];
+                $application = DB::table('remote_application')->where('id',$rid)->field(['id,remote_doctor_id','application_desc','attachment','req_doctor_id','illness_desc','phys_sign','clin_symp','anamnesis','family_ill','remark','clin_diag'])->find();
+            }else{
+                $rid = '';
+                $application = DB::table('remote_application')->where('exam_id',$id)->field(['id,remote_doctor_id','application_desc','attachment','req_doctor_id','illness_desc','phys_sign','clin_symp','anamnesis','family_ill','remark','clin_diag'])->find();
+            }
             if($is_remote == 1){
                 //远程申请点击进入
                 $dinfo = DB::table('doctors')->where('id',$application['req_doctor_id'])->field('department_id')->find();
@@ -103,7 +110,7 @@ class Application extends Base
                 $application['family_ill'] = explode(',',$application['family_ill']);
                 $info['application'] = $application;
             }
-            return json_encode(['status'=>'ok','code'=>'0000','info'=>$info,'sessionid'=>$sessionid,'is_remote'=>$is_remote]);
+            return json_encode(['status'=>'ok','code'=>'0000','info'=>$info,'sessionid'=>$sessionid,'is_remote'=>$is_remote,'rid'=>$rid]);
         }catch(\Exception $e){
             return json_encode(['status'=>'fail','code'=>'2000','msg'=>$e->getMessage()]);
         }
@@ -158,6 +165,15 @@ class Application extends Base
                 return json_encode(['status'=>'fail','code'=>'1029','msg'=>'没有操作权限']);
             }
             $param = $_REQUEST['param'];
+            $application_info = array();
+            $application_info['remote_institution_id'] = isset($param['remote_institution']) ? $param['remote_institution'] : '';
+            if(isset($param['remote_doctor_id'])  && !empty($param['remote_doctor_id']) && empty($application_info['remote_doctor_id'])){
+                $remote_doctor = DB::table('doctors')->where('id',$param['remote_doctor_id'])->find();
+                $application_info['remote_institution_id'] = $remote_doctor['institution_id'];
+            }
+            if(empty($application_info['remote_institution_id'])){
+                return json_encode(['status'=>'fail','code'=>'3029','msg'=>'没有选择远程机构']);
+            }
             $exam_info =  DB::table('exams')->where('id',$param['id'])->field('exam_status,patient_id')->find();
             // 修改病人姓名
             DB::table('patient_infos')->where('id',$exam_info['patient_id'])->update(['name'=>$param['name']]);
@@ -183,7 +199,15 @@ class Application extends Base
                  return json_encode(['status'=>'fail','code'=>'1029','msg'=>$msg]);
             }
             Verify::applicationCheck($param);
-            $application_info = array();
+            $where = array();
+            // 申请医生
+            $where['req_doctor_id'] = $doctor['id'];
+            $where['remote_institution_id'] = $param['remote_institution'];
+            //不等于9  代表
+            $a_info = DB::table('remote_application')->where($where)->where('exam_id',$param['id'])->where('report_status','<>','9')->find();
+            if($a_info){
+                return json_encode(['status'=>'fail','code'=>'1120','msg'=>'该申请目标医院存在未完成报告，只有报告完成后才能再次发起申请']);
+            }
             $application_info['exam_id'] = isset($param['id']) ? $param['id'] : '';
             $application_info['illness_desc'] = isset($param['illness']) ? $param['illness'] : '';
             $application_info['phys_sign'] = isset($param['phys_sign']) ? $param['phys_sign'] : '';
@@ -198,34 +222,59 @@ class Application extends Base
             $application_info['local_institution_id'] = $doctor['institution_id'];
             $application_info['req_date_time'] = date('Y-m-d H:i:s',time());
             $application_info['clin_diag'] = isset($param['clin_diag']) ? $param['clin_diag'] : '';
-            $application_info['remote_institution_id'] = isset($param['remote_institution']) ? $param['remote_institution'] : '';
             if(isset($param['is_urgent']) && $param['is_urgent'] == 'true' ){
                 $application_info['is_urgent'] = 1;
+                $application_info['remote_doctor_id'] = '';
+                $d_time = date('H:i',strtotime('+30 min'));
             }else{
                 $application_info['is_urgent'] = 0;
+                $application_info['remote_doctor_id'] = isset($param['remote_doctor_id']) ? $param['remote_doctor_id'] : '';
+                $d_time = date('H:i',strtotime('+1 hour'));
             }
             $application_info['application_desc'] = isset($param['description']) ? $param['description'] : '';
             $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'] : '';
-            $remote_application = DB::table('remote_application')->where('exam_id',$param['id'])->select();
+//            $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['createdAt'] = date('Y-m-d H:i:s',time());
-                DB::table('remote_application')->insert($application_info);
+//            if(empty($remote_application)){
+            log::record('新增远程申请');
+            $application_info['id'] = UUIDs::uuid16();
+            $application_info['createdAt'] = date('Y-m-d H:i:s',time());
+            $application_info['report_status'] = 4;
+            DB::table('remote_application')->insert($application_info);
+            $aid = $application_info['id'];
+            $r_info = DB::table('report')->where('exam_id',$param['id'])->find();
+            if(empty($r_info)){
                 $report = array();
                 $report['id'] = UUIDs::uuid16();
                 $report['exam_id'] = $param['id'];
                 DB::table('report')->insert($report);
-            }else{
-                log::record('修改远程申请');
-                DB::table('remote_application')->where('exam_id',$param['id'])->update($application_info);
             }
+//            }else{
+//                log::record('修改远程申请');
+//                DB::table('remote_application')->where('exam_id',$param['id'])->update($application_info);
+//                $r = DB::table('remote_application')->where('exam_id',$param['id'])->field('id')->find();
+//                $aid = $r['id'];
+//            }
             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())]);
+//                if(isset($param['remote_doctor_id']) && $param['remote_doctor_id'] == 'c44663d6d3c0b535'){
+                $dinfo = DB::table('doctors')->where('id',$application_info['remote_doctor_id'])->find();
+                $d_phone = $dinfo['phone'];
+                $d_name = '';
+                if($dinfo['institution_id'] == '22100003'){ //魏庙
+                    $repsone = send_message::sendSms2Apply($d_phone,$d_time,$d_name);
+                }
+                // 申请医院院名
+                $x_institution = DB::table('institution')->where('id',$doctor['institution_id'])->field('name')->find();
+                $s_institution = DB::table('institution')->where('id',$application_info['remote_institution_id'])->field('name')->find();
+                $tel = '18910184804';
+                $type = '发起申请';
+                $content  = $aid;
+                $response = send_message::sendSms2Self($tel,$type,$content);
+//                }
             }
             return json_encode(['status'=>'ok','code'=>'0000','sessionid'=>$sessionid]);
         }catch(\Exception $e){
@@ -310,7 +359,7 @@ class Application extends Base
         $doctor = Cache::get($sessionid);
         $param = $_REQUEST['param'];
         $id = $param['id'];
-        $report = DB::table('report')->where('exam_id',$id)->field('id')->find();
+        $report = DB::table('report')->where('remote_application_id',$id)->field('id')->find();
         $info = array();
         $info['id'] = UUIDs::uuid16();
         $info['report_id'] = $report['id'];
@@ -319,15 +368,35 @@ class Application extends Base
         $info['type'] = 4;
         $info['doctor_id'] = $doctor['id'];
         DB::table('report_record')->insert($info);
-        $message = array();
-        $message['id'] = UUIDs::uuid16();
-        $message['title'] = '申请单驳回';
-        $message['content'] = $param['description'];
-        $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'];
+//        $message = array();
+//        $message['id'] = UUIDs::uuid16();
+//        $message['title'] = '申请单驳回';
+//        $message['content'] = $param['description'];
+//        $message['createdAt'] = date('Y-m-d H:i:s',time());
+        $application = DB::table('remote_application')->where('exam_id',$id)->find();
+//        $message['doctor_id'] = $application['req_doctor_id'];
+//        $message['institution_id'] = $application['local_institution_id'];
         DB::table('exams')->where('id',$id)->update(['exam_status'=>5]);
+        // 驳回发短信
+//        if($application['req_doctor_id'] == 'c44663d6d3c0b535'){
+        $dinfo = DB::table('doctors')->where('id',$application['req_doctor_id'])->find();
+        $d_phone = $dinfo['phone'];
+        if($dinfo['institution_id'] == '22100002'){ //魏庙下级
+            $des = mb_substr($param['description'],0,20,'utf-8');
+            $repsone = send_message::sendSms2RejectApply($d_phone,$des);
+        }
+        // 上级医院
+        $s_institution = DB::table('institution')->where('id',$doctor['institution_id'])->field('name')->find();
+        //下级医院
+        $x_institution = DB::table('institution')->where('id',$application['local_institution_id'])->field('name')->find();
+        $x_name = DB::table('doctors')->where('id',$application['req_doctor_id'])->field('realname')->find();
+        $tel = '18910184804';
+        $type = '驳回申请';
+        $content  = $application['id'];
+        send_message::sendSms2Self($tel,$type,$content);
+        $tel = '18366391911';
+        send_message::sendSms2Self($tel,$type,$content);
+//        }
         return json_encode(['status'=>'ok','code'=>'0000','sessionid'=>$sessionid]);
     }
 
@@ -358,9 +427,70 @@ class Application extends Base
     //接收
     public function recive(){
         $sessionid = $_REQUEST['sessionid'];
-//        $doctor = Cache::get($sessionid);
+        $doctor = Cache::get($sessionid);
         $id = $_REQUEST['id'];
-        DB::table('exams')->where('id',$id)->update(['exam_status'=>6]);
+        DB::table('remote_application')->where('id',$id)->update(['report_status'=>6]);
+        $application = DB::table('remote_application')->where('exam_id',$id)->find();
+        if($application['req_doctor_id'] == 'c44663d6d3c0b535'){
+            // 上级医院
+            $s_institution = DB::table('institution')->where('id',$doctor['institution_id'])->field('name')->find();
+            //下级医院
+            $x_institution = DB::table('institution')->where('id',$application['local_institution_id'])->field('name')->find();
+            $x_name = DB::table('doctors')->where('id',$application['req_doctor_id'])->field('realname')->find();
+            $tel = '18910184804';
+            $type = '接收申请';
+            $content  = $application['id'];
+            send_message::sendSms2Self($tel,$type,$content);
+        }
         return json_encode(['status'=>'ok','code'=>'0000','sessionid'=>$sessionid]);
     }
+
+    public function bbs_save(){
+        $sessionid = $_REQUEST['sessionid'];
+        $doctor = Cache::get($sessionid);
+        $param = $_REQUEST['param'];
+        if(empty($param['content'])){
+            return json_encode(['status'=>'fail','msg'=>'内容为空，请填写要发送的内容','sessionid'=>$sessionid]);
+        }
+        $info = array();
+        $info['id'] = UUIDs::uuid16();
+        $info['initiator'] = $doctor['id'];
+//        $info['reply'] = $param['reply']; // 回复人
+        $info['remote_application_id'] = $param['appid']; //申请单id
+        $info['content'] = $param['content'];
+        $info['attachment'] = $param['attachment'];
+        $info['createdAt'] = date('Y-m-d H:i:s',time());
+        DB::table('bbs')->insert($info);
+        return json_encode(['status'=>'ok','code'=>'0000','sessionid'=>$sessionid]);
+    }
+    public  function  getbbs(){
+        $sessionid = $_REQUEST['sessionid'];
+        $doctor = Cache::get($sessionid);
+        $remote_id = $_REQUEST['application_id'];
+        $info = DB::table('bbs')->where('remote_application_id',$remote_id)->order('createdAt desc')->select();
+        foreach ($info as $k => $v) {
+            $initiator = DB::table('doctors')->where('id',$v['initiator'])->field('realname')->find();
+            $info[$k]['faqiren'] = $initiator['realname'];
+//            $reply = DB::table('doctors')->where('id',$v['reply'])->field('realname')->find();
+//            $info[$k]['huifuren'] = $reply['realname'];
+        }
+        return json_encode(['status'=>'ok','code'=>'0000','sessionid'=>$sessionid,'info'=>$info]);
+    }
+    public function bbs_upload(){
+        // 获取表单上传文件 例如上传了001.jpg
+        $file = request()->file('file');
+        log::record('----------上传的文件-----------');
+        log::record($file);
+        // 移动到框架应用根目录/public/uploads/ 目录下
+        if($file){
+            $info = $file->move(ROOT_PATH . 'public' . DS . 'uploads');
+            log::record($info);
+            if($info){
+                return json_encode(['status'=>'ok','code'=>'0000','info'=>'/'.$_SERVER["SERVER_NAME"]. '/' . 'uploads'. '/' .$info->getSaveName()]);
+            }else{
+                // 上传失败获取错误信息
+                echo $file->getError();
+            }
+        }
+    }
 }

application/inter/controller/Dcquery.php

@@ -137,42 +137,52 @@ class Dcquery extends Controller
             $series_list = DB::table('series')->where('study_id',$study_info['id'])->where('modality','not in','PR,SR')->field('id,series_num,seriesuid,description')->order('series_num asc')->select();
             $series = array();
             $error = 1;
+            $ids = array();
             foreach($series_list as $k=>$v){
-                // image_number排序
-                $image = DB::table('images')->where('series_id',$v['id'])->field('remote_url,local_url,status,columns,image_number as instanceNumber,rows,image_id as sopInstanceUid,metadata,url')->order('image_number asc')->select();
-                if(empty($image)){
-                    continue;
-                }
-                $error = 2;
-                foreach($image as $key=>$value){
-                    /*if(empty($url)){
-                        if(substr($value['metadata'], 0, strlen('group')) === 'group'){
-                            $image[$key]['url'] = "dicomweb://dcm.pacsonline.cn/".$value['metadata'];
-                        }else{
-                            $image[$key]['url'] = "dicomweb://static.dcm.pacsonline.cn/".$value['metadata'];
-                        }
-                    }else{
-                        $image[$key]['url'] = $url.$value['metadata'];
-                    }*/
-                    $imageUrl = $this->generateUrl($value['url'],$url,$value['remote_url'],$value['local_url'],$value['status'],$value['metadata']);
-                    if(!$imageUrl){
-                        $file = ROOT_PATH . 'public' . DS . 'get_studiesinfo/'.date('Ymd').'-fail.log';
-                        $log = 'url错误，传值为--'.$url;
-                        file_put_contents($file, $log,FILE_APPEND);
-                        continue;
-                    }
-                    $image[$key]['url'] = $imageUrl;
-                    $image[$key]['imageNumber'] = $value['instanceNumber'];
-
-                }
-                $series[$k]['instances'] = $image;
-                $series[$k]['seriesInstanceUid'] = $v['seriesuid'];
-                $series[$k]['seriesDescription'] = $v['description'];
-                $series[$k]['seriesNumber'] = $v['series_num'];
+                $ids[] = $v['id'];
             }
-            if($error == 1){
-                throw new \think\Exception('series列表为空');
+            $images_list = DB::table('images')->where('series_id','in',$ids)->field('frame,series_id,cineRate,remote_url,local_url,status,columns,image_number as instanceNumber,rows,image_id as sopInstanceUid,metadata,url')->order('image_number asc')->select();
+            if(empty($images_list)){
+                throw new \think\Exception('series列表中影像为空');
             }
+            $series = $this->testHandleSeires($series_list , $images_list , $url);
+
+//            foreach($series_list as $k=>$v){
+//                // image_number排序
+//                $image = DB::table('images')->where('series_id',$v['id'])->field('cineRate,remote_url,local_url,status,columns,image_number as instanceNumber,rows,image_id as sopInstanceUid,metadata,url')->order('image_number asc')->select();
+//                if(empty($image)){
+//                    continue;
+//                }
+//                $error = 2;
+//                /*foreach($image as $key=>$value){
+//                    /*if(empty($url)){
+//                        if(substr($value['metadata'], 0, strlen('group')) === 'group'){
+//                            $image[$key]['url'] = "dicomweb://dcm.pacsonline.cn/".$value['metadata'];
+//                        }else{
+//                            $image[$key]['url'] = "dicomweb://static.dcm.pacsonline.cn/".$value['metadata'];
+//                        }
+//                    }else{
+//                        $image[$key]['url'] = $url.$value['metadata'];
+//                    }*/
+//                    $imageUrl = $this->generateUrl($value['url'],$url,$value['remote_url'],$value['local_url'],$value['status'],$value['metadata']);
+//                    if(!$imageUrl){
+//                        $file = ROOT_PATH . 'public' . DS . 'get_studiesinfo/'.date('Ymd').'-fail.log';
+//                        $log = 'url错误，传值为--'.$url;
+//                        file_put_contents($file, $log,FILE_APPEND);
+//                        continue;
+//                    }
+//                    $image[$key]['url'] = $imageUrl;
+//                    $image[$key]['imageNumber'] = $value['instanceNumber'];
+//
+//                }*/
+//                $series[$k]['instances'] = $image;
+//                $series[$k]['seriesInstanceUid'] = $v['seriesuid'];
+//                $series[$k]['seriesDescription'] = $v['description'];
+//                $series[$k]['seriesNumber'] = $v['series_num'];
+//            }
+//            if($error == 1){
+//                throw new \think\Exception('series列表为空');
+//            }
             $info['seriesList'] = $series;
             $return  = array();
             $return['transactionId'] = $study_info['studyuid'];
@@ -346,4 +356,48 @@ class Dcquery extends Controller
             return $dicurl;
         }
     }
+    public function testHandleSeires($series_list , $images_list , $url) {
+        $series = array();
+        $seriesIndexMap = array();
+        foreach($series_list as $k => $v) {
+            $series[$k] = $this->generateSerie($v);
+            $seriesIndexMap[$v['id']] = $k;
+        }
+        foreach($images_list as $image) {
+            $series[$seriesIndexMap[$image['series_id']]]['instances'][] = $this->generateImage1($image, $this->generateUrl($image['url'], $url, $image['remote_url'], $image['local_url'], $image['status'], $image['metadata']));
+        }
+        return $series;
+    }
+
+    public function generateSerie($serie) {
+        return [
+            'instances' => array(),
+            'seriesInstanceUid' => $serie['seriesuid'],
+            'seriesDescription' => $serie['description'],
+            'seriesNumber' => $serie['series_num']
+        ];
+    }
+
+    public function generateImage1($image,$url,$frameIndex = -1) {
+        $image_url = $url;
+        $imageNumber = $image['instanceNumber'];
+        if($frameIndex !== -1) {
+            $image_url = $url.'?frame='.$frameIndex;
+            $imageNumber = $frameIndex + 1;
+        }
+        return [
+            'remote_url' => $image['remote_url'],
+            'local_url' => $image['local_url'],
+            'status' => $image['status'],
+            'columns' => $image['columns'],
+            'rows' => $image['rows'],
+            'instanceNumber' => $imageNumber,
+            'imageNumber' => $imageNumber,
+            'sopInstanceUid' => $image['sopInstanceUid'],
+            'metadata' => $image['metadata'],
+            'url' => $image_url,
+            'frame' => $image['frame'],
+            'frameIndex' => $frameIndex,
+        ];
+    }
 }

application/inter/controller/Reciveremote.php

@@ -58,11 +58,13 @@ class Reciveremote extends Base
             $app_info = DB::table('remote_application')->where('remote_institution_id', $doctor['institution_id'])->select();
             foreach ($app_info as $k => $v) {
                 $exam_id = $v['exam_id'];
-                $report = DB::table('report')->where('exam_id', $exam_id)->find();
+                $report = DB::table('report')->where('exam_id', $exam_id)->where('remote_application_id',$v['id'])->find();
                 if (!$report) {
                     $data = array();
                     $data['id'] = UUIDs::uuid16();
                     $data['exam_id'] = $exam_id;
+                    $data['remote_application_id'] = $v['id'];
+                    $data['type'] = 2;
                     $data['createdAt'] = date('Y-m-d H:i:s',time());
                     DB::table('report')->insert($data);
                 }
@@ -89,7 +91,11 @@ class Reciveremote extends Base
                             if(empty($v)){
                                 break;
                             }
-                            $where .= " and ra.req_date_time between '$v[0]' and '$v[1]'";
+                            if($v[0] == $v[1]){
+                                $where .=  " and ra.req_date_time == '$v[0]'";
+                            }else{
+                                $where .= " and ra.req_date_time between '$v[0]' and '$v[1]'";
+                            }
                             break;
                         case 'is_urgent':
                             if($v == 0){
@@ -106,9 +112,9 @@ class Reciveremote extends Base
                                 break;
                             }
                             break;
-                        case 'exam_status':
+                        case 'report_status':
                             if($v != 10){
-                                $where .= " and e.exam_status=".$v;
+                                $where .= " and ra.report_status=".$v;
                             }
                             break;
                     }
@@ -130,7 +136,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.id,e.exam_status,e.exam_class,e.exam_sub_class,e.body_part,e.device,e.exam_datetime,p.name,p.sex,p.temp_patient_id,p.age,ra.*,r.report_doctor_id,r.report_datetime,r.report_result,e.id from exams as e,remote_application as ra,patient_infos as p,report as r where ra.exam_id=e.id and e.patient_id=p.id and r.exam_id=e.id and ra.remote_institution_id='" . $doctor['institution_id']."'".$where." order by field(e.exam_status,6,7,8,4,9),ra.is_urgent desc,e.createdAt desc";
+                $sql = "SELECT e.id,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.id as ra_id,ra.*,r.report_doctor_id,r.id as report_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(ra.report_status,6,7,8,4,9,5),ra.is_urgent desc,ra.createdAt desc";
 //            }
             log::record($sql);
             $list = DB::query($sql);

application/inter/controller/Writereport.php

@@ -9,6 +9,7 @@ use app\common\library\UUIDs;
 use think\Cache;
 use think\Log;
 use app\common\library\Verify;
+use app\common\library\send_message;
 
 class Writereport extends Base
 {
@@ -72,7 +73,13 @@ class Writereport extends Base
             $info['hospital_name'] = $institution['name'];
             $info['hospital_title'] = $institution['report_subtitle'];
             $info['images'] = isset($param['images']) ? $param['images'] : '';
-            $report = DB::table('report')->where('exam_id',$id)->field('report_result,report_datetime,report_doctor_id,review_datetime,review_doctor_id,impression,description')->find();
+            if(isset($param['rid']) && !empty($param['rid'])){
+                $remote_id = $param['rid'];
+                $report = DB::table('report')->where('exam_id',$id)->where('remote_application_id',$remote_id)->field('id,report_result,report_datetime,report_doctor_id,review_datetime,review_doctor_id,impression,description')->find();
+            }else{
+                // 不存在 本地点击进入  获取本地报告
+                $report = DB::table('report')->where('exam_id',$id)->where('type',1)->field('id,report_result,report_datetime,report_doctor_id,review_datetime,review_doctor_id,impression,description')->find();
+            }
             $report_doctor = DB::table('doctors')->where('id',$report['report_doctor_id'])->field('realname')->find();
             $info['report_doctor'] = $report_doctor['realname'];
             $info['report_datetime'] = $report['report_datetime'];
@@ -82,7 +89,8 @@ class Writereport extends Base
             $info['description'] = $report['description'];
             $info['impression'] = $report['impression'];
             $info['report_result'] = $report['report_result'];
-            $cache_key = $doctor['id'].'_'.$id;
+            $info['report_id'] = $report['id'];
+            $cache_key = $doctor['id'].'_'.$report['id'];
             if(Cache::get($cache_key)){
                 $cache = Cache::get($cache_key);
                 $info['description'] = isset($cache['description']) ? $cache['description'] : '';
@@ -190,18 +198,27 @@ class Writereport extends Base
                 return json_encode(['status'=>'fail','code'=>'1029','msg'=>'没有操作权限']);
             }
             $param = $_REQUEST['param'];
-            $status = DB::table('exams')->where('id',$param['id'])->field('exam_status')->find();
-            if($status['exam_status'] > 6){
-                return json_encode(['status'=>'fail','code'=>'1034','msg'=>'报告已被保存，无法再次被修改']);
+            if(isset($_REQUEST['is_remote']) && $_REQUEST['is_remote'] == 1){
+                //远程
+                $status = DB::table('remote_application')->where('id',$param['rid'])->field('report_status')->find();
+                if($status['report_status'] > 6){
+                    return json_encode(['status'=>'fail','code'=>'1034','msg'=>'报告已被保存，无法再次被修改']);
+                }
+            }else{
+                //本地
+                $status = DB::table('exams')->where('id',$param['id'])->where('type',1)->field('exam_status')->find();
+                if($status['exam_status'] > 6){
+                    return json_encode(['status'=>'fail','code'=>'1034','msg'=>'报告已被保存，无法再次被修改']);
+                }
             }
 //            Verify::wreportCheck($param);
             $doctor = Cache::get($sessionid);
-            $remote_app = DB::table('remote_application')->where('exam_id',$param['id'])->field('remote_doctor_id')->find();
-            if(!empty($remote_app['remote_doctor_id'])){
-                if($remote_app['remote_doctor_id'] != $doctor['id']){
+//            $remote_app = DB::table('remote_application')->where('exam_id',$param['id'])->field('remote_doctor_id')->find();
+//            if(!empty($remote_app['remote_doctor_id'])){
+//                if($remote_app['remote_doctor_id'] != $doctor['id']){
 //                    return json_encode(['status'=>'fail','code'=>'1029','msg'=>'已被指定报告医生，您没有操作权限']);
-                }
-            }
+//                }
+//            }
             $this->uuids = new UUIDs();
             //初步报告生成
             $film_type = isset($param['film_type']) ? $param['film_type'] : '';
@@ -222,20 +239,33 @@ class Writereport extends Base
             }else{
                 $info['report_result'] = 1;
             }
-            DB::table('exams')->where('id',$param['id'])->update(['exam_status'=>'7','film_type'=>$film_type,'exam_report'=>$info['report_result']]);
+            DB::table('exams')->where('id',$param['id'])->update(['film_type'=>$film_type,'exam_report'=>$info['report_result']]);
+            // 报告的id
+            $report_id = $param['report_id'];
+            if(isset($_REQUEST['is_remote']) && !empty($_REQUEST['is_remote'])){
+                // 远程保存
+                DB::table('remote_application')->where('id',$param['rid'])->update(['report_status'=>'7']);
+                $info['type'] = 2;
+            }else{
+                //本地保存
+                DB::table('exams')->where('id',$param['id'])->update(['exam_status'=>'7']);
+                $info['type'] = 1;
+            }
             $info['report_datetime']  = date('Y-m-d H:i:s',time());
             $info['report_doctor_id'] = $doctor['id'];
-            $report_info = DB::table('report')->where('exam_id',$param['id'])->find();
-            if($report_info){
-                $report = DB::table('report')->where('exam_id',$param['id'])->update($info);
+            $info['remote_application_id'] = $param['rid'];
+            if($report_id){
+                $report_info = DB::table('report')->where('id',$report_id)->find();
+                $report = DB::table('report')->where('id',$report_id)->update($info);
                 $id = $report_info['id'];
+                $cache_key = $doctor['id'].'_'.$report_id;
             }else{
                 $id = $this->uuids->uuid16();
                 $info['id'] = $id;
                 $info['createdAt'] = date('Y-m-d H:i:s',time());
                 $report = DB::table('report')->insert($info);
+                $cache_key = $doctor['id'].'_'.$id;
             }
-            $cache_key = $doctor['id'].'_'.$param['id'];
             if(Cache::get($cache_key)){
                 Cache::rm($cache_key);
             }
@@ -253,6 +283,18 @@ class Writereport extends Base
             $report_log = DB::table('report_record')->insert($log);
             log::record($report_log);
             log::record('----日志写入成功----');
+            $application = DB::table('remote_application')->where('exam_id',$id)->find();
+            if($application['req_doctor_id'] == 'c44663d6d3c0b535'){
+                // 上级医院
+                $s_institution = DB::table('institution')->where('id',$doctor['institution_id'])->field('name')->find();
+                //下级医院
+                $x_institution = DB::table('institution')->where('id',$application['local_institution_id'])->field('name')->find();
+                $x_name = DB::table('doctors')->where('id',$application['req_doctor_id'])->field('realname')->find();
+                $tel = '18910184804';
+                $type = '保存报告';
+                $content  = $application['id'];
+                send_message::sendSms2Self($tel,$type,$content);
+            }
             return json_encode(['status'=>'ok','code'=>'0000','msg'=>'保存成功','sessionid'=>$sessionid]);
         }catch(\Exception $e){
             return json_encode(['status'=>'fail','code'=>'2000','msg'=>$e->getMessage()]);
@@ -398,11 +440,24 @@ class Writereport extends Base
             $doctor = Cache::get($sessionid);
             $param = $_REQUEST['param'];
             $id = $param['id'];
-            $status = DB::table('exams')->where('id',$id)->field('exam_status')->find();
-            if($status['exam_status'] < 8 ){
-                return json_encode(['status'=>'fail','code'=>'1033','msg'=>'只能确认通过审核的报告']);
-            }elseif($status['exam_status'] == 9){
-                return json_encode(['status'=>'fail','code'=>'1034','msg'=>'已经确认过该报告，不可再次确认']);
+            $report_id = $param['report_id'];
+            $report_info = DB::table('report')->where('id',$report_id)->find();
+            if($report_info['type'] == 1){
+                //本地报告
+                $status = DB::table('exams')->where('id',$id)->field('exam_status')->find();
+                if($status['exam_status'] < 8 ){
+                    return json_encode(['status'=>'fail','code'=>'1033','msg'=>'只能确认通过审核的报告']);
+                }elseif($status['exam_status'] == 9){
+                    return json_encode(['status'=>'fail','code'=>'1034','msg'=>'已经确认过该报告，不可再次确认']);
+                }
+            }else{
+                //远程
+                $status = DB::table('remote_application')->where('id',$report_info['remote_application_id'])->field('report_status')->find();
+                if($status['report_status'] < 8 ){
+                    return json_encode(['status'=>'fail','code'=>'1033','msg'=>'只能确认通过审核的报告']);
+                }elseif($status['report_status'] == 9){
+                    return json_encode(['status'=>'fail','code'=>'1034','msg'=>'已经确认过该报告，不可再次确认']);
+                }
             }
             $rinfo = array();
             $rinfo['impression']       = isset($param['impression']) ? $param['impression'] : '';
@@ -414,10 +469,16 @@ class Writereport extends Base
             }
             $rinfo['confirm_datetime']  = date('Y-m-d H:i:s',time());
             $rinfo['confirm_doctor_id'] = $doctor['id'];
-            // $exam_status = $this->get_exam_status($doctor['id'],9);
-            DB::table('exams')->where('id',$id)->update(['exam_status'=>'9','film_type'=>$_REQUEST['param']['film_type']]);
+            if($report_info['type'] == 1){
+                //本地报告确认
+                DB::table('exams')->where('id',$id)->update(['exam_status'=>'9']);
+            }else{
+                //远程确认
+                DB::table('remote_application')->where('id',$report_info['remote_application_id'])->update(['report_status'=>'9']);
+            }
+            DB::table('exams')->where('id',$id)->update(['film_type'=>$_REQUEST['param']['film_type']]);
             DB::table('report')->where('exam_id',$id)->update($rinfo);
-            $cache_key = $doctor['id'].'_'.$id;
+            $cache_key = $doctor['id'].'_'.$report_info['id'];
             if(Cache::get($cache_key)){
                 Cache::rm($cache_key);
             }
@@ -468,22 +529,31 @@ class Writereport extends Base
     public function examine(){
         try{
             $id = $_REQUEST['id'];
-            $status = DB::table('exams')->where('id',$id)->field('exam_status')->find();
-            if($status['exam_status'] < 7){
-                return json_encode(['status'=>'fail','code'=>'1032','msg'=>'只能审核已提交的报告']);
-            }elseif($status['exam_status']>7){
-                return json_encode(['status'=>'fail','code'=>'1035','msg'=>'报告已通过审核步骤，请勿重复操作']);
-            }
-            $report = DB::table('report')->where('exam_id',$id)->field('id')->find();
             $param = $_REQUEST['param'];
+            $report_id = $param['report_id'];
+            $report = DB::table('report')->where('id',$report_id)->find();
             $sessionid = $_REQUEST['sessionid'];
             $doctor = Cache::get($sessionid);
             if(isset($_REQUEST['is_remote']) && $_REQUEST['is_remote'] == 1){
                 //  是远程审核报告  8
                 $return  = Verify::check_role($sessionid,8);
+                $status = DB::table('remote_application')->where('id',$report['remote_application_id'])->field('report_status')->find();
+                if($status['report_status'] < 7){
+                    return json_encode(['status'=>'fail','code'=>'1032','msg'=>'只能审核已提交的报告']);
+                }elseif($status['report_status']>7){
+                    return json_encode(['status'=>'fail','code'=>'1035','msg'=>'报告已通过审核步骤，请勿重复操作']);
+                }
+                DB::table('remote_application')->where('id',$report['remote_application_id'])->update(['report_status'=>'8']);
             }else{
                 //  本地审核权限 3
                 $return  = Verify::check_role($sessionid,3);
+                $status = DB::table('exams')->where('id',$id)->field('exam_status')->find();
+                if($status['exam_status'] < 7){
+                    return json_encode(['status'=>'fail','code'=>'1032','msg'=>'只能审核已提交的报告']);
+                }elseif($status['exam_status']>7){
+                    return json_encode(['status'=>'fail','code'=>'1035','msg'=>'报告已通过审核步骤，请勿重复操作']);
+                }
+                DB::table('exams')->where('id',$id)->update(['exam_status'=>'8']);
             }
             $report_info = array();
             $report_info['impression']       = isset($param['impression']) ? $param['impression'] : '';
@@ -496,7 +566,7 @@ 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;
+            $cache_key = $doctor['id'].'_'.$report['id'];
             if(Cache::get($cache_key)){
                 Cache::rm($cache_key);
             }
@@ -509,8 +579,28 @@ class Writereport extends Base
             $info['description']      = isset($param['description']) ? $param['description'] : '';
             $info['report_id'] = $report['id'];
             DB::table('report_record')->insert($info);
-            // $exam_status = $this->get_exam_status($doctor['id'],8);
             DB::table('exams')->where('id',$id)->update(['exam_status'=>'8','film_type'=>$param['film_type']]);
+            //  已审核 发送短信
+            $application = DB::table('remote_application')->where('exam_id',$id)->find();
+//            if($application['req_doctor_id'] == 'c44663d6d3c0b535'){
+            $dinfo = DB::table('doctors')->where('id',$application['req_doctor_id'])->find();
+            $d_phone = $dinfo['phone'];
+            log::record('发短信的手机号为'.$d_phone);
+            $d_name = '';
+            if($dinfo['institution_id'] == '22100002'){ //魏庙下级
+                $repsone = send_message::sendSms2CompleteReport($d_phone,$d_name);
+            }
+            // 上级医院
+            $s_institution = DB::table('institution')->where('id',$doctor['institution_id'])->field('name')->find();
+            //下级医院
+            $x_institution = DB::table('institution')->where('id',$application['local_institution_id'])->field('name')->find();
+            $x_name = DB::table('doctors')->where('id',$application['req_doctor_id'])->field('realname')->find();
+            $tel = '18910184804';
+            $type = '完成并审核报告';
+            $content  =$application['id'];
+            send_message::sendSms2Self($tel,$type,$content);
+//            }
+            DB::table('exams')->where('id',$id)->update(['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()]);
@@ -622,13 +712,19 @@ class Writereport extends Base
         try{
             $sessionid = $_REQUEST['sessionid'];
             $doctor = Cache::get($sessionid);
-            $exam_id = $_REQUEST['id'];
-            $report = DB::table('report')->where('exam_id',$exam_id)->field('id')->find();
+            $id = $_REQUEST['id'];
+            $exam_id = $_REQUEST['exam_id'];
+            if(isset($_REQUEST['is_remote']) && !empty($_REQUEST['is_remote'])){
+                // 远程
+                $report = DB::table('report')->where('id',$id)->find();
+            }else{
+                // 本地
+                $report = DB::table('report')->where('exam_id',$exam_id)->where('type',1)->find();
+            }
             if(empty($report)){
                 return json_encode(['status'=>'ok','code'=>'0000','info'=>'','msg'=>'无数据']);
             }
-            $log_id = $report['id'];
-            $log = DB::table('report_record')->where('doctor_id',$doctor['id'])->where('report_id',$log_id)->order('createdAt asc,type asc')->select();
+            $log = DB::table('report_record')->where('doctor_id',$doctor['id'])->where('report_id',$report['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'];
@@ -671,6 +767,8 @@ class Writereport extends Base
             $sessionid = $_REQUEST['sessionid'];
             $doctor = Cache::get($sessionid);
             $id = $_REQUEST['id'];
+            $report_id = $_REQUEST['report_id'];
+            $report = DB::table('report')->where('id',$report_id)->field('remote_application_id,report_datetime,impression,description,report_doctor_id,review_doctor_id')->find();
             $info = array();
             // 检查日期 住院号 床号
             $exam_info = DB::table('exams')->where('id',$id)->field('id,ext,accession_num,exam_datetime,exam_class,hopitalized_no,bed_no,exam_project,patient_id')->find();
@@ -693,7 +791,7 @@ class Writereport extends Base
             $info['exam_class'] = $exam_class['constant_value'];
             // 病历号 姓名 年龄 性别
             $patient_info = DB::table('patient_infos')->where('id',$exam_info['patient_id'])->field('temp_patient_id,name,sex,age')->find();
-            $remote = DB::table('remote_application')->where('exam_id',$id)->field('req_doctor_id')->find();
+            $remote = DB::table('remote_application')->where('id',$report['remote_application_id'])->field('req_doctor_id')->find();
             $info['pnumber'] = $patient_info['temp_patient_id'];
             $info['name'] = $patient_info['name'];
             $info['sex'] = $patient_info['sex'];
@@ -705,14 +803,13 @@ class Writereport extends Base
             $department  = DB::table('department')->where('id',$application_name['department_id'])->field('department_name')->find();
             $info['department_name'] = $department['department_name'];
             // 报告时间 影像所见 意见建议
-            $report = DB::table('report')->where('exam_id',$id)->field('report_datetime,impression,description,report_doctor_id,review_doctor_id')->find();
             if(!empty($report['report_datetime'])){
                 $datetime1 = explode(' ',$report['report_datetime']);
                 $info['report_datetime'] = $datetime1[0];
             }else{
                 $info['report_datetime'] = '';
             }
-//            $info['report_datetime'] = $report['report_datetime'];
+            $info['report_datetime_xa'] = $report['report_datetime'];
             $info['impression'] = $report['impression'];
             $info['description'] = $report['description'];
             // 报告医生
@@ -765,8 +862,8 @@ class Writereport extends Base
         $sessionid = $_REQUEST['sessionid'];
         $doctor = Cache::get($sessionid);
         $param = $_REQUEST['param'];
-        $exam_id = $param['id'];
-        $key = $doctor['id'].'_'.$exam_id;
+        $report_id = $param['report_id'];
+        $key = $doctor['id'].'_'.$report_id;
         Cache::set($key,$param);
         return json_encode(['status'=>'ok','msg'=>'保存成功','code'=>'0000']);
     }
@@ -776,13 +873,14 @@ class Writereport extends Base
         $sessionid = $_REQUEST['sessionid'];
         $doctor = Cache::get($sessionid);
         $id = $_REQUEST['id'];
-        $key = $doctor['id'].'_'.$id;
+        $report_id = $_REQUEST['report_id'];
+        $key = $doctor['id'].'_'.$report_id;
         if(Cache::get($key)){
             $patient = Cache::get($key);
         }else{
             $exam = DB::table('exams')->where('id',$id)->field('accession_num,exam_class,patient_id,ext,hopitalized_no,bed_no')->find();
             $patient = DB::table('patient_infos')->where('id',$exam['patient_id'])->field(['id','temp_patient_id','name','phone','sex','age'])->find();
-            $report_info = DB::table('report')->where('exam_id',$id)->field('description')->find();
+            $report_info = DB::table('report')->where('id',$report_id)->field('description')->find();
             $patient['ext'] = $exam['ext'];
             $patient['exam_id'] = $id;
             $patient['bed_no'] = $exam['bed_no'];
@@ -790,6 +888,7 @@ class Writereport extends Base
             $patient['exam_class'] = $exam['exam_class'];
             $patient['hopitalized_no'] = $exam['hopitalized_no'];
             $patient['description'] = $report_info['description'];
+            $patient['report_id'] = $report_id;
         }
         return json_encode(['status'=>'ok','info'=>$patient,'code'=>'0000']);
     }
@@ -807,19 +906,77 @@ class Writereport extends Base
         $exam_info['ext']  = isset($param['ext']) ? $param['ext'] : '';
         $exam_info['accession_num']       = isset($param['accession_num']) ? $param['accession_num'] : '';
         $report['description'] = isset($param['description']) ? $param['description'] : '';
+        $report['report_datetime'] = date('Y-m-d H:i:s',time());
+        $report['report_doctor_id'] = $doctor['id'];
         DB::table('patient_infos')->where('id',$param['pid'])->update($patient_info);
         DB::table('exams')->where('id',$param['id'])->update($exam_info);
         $rinfo = DB::table('report')->where('exam_id',$param['id'])->find();
         if($rinfo){
             DB::table('report')->where('exam_id',$param['id'])->update($report);
+            $rinfo = DB::table('report')->where('exam_id',$param['id'])->find();
+            $rid = $rinfo['id'];
         }else{
             $report['id'] = UUIDs::uuid16();
             $report['exam_id'] = $param['id'];
             $report['createdAt'] = date('Y-m-d H:i:s',time());
-            $report['report_datetime'] = date('Y-m-d H:i:s',time());
-            $report['report_doctor_id'] = $doctor['id'];
             DB::table('report')->insert($report);
+            $rid = $report['id'];
+        }
+        $log = array();
+        $log['id'] = UUIDs::uuid16();
+        $log['impression'] = isset($param['ext']) ? $param['ext'] : '';
+        $log['description'] = isset($param['description']) ? $param['description'] : '';
+        $log['report_id'] = $rid;
+        $log['createdAt'] = date('Y-m-d H:i:s',time());
+        $log['doctor_id'] = $doctor['id'];
+        $log['type'] = 1;  //写报告
+        log::record($log);
+        $report_log = DB::table('report_record')->insert($log);
+        $application = DB::table('exam_id',$param['id'])->find();
+        if($application['req_doctor_id'] == 'c44663d6d3c0b535'){
+            // 上级医院
+            $s_institution = DB::table('institution')->where('id',$doctor['institution_id'])->field('name')->find();
+            //下级医院
+            $x_institution = DB::table('institution')->where('id',$application['local_institution_id'])->field('name')->find();
+            $x_name = DB::table('doctors')->where('id',$application['req_doctor_id'])->field('realname')->find();
+            $tel = '18910184804';
+            $type = '保存报告';
+            $content  = $application['id'];
+            send_message::sendSms2Self($tel,$type,$content);
         }
         return json_encode(['status'=>'ok','msg'=>'成功','code'=>'0000']);
     }
+
+    // 获取远程报告列表
+    public function get_report_list(){
+        $sessionid = $_REQUEST['sessionid'];
+        // $doctor = Cache::get($sessionid);
+        $param = $_REQUEST['param'];
+        $rinfo = DB::table('report')->where('exam_id',$param['id'])->where('type','<>',1)->select();
+        $pinfo = DB::table('patient_infos')->where('temp_patient_id',$param['pid'])->field('name,temp_patient_id,sex,age,phone')->find();
+        $einfo = DB::table('exams')->where('id',$param['id'])->field('exam_class,exam_sub_class,exam_datetime')->find();
+        $info = array();
+        $arr = array();
+        foreach ($rinfo as $k => $v) {
+            $remote_info = DB::table('remote_application')->where('id',$v['remote_application_id'])->find();
+            if($remote_info['report_status'] == 8 || $remote_info['report_status'] == 9){
+                $arr = $v;
+                $remote_did = DB::table('doctors')->where('id',$v['report_doctor_id'])->field('realname')->find();
+                $arr['report_doctor'] = $remote_did['realname'];
+                $review_did = DB::table('doctors')->where('id',$v['review_doctor_id'])->field('realname')->find();
+                $arr['review_doctor'] = $review_did['realname'];
+                $arr['name'] = $pinfo['name'];
+                $arr['pid'] = $pinfo['temp_patient_id'];
+                $arr['sex'] = $pinfo['sex'];
+                $arr['age'] = $pinfo['age'];
+                $arr['phone'] = $pinfo['phone'];
+                $arr['exam_class'] = $einfo['exam_class'];
+                $arr['exam_sub_class'] = $einfo['exam_sub_class'];
+                $arr['exam_datetime'] = $einfo['exam_datetime'];
+                $arr['report_status'] = $remote_info['report_status'];
+                $info[] = $arr;
+            }
+        }
+        return json_encode(['status'=>'ok','info'=>$info,'code'=>'0000']);
+    }
 }

application/manage/controller/Doctors.php

@@ -112,7 +112,9 @@ class Doctors extends Base {
         }
         $doctorcla = $params["doctorcla"];
         unset($params["doctorcla"]);
-        $params['doctor_role'] = implode(',', $params['doctor_role']);
+        if(isset($params['doctor_role']) && !empty($params['doctor_role'])){
+            $params['doctor_role'] = implode(',', $params['doctor_role']);
+        }
         $password = $params['password'];
         if(isset($params['examcla'])){
             $params['exam_class'] = implode(',',$params['examcla']);
@@ -338,6 +340,9 @@ class Doctors extends Base {
             array_shift($excel_array);  //删除第一个数组(标题);
             $data = [];
             foreach($excel_array as $k=>$v) {
+                if(empty($v[2])){
+                    continue;
+                }
                 $data[$k]['id'] = UUIDs::uuid16();
                 $data[$k]['realname'] = $v[0];
                 $data[$k]['doctor_title'] = $v[1];

application/manage/controller/Insdoctors.php

@@ -124,7 +124,10 @@ class Insdoctors extends Base {
 
         $info = $_GET;
         unset($info['doctorcla']);
-        $info['doctor_role'] = implode(',', $_GET['doctor_role']);
+        if(isset($_GET['doctor_role']) && !empty($_GET['doctor_role'])){
+            $info['doctor_role'] = implode(',', $_GET['doctor_role']);
+        }
+//        $info['doctor_role'] = implode(',', $_GET['doctor_role']);
         $info['password'] = md5($_GET['password']);
         $info["institution_id"] = $insId;
         if(isset($info['examcla'])){