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

.idea/workspace.xml

@@ -22,102 +22,95 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="Index.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/index/controller/Index.php">
+      <file leaf-file-name="Doctors.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/manage/controller/Doctors.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-61.741936">
-              <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="-6.387097">
+              <caret line="88" column="9" selection-start-line="88" selection-start-column="9" selection-end-line="88" selection-end-column="9" />
               <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">
+      <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="-36.967743">
-              <caret line="120" column="43" selection-start-line="120" selection-start-column="43" selection-end-line="120" selection-end-column="43" />
-              <folding>
-                <marker date="1543993938878" expanded="true" signature="8355:8654" placeholder="SELECT a.id,... exams" />
-                <marker date="1543993938878" expanded="true" signature="8738:8866" placeholder="SELECT count... exams" />
-              </folding>
+            <state vertical-scroll-proportion="-7.193548">
+              <caret line="773" column="14" selection-start-line="773" selection-start-column="14" selection-end-line="773" selection-end-column="14" />
+              <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">
+      <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="-7.903226">
-              <caret line="87" column="34" selection-start-line="87" selection-start-column="34" selection-end-line="87" selection-end-column="34" />
-              <folding>
-                <marker date="1542944172383" expanded="true" signature="5524:5779" placeholder="SELECT e.id,... exams" />
-                <marker date="1542944172383" expanded="true" signature="5810:6116" placeholder="SELECT e.id,... exams" />
-                <marker date="1542944172383" expanded="true" signature="7040:7168" placeholder="SELECT count... exams" />
-              </folding>
+            <state vertical-scroll-proportion="0.56173915">
+              <caret line="161" column="63" selection-start-line="161" selection-start-column="63" selection-end-line="161" selection-end-column="63" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Doctors.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/manage/controller/Doctors.php">
+      <file leaf-file-name="Report.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-9.225806">
-              <caret line="116" column="9" selection-start-line="116" selection-start-column="9" selection-end-line="116" selection-end-column="9" />
-              <folding />
+            <state vertical-scroll-proportion="-7.806452">
+              <caret line="157" column="0" selection-start-line="157" selection-start-column="0" selection-end-line="157" selection-end-column="0" />
+              <folding>
+                <marker date="1544511955350" expanded="true" signature="8590:8889" placeholder="SELECT a.id,... exams" />
+                <marker date="1544511955350" expanded="true" signature="8973:9101" placeholder="SELECT count... exams" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="database.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/database.php">
+      <file leaf-file-name="Index.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="20" column="44" selection-start-line="20" selection-start-column="44" selection-end-line="20" selection-end-column="44" />
+            <state vertical-scroll-proportion="-2.935484">
+              <caret line="29" column="29" selection-start-line="29" selection-start-column="29" selection-end-line="29" selection-end-column="29" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Writereport.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
+      <file leaf-file-name="Insdoctors.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/manage/controller/Insdoctors.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-136.25807">
-              <caret line="198" column="48" selection-start-line="198" selection-start-column="44" selection-end-line="198" selection-end-column="48" />
+            <state vertical-scroll-proportion="-3.5245903">
+              <caret line="101" column="2" selection-start-line="101" selection-start-column="2" selection-end-line="103" selection-end-column="44" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Application.php" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
+      <file leaf-file-name="database.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/database.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.17565218">
-              <caret line="161" column="30" selection-start-line="161" selection-start-column="30" selection-end-line="161" selection-end-column="30" />
+            <state vertical-scroll-proportion="-6.677419">
+              <caret line="21" column="10" selection-start-line="21" selection-start-column="10" selection-end-line="21" selection-end-column="10" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Verify.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/common/library/Verify.php">
+      <file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/manage/view/doctors/edit.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-4.354839">
-              <caret line="128" column="5" selection-start-line="128" selection-start-column="5" selection-end-line="128" selection-end-column="5" />
+            <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" />
               <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">
+      <file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/manage/view/insdoctors/edit.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-14.903226">
-              <caret line="88" column="42" selection-start-line="88" selection-start-column="42" selection-end-line="88" selection-end-column="42" />
-              <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" />
-              </folding>
+            <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" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -127,13 +120,8 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/application/manage/view/doctors/index.html" />
-        <option value="$PROJECT_DIR$/.git/config" />
         <option value="$PROJECT_DIR$/../yuanchengpasc/public/index.php" />
         <option value="$PROJECT_DIR$/application/common/library/ValidateCode.php" />
-        <option value="$PROJECT_DIR$/application/manage/view/insdoctors/edit.html" />
-        <option value="$PROJECT_DIR$/application/manage/controller/Insdoctors.php" />
-        <option value="$PROJECT_DIR$/application/manage/controller/Doctors.php" />
         <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" />
@@ -159,24 +147,30 @@
         <option value="$USER_HOME$/Desktop/oss_callbacks.sql" />
         <option value="$PROJECT_DIR$/application/inter/controller/Operating.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Login.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Registerlist.php" />
         <option value="$USER_HOME$/Desktop/version.sql" />
         <option value="$PROJECT_DIR$/../yuanchengpasc/application/common/versionsql/createversion" />
         <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/inter/controller/Index.php" />
         <option value="$PROJECT_DIR$/application/common/controller/Version.php" />
-        <option value="$PROJECT_DIR$/application/database.php" />
         <option value="$PROJECT_DIR$/application/common.php" />
         <option value="$PROJECT_DIR$/application/admin/command/Upgrade.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Writereport.php" />
         <option value="$PROJECT_DIR$/application/index/controller/Index.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Dcquery.php" />
         <option value="$PROJECT_DIR$/application/common/versionsql/Version2" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Report.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Application.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/07.log" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Registerlist.php" />
+        <option value="$PROJECT_DIR$/application/common/versionsql/Version3" />
+        <option value="$PROJECT_DIR$/application/database.php" />
+        <option value="$PROJECT_DIR$/application/manage/view/insdoctors/edit.html" />
+        <option value="$PROJECT_DIR$/application/manage/controller/Insdoctors.php" />
+        <option value="$PROJECT_DIR$/application/manage/view/doctors/edit.html" />
+        <option value="$PROJECT_DIR$/application/manage/controller/Doctors.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Report.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Index.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Writereport.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Dcquery.php" />
       </list>
     </option>
   </component>
@@ -227,7 +221,6 @@
     </navigator>
     <panes>
       <pane id="Scratches" />
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -316,54 +309,6 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="yczd" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="yczd" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="yczd" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="application" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="common" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="versionsql" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="yczd" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="yczd" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="yczd" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="application" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="common" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="yczd" />
@@ -376,6 +321,7 @@
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -468,75 +414,11 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="10" />
+      <option name="time" value="12" />
     </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/com/jetbrains/php/lang/psi/stubs/data/standard_defines.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-55.48387">
-          <caret line="724" column="18" selection-start-line="724" selection-start-column="18" selection-end-line="724" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/thinkphp/base.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.26782608">
-          <caret line="15" column="25" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/com/jetbrains/php/lang/psi/stubs/data/Core_d.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3321739">
-          <caret line="297" column="9" selection-start-line="297" selection-start-column="9" selection-end-line="297" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/controller/Backend.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.34434783">
-          <caret line="9" column="28" selection-start-line="9" selection-start-column="28" selection-end-line="9" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/controller/Frontend.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/controller/Api.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.30608696">
-          <caret line="16" column="3" selection-start-line="16" selection-start-column="3" selection-end-line="16" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/application/route.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.34434783">
-          <caret line="17" column="57" selection-start-line="17" selection-start-column="57" selection-end-line="17" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/application/admin/command/Api.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../shenqingxinxi/thinkphp/library/think/Db.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.03826087">
-          <caret line="39" column="26" selection-start-line="39" selection-start-column="19" selection-end-line="39" selection-end-column="26" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/extend/.gitignore">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -706,20 +588,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6121739">
-          <caret line="33" column="26" selection-start-line="33" selection-start-column="26" selection-end-line="34" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/common.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" />
-          <folding>
-            <element signature="e#6#80#0#PHP" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -727,136 +599,204 @@
       <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" />
-          <folding>
-            <element signature="e#36#62#0#PHP" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version1">
+    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/application/common/versionsql/Version2">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="49" column="69" selection-start-line="49" selection-start-column="69" selection-end-line="50" selection-end-column="62" />
-          <folding />
+          <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/common/versionsql/Version2">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-2.027523">
+          <caret line="402" column="41" selection-start-line="402" selection-start-column="28" selection-end-line="402" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/manage/controller/Remoteapplication.php">
+      <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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="105" selection-start-line="0" selection-start-column="82" selection-end-line="0" selection-end-column="105" />
+          <caret line="88" column="42" selection-start-line="88" selection-start-column="42" selection-end-line="88" selection-end-column="42" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Dcquery.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="150" column="31" selection-start-line="150" selection-start-column="31" selection-end-line="150" selection-end-column="31" />
+          <caret line="128" column="5" selection-start-line="128" selection-start-column="5" selection-end-line="128" selection-end-column="5" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.php">
+    <entry file="file://$PROJECT_DIR$/application/index/controller/Index.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-2.027523">
-          <caret line="402" column="41" selection-start-line="402" selection-start-column="28" selection-end-line="402" selection-end-column="41" />
+        <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/database.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="9.935484">
+          <caret line="17" column="26" selection-start-line="17" selection-start-column="26" selection-end-line="17" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Base.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-12.774194">
+          <caret line="36" column="90" selection-start-line="36" selection-start-column="90" selection-end-line="36" selection-end-column="90" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version2">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="20" column="44" selection-start-line="20" selection-start-column="44" selection-end-line="20" selection-end-column="44" />
+          <caret line="5" column="21" selection-start-line="5" selection-start-column="21" selection-end-line="5" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version1">
+      <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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Registerlist.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-9.935484">
+          <caret line="60" column="37" selection-start-line="60" selection-start-column="37" selection-end-line="60" selection-end-column="37" />
+          <folding>
+            <marker date="1544493433067" expanded="true" signature="5343:5598" placeholder="SELECT e.id,... exams" />
+            <marker date="1544493433067" expanded="true" signature="5343:5615" placeholder="SELECT e.id,... exams" />
+            <marker date="1544493433067" expanded="true" signature="7130:7258" placeholder="SELECT count... exams" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/manage/view/insdoctors/permissions.html">
+      <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" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/index/controller/Index.php">
+    <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version3">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-61.741936">
-          <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.0">
+          <caret line="0" column="53" selection-start-line="0" selection-start-column="53" selection-end-line="1" selection-end-column="66" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/controller/Remoteapplication.php">
+    <entry file="file://$PROJECT_DIR$/application/manage/view/insdoctors/stats.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-1.4921739">
+        <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" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
+    <entry file="file://$PROJECT_DIR$/application/manage/view/insdoctors/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-136.25807">
-          <caret line="198" column="48" selection-start-line="198" selection-start-column="44" selection-end-line="198" selection-end-column="48" />
+        <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" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.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.903226">
-          <caret line="88" column="42" selection-start-line="88" selection-start-column="42" selection-end-line="88" selection-end-column="42" />
-          <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" />
-          </folding>
+        <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" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
+    <entry file="file://$PROJECT_DIR$/application/database.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-36.967743">
-          <caret line="120" column="43" selection-start-line="120" selection-start-column="43" selection-end-line="120" selection-end-column="43" />
-          <folding>
-            <marker date="1543993938878" expanded="true" signature="8355:8654" placeholder="SELECT a.id,... exams" />
-            <marker date="1543993938878" expanded="true" signature="8738:8866" placeholder="SELECT count... exams" />
-          </folding>
+        <state vertical-scroll-proportion="-6.677419">
+          <caret line="21" column="10" selection-start-line="21" selection-start-column="10" selection-end-line="21" selection-end-column="10" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Registerlist.php">
+    <entry file="file://$PROJECT_DIR$/application/manage/view/insdoctors/edit.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.903226">
-          <caret line="87" column="34" selection-start-line="87" selection-start-column="34" selection-end-line="87" selection-end-column="34" />
-          <folding>
-            <marker date="1542944172383" expanded="true" signature="5524:5779" placeholder="SELECT e.id,... exams" />
-            <marker date="1542944172383" expanded="true" signature="5810:6116" placeholder="SELECT e.id,... exams" />
-            <marker date="1542944172383" expanded="true" signature="7040:7168" placeholder="SELECT count... exams" />
-          </folding>
+        <state 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" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/manage/view/doctors/edit.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-13.4838705">
+          <caret line="136" column="17" selection-start-line="136" selection-start-column="17" selection-end-line="136" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/manage/controller/Insdoctors.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-3.5245903">
+          <caret line="101" column="2" selection-start-line="101" selection-start-column="2" selection-end-line="103" selection-end-column="44" />
+          <folding />
         </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="-9.225806">
-          <caret line="116" column="9" selection-start-line="116" selection-start-column="9" selection-end-line="116" selection-end-column="9" />
+        <state vertical-scroll-proportion="-6.387097">
+          <caret line="88" column="9" selection-start-line="88" selection-start-column="9" selection-end-line="88" selection-end-column="9" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/library/Verify.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.354839">
-          <caret line="128" column="5" selection-start-line="128" selection-start-column="5" selection-end-line="128" selection-end-column="5" />
+        <state vertical-scroll-proportion="-2.935484">
+          <caret line="29" column="29" selection-start-line="29" selection-start-column="29" selection-end-line="29" selection-end-column="29" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/versionsql/Version2">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
       <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="-7.806452">
+          <caret line="157" column="0" selection-start-line="157" selection-start-column="0" selection-end-line="157" selection-end-column="0" />
+          <folding>
+            <marker date="1544511955350" expanded="true" signature="8590:8889" placeholder="SELECT a.id,... exams" />
+            <marker date="1544511955350" expanded="true" signature="8973:9101" placeholder="SELECT count... exams" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-7.193548">
+          <caret line="773" column="14" selection-start-line="773" selection-start-column="14" selection-end-line="773" selection-end-column="14" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Dcquery.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.17565218">
-          <caret line="161" column="30" selection-start-line="161" selection-start-column="30" selection-end-line="161" selection-end-column="30" />
+        <state vertical-scroll-proportion="0.56173915">
+          <caret line="161" column="63" selection-start-line="161" selection-start-column="63" selection-end-line="161" selection-end-column="63" />
           <folding />
         </state>
       </provider>

application/inter/controller/Dcquery.php

@@ -116,7 +116,7 @@ class Dcquery extends Controller
     public function get_studiesinfo(){
         $study_id = $_REQUEST['study_id'];
         if(isset($_REQUEST['address']) && !empty($_REQUEST['address'])){
-            $url = "dicomweb://".$_REQUEST['address']."/";
+            $url = $_REQUEST['address'];
         }else{
             $url = '';
         }
@@ -147,10 +147,10 @@ class Dcquery extends Controller
                 }else{
                     $image[$key]['url'] = $url.$value['metadata'];
                 }*/
-                $imageUrl = $this->generateUrl($value['url'],$_REQUEST['address'],$value['remote_url'],$value['local_url'],$value['status'],$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错误，传值为--'.$_REQUEST['address'];
+                    $log = 'url错误，传值为--'.$url;
                     file_put_contents($file, $log,FILE_APPEND);
                     continue;
                 }

application/inter/controller/Writereport.php

@@ -673,8 +673,9 @@ class Writereport extends Base
             $id = $_REQUEST['id'];
             $info = array();
             // 检查日期 住院号 床号
-            $exam_info = DB::table('exams')->where('id',$id)->field('id,accession_num,exam_datetime,exam_class,hopitalized_no,bed_no,exam_project,patient_id')->find();
+            $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();
             $info['id'] = $exam_info['id'];
+            $info['ext'] = $exam_info['ext'];
             $info['accession_num'] = $exam_info['accession_num'];
             if(!empty($exam_info['exam_datetime'])){
                 $datetime = explode(' ',$exam_info['exam_datetime']);
@@ -770,6 +771,7 @@ class Writereport extends Base
         return json_encode(['status'=>'ok','msg'=>'保存成功','code'=>'0000']);
     }
 
+    //  XA类型数据获取
     public function get_rinfo(){
         $sessionid = $_REQUEST['sessionid'];
         $doctor = Cache::get($sessionid);
@@ -792,6 +794,7 @@ class Writereport extends Base
         return json_encode(['status'=>'ok','info'=>$patient,'code'=>'0000']);
     }
 
+    // XA类型保存
     public function write_info(){
         $sessionid = $_REQUEST['sessionid'];
         $doctor = Cache::get($sessionid);
@@ -806,7 +809,17 @@ class Writereport extends Base
         $report['description'] = isset($param['description']) ? $param['description'] : '';
         DB::table('patient_infos')->where('id',$param['pid'])->update($patient_info);
         DB::table('exams')->where('id',$param['id'])->update($exam_info);
-        DB::table('report')->where('exam_id',$param['id'])->update($report);
+        $rinfo = DB::table('report')->where('exam_id',$param['id'])->find();
+        if($rinfo){
+            DB::table('report')->where('exam_id',$param['id'])->update($report);
+        }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);
+        }
         return json_encode(['status'=>'ok','msg'=>'成功','code'=>'0000']);
     }
 }