lgy %!s(int64=6) %!d(string=hai) anos
pai
achega
5cc9fa49f0

+ 179 - 121
.idea/workspace.xml

@@ -25,39 +25,99 @@
       <file leaf-file-name="Index.php" pinned="false" current-in-tab="false">
       <file leaf-file-name="Index.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
         <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-4.354839">
-              <caret line="46" column="81" selection-start-line="46" selection-start-column="81" selection-end-line="46" selection-end-column="81" />
+            <state vertical-scroll-proportion="-0.0">
+              <caret line="36" column="28" selection-start-line="36" selection-start-column="28" selection-end-line="36" selection-end-column="28" />
               <folding>
               <folding>
-                <marker date="1540785264875" expanded="true" signature="2148:2192" placeholder="select count... templates" />
+                <marker date="1540868903918" expanded="true" signature="3084:3128" placeholder="select count... templates" />
               </folding>
               </folding>
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
+      <file leaf-file-name="Template.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/inter/controller/Template.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0">
+              <caret line="161" column="39" selection-start-line="161" selection-start-column="32" selection-end-line="161" selection-end-column="39" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="Report.php" pinned="false" current-in-tab="true">
       <file leaf-file-name="Report.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
         <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.30608696">
-              <caret line="108" column="45" selection-start-line="108" selection-start-column="45" selection-end-line="108" selection-end-column="45" />
+            <state vertical-scroll-proportion="0.84695655">
+              <caret line="124" column="45" selection-start-line="124" selection-start-column="45" selection-end-line="124" selection-end-column="45" />
               <folding>
               <folding>
-                <element signature="e#214#3059#0#PHP" expanded="false" />
-                <marker date="1540541380232" expanded="true" signature="7701:7998" placeholder="SELECT a.id,... exams" />
-                <marker date="1540541380232" expanded="true" signature="8082:8210" placeholder="SELECT count... exams" />
+                <marker date="1540968561181" expanded="true" signature="8028:8325" placeholder="SELECT a.id,... exams" />
+                <marker date="1540968561181" expanded="true" signature="8409:8537" placeholder="SELECT count... exams" />
               </folding>
               </folding>
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </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="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">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-14.193548">
-              <caret line="238" column="40" selection-start-line="238" selection-start-column="23" selection-end-line="238" selection-end-column="40" />
+            <state vertical-scroll-proportion="-8.645162">
+              <caret line="441" column="60" selection-start-line="441" selection-start-column="60" selection-end-line="441" selection-end-column="60" />
               <folding />
               <folding />
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
+      <file leaf-file-name="Inspectregister.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0">
+              <caret line="401" column="13" selection-start-line="401" selection-start-column="13" selection-end-line="401" selection-end-column="13" />
+              <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="-2.935484">
+              <caret line="103" column="54" selection-start-line="103" selection-start-column="54" selection-end-line="103" selection-end-column="54" />
+              <folding>
+                <marker date="1540885428008" expanded="true" signature="4877:5132" placeholder="SELECT e.id,... exams" />
+                <marker date="1540885428008" expanded="true" signature="5163:5469" placeholder="SELECT e.id,... exams" />
+                <marker date="1540885428008" expanded="true" signature="6393:6521" placeholder="SELECT count... exams" />
+              </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">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="-14.193548">
+              <caret line="27" column="35" selection-start-line="27" selection-start-column="28" selection-end-line="27" selection-end-column="35" />
+              <folding>
+                <element signature="e#9243#13221#0#PHP" expanded="false" />
+                <element signature="e#13228#14534#0#PHP" expanded="false" />
+                <element signature="e#18108#19444#0#PHP" expanded="false" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Reciveremote.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="-6.516129">
+              <caret line="76" column="34" selection-start-line="76" selection-start-column="34" selection-end-line="83" selection-end-column="34" />
+              <folding>
+                <marker date="1540865902230" expanded="true" signature="7641:8111" placeholder="SELECT e.exa... exams" />
+                <marker date="1540865902230" expanded="true" signature="8219:8432" placeholder="SELECT count... exams" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
     </leaf>
   </component>
   </component>
   <component name="IdeDocumentHistory">
   <component name="IdeDocumentHistory">
@@ -81,22 +141,22 @@
         <option value="$PROJECT_DIR$/thinkphp/library/think/Loader.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/Examclass.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Examproject.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Examproject.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Doctors.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Template.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Registerlist.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Reciveremote.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Messages.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Login.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Inspectregister.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Dcquery.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Dcquery.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Operating.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Operating.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Report.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Application.php" />
         <option value="$PROJECT_DIR$/public/api.html" />
         <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$/../../../bin/apache/apache2.4.23/conf/extra/httpd-vhosts.conf" />
         <option value="$PROJECT_DIR$/../../yanzhengma.php" />
         <option value="$PROJECT_DIR$/../../yanzhengma.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Login.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Application.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Doctors.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Inspectregister.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Messages.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Reciveremote.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Template.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Writereport.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Writereport.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Index.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Index.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Registerlist.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Report.php" />
       </list>
       </list>
     </option>
     </option>
   </component>
   </component>
@@ -146,7 +206,6 @@
       <foldersAlwaysOnTop value="true" />
       <foldersAlwaysOnTop value="true" />
     </navigator>
     </navigator>
     <panes>
     <panes>
-      <pane id="Scope" />
       <pane id="Scratches" />
       <pane id="Scratches" />
       <pane id="ProjectPane">
       <pane id="ProjectPane">
         <subPane>
         <subPane>
@@ -314,6 +373,7 @@
           </PATH>
           </PATH>
         </subPane>
         </subPane>
       </pane>
       </pane>
+      <pane id="Scope" />
     </panes>
     </panes>
   </component>
   </component>
   <component name="PropertiesComponent">
   <component name="PropertiesComponent">
@@ -528,13 +588,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Base.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3269565">
-          <caret line="36" column="90" selection-start-line="36" selection-start-column="90" selection-end-line="36" selection-end-column="90" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/manage/controller/Index.php">
     <entry file="file://$PROJECT_DIR$/application/manage/controller/Index.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-1.3773913">
         <state vertical-scroll-proportion="-1.3773913">
@@ -613,204 +666,209 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Doctors.php">
+    <entry file="file://$PROJECT_DIR$/public/api.html">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.7096774">
-          <caret line="120" column="44" selection-start-line="120" selection-start-column="44" selection-end-line="120" selection-end-column="44" />
+        <state vertical-scroll-proportion="286.0">
+          <caret line="9397" column="33" selection-start-line="9403" selection-start-column="115" selection-end-line="9403" selection-end-column="120" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Examclass.php">
+    <entry file="file://$PROJECT_DIR$/../../testmysql.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.7096774">
-          <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
+        <state vertical-scroll-proportion="-4.2580647">
+          <caret line="6" column="17" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Examproject.php">
+    <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/com/jetbrains/php/lang/psi/stubs/data/mysqli.php">
       <provider selected="true" editor-type-id="text-editor">
       <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="5.548387">
+          <caret line="317" column="22" selection-start-line="317" selection-start-column="22" selection-end-line="317" selection-end-column="22" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.php">
+    <entry file="file://$PROJECT_DIR$/../../../bin/apache/apache2.4.23/conf/httpd.conf">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.2580647">
-          <caret line="14" column="1" selection-start-line="14" selection-start-column="1" selection-end-line="14" selection-end-column="1" />
+        <state vertical-scroll-proportion="-7.866667">
+          <caret line="72" column="18" selection-start-line="72" selection-start-column="18" selection-end-line="72" selection-end-column="18" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Login.php">
+    <entry file="file://$PROJECT_DIR$/../../../bin/apache/apache2.4.23/conf/extra/httpd-vhosts.conf">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.967742">
-          <caret line="21" column="5" selection-start-line="21" selection-start-column="5" selection-end-line="21" selection-end-column="5" />
+        <state vertical-scroll-proportion="0.5808581">
+          <caret line="16" column="24" selection-start-line="16" selection-start-column="24" selection-end-line="16" selection-end-column="24" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Messages.php">
+    <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/com/jetbrains/php/lang/psi/stubs/data/gd.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-36.903225">
-          <caret line="56" column="5" selection-start-line="56" selection-start-column="5" selection-end-line="56" selection-end-column="5" />
+        <state vertical-scroll-proportion="0.35130435">
+          <caret line="1696" column="9" selection-start-line="1696" selection-start-column="9" selection-end-line="1696" selection-end-column="9" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.php">
+    <entry file="file://$PROJECT_DIR$/../../yanzhengma.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.967742">
-          <caret line="11" column="1" selection-start-line="11" selection-start-column="1" selection-end-line="11" selection-end-column="1" />
+        <state vertical-scroll-proportion="-4.354839">
+          <caret line="8" column="79" selection-start-line="8" selection-start-column="79" selection-end-line="8" selection-end-column="79" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Registerlist.php">
+    <entry file="file://$PROJECT_DIR$/application/common/library/UUIDs.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-3.548387">
-          <caret line="10" column="1" selection-start-line="10" selection-start-column="1" selection-end-line="10" selection-end-column="1" />
+        <state vertical-scroll-proportion="0.44173914">
+          <caret line="33" column="27" selection-start-line="33" selection-start-column="27" selection-end-line="33" selection-end-column="27" />
+          <folding />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Template.php">
+    <entry file="file://$PROJECT_DIR$/application/index/controller/Index.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.68869567">
-          <caret line="182" column="5" selection-start-line="182" selection-start-column="5" selection-end-line="182" selection-end-column="5" />
+        <state vertical-scroll-proportion="0.34434783">
+          <caret line="15" column="29" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Dcquery.php">
+    <entry file="file://$PROJECT_DIR$/application/manage/controller/Doctors.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.8086957">
-          <caret line="111" column="14" selection-start-line="111" selection-start-column="14" selection-end-line="111" selection-end-column="14" />
+        <state vertical-scroll-proportion="8.761739">
+          <caret line="238" column="40" selection-start-line="238" selection-start-column="23" selection-end-line="238" selection-end-column="40" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Operating.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Base.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.19652174">
-          <caret line="33" column="25" selection-start-line="33" selection-start-column="25" selection-end-line="33" selection-end-column="25" />
+        <state vertical-scroll-proportion="1.0330435">
+          <caret line="36" column="90" selection-start-line="36" selection-start-column="90" selection-end-line="36" selection-end-column="90" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Examclass.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-1.516129">
-          <caret line="297" column="26" selection-start-line="297" selection-start-column="26" selection-end-line="297" selection-end-column="26" />
-          <folding>
-            <element signature="e#240#1991#0#PHP" expanded="false" />
-            <element signature="e#6118#9223#0#PHP" expanded="false" />
-            <element signature="e#9228#13206#0#PHP" expanded="false" />
-            <element signature="e#13213#14519#0#PHP" expanded="false" />
-            <element signature="e#15233#16840#0#PHP" expanded="false" />
-            <element signature="e#18091#19427#0#PHP" expanded="false" />
-          </folding>
+        <state vertical-scroll-proportion="-0.7096774">
+          <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/public/api.html">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Examproject.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="286.0">
-          <caret line="9397" column="33" selection-start-line="9403" selection-start-column="115" selection-end-line="9403" selection-end-column="120" />
-          <folding />
+        <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>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../testmysql.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Dcquery.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.2580647">
-          <caret line="6" column="17" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
-          <folding />
+        <state vertical-scroll-proportion="0.13114753">
+          <caret line="20" column="14" selection-start-line="20" selection-start-column="9" selection-end-line="20" selection-end-column="14" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/com/jetbrains/php/lang/psi/stubs/data/mysqli.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Doctors.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="5.548387">
-          <caret line="317" column="22" selection-start-line="317" selection-start-column="22" selection-end-line="317" selection-end-column="22" />
-          <folding />
+        <state vertical-scroll-proportion="-2.9672132">
+          <caret line="160" column="39" selection-start-line="160" selection-start-column="32" selection-end-line="160" selection-end-column="39" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../bin/apache/apache2.4.23/conf/httpd.conf">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Login.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.866667">
-          <caret line="72" column="18" selection-start-line="72" selection-start-column="18" selection-end-line="72" selection-end-column="18" />
-          <folding />
+        <state vertical-scroll-proportion="-2.9672132">
+          <caret line="34" column="39" selection-start-line="34" selection-start-column="32" selection-end-line="34" selection-end-column="39" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../../bin/apache/apache2.4.23/conf/extra/httpd-vhosts.conf">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Messages.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5808581">
-          <caret line="16" column="24" selection-start-line="16" selection-start-column="24" selection-end-line="16" selection-end-column="24" />
-          <folding />
+        <state vertical-scroll-proportion="-2.9672132">
+          <caret line="112" column="39" selection-start-line="112" selection-start-column="32" selection-end-line="112" selection-end-column="39" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/com/jetbrains/php/lang/psi/stubs/data/gd.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Operating.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35130435">
-          <caret line="1696" column="9" selection-start-line="1696" selection-start-column="9" selection-end-line="1696" selection-end-column="9" />
-          <folding />
+        <state vertical-scroll-proportion="-3.5081968">
+          <caret line="27" column="16" selection-start-line="27" selection-start-column="11" selection-end-line="27" selection-end-column="16" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../yanzhengma.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Inspectregister.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.354839">
-          <caret line="8" column="79" selection-start-line="8" selection-start-column="79" selection-end-line="8" selection-end-column="79" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="401" column="13" selection-start-line="401" selection-start-column="13" selection-end-line="401" selection-end-column="13" />
           <folding />
           <folding />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/library/UUIDs.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44173914">
-          <caret line="33" column="27" selection-start-line="33" selection-start-column="27" selection-end-line="33" selection-end-column="27" />
-          <folding />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="36" column="28" selection-start-line="36" selection-start-column="28" selection-end-line="36" selection-end-column="28" />
+          <folding>
+            <marker date="1540868903918" expanded="true" signature="3084:3128" placeholder="select count... templates" />
+          </folding>
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/index/controller/Index.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Template.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.34434783">
-          <caret line="15" column="29" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" />
+        <state vertical-scroll-proportion="0.0">
+          <caret line="161" column="39" selection-start-line="161" selection-start-column="32" selection-end-line="161" selection-end-column="39" />
           <folding />
           <folding />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-10.645162">
-          <caret line="214" column="18" selection-start-line="214" selection-start-column="18" selection-end-line="214" selection-end-column="18" />
+        <state vertical-scroll-proportion="-8.645162">
+          <caret line="441" column="60" selection-start-line="441" selection-start-column="60" selection-end-line="441" selection-end-column="60" />
           <folding />
           <folding />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/controller/Doctors.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Registerlist.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-2.935484">
+          <caret line="103" column="54" selection-start-line="103" selection-start-column="54" selection-end-line="103" selection-end-column="54" />
+          <folding>
+            <marker date="1540885428008" expanded="true" signature="4877:5132" placeholder="SELECT e.id,... exams" />
+            <marker date="1540885428008" expanded="true" signature="5163:5469" placeholder="SELECT e.id,... exams" />
+            <marker date="1540885428008" expanded="true" signature="6393:6521" placeholder="SELECT count... exams" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-14.193548">
         <state vertical-scroll-proportion="-14.193548">
-          <caret line="238" column="40" selection-start-line="238" selection-start-column="23" selection-end-line="238" selection-end-column="40" />
-          <folding />
+          <caret line="27" column="35" selection-start-line="27" selection-start-column="28" selection-end-line="27" selection-end-column="35" />
+          <folding>
+            <element signature="e#9243#13221#0#PHP" expanded="false" />
+            <element signature="e#13228#14534#0#PHP" expanded="false" />
+            <element signature="e#18108#19444#0#PHP" expanded="false" />
+          </folding>
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.354839">
-          <caret line="46" column="81" selection-start-line="46" selection-start-column="81" selection-end-line="46" selection-end-column="81" />
+        <state vertical-scroll-proportion="-6.516129">
+          <caret line="76" column="34" selection-start-line="76" selection-start-column="34" selection-end-line="83" selection-end-column="34" />
           <folding>
           <folding>
-            <marker date="1540785264875" expanded="true" signature="2148:2192" placeholder="select count... templates" />
+            <marker date="1540865902230" expanded="true" signature="7641:8111" placeholder="SELECT e.exa... exams" />
+            <marker date="1540865902230" expanded="true" signature="8219:8432" placeholder="SELECT count... exams" />
           </folding>
           </folding>
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.30608696">
-          <caret line="108" column="45" selection-start-line="108" selection-start-column="45" selection-end-line="108" selection-end-column="45" />
+        <state vertical-scroll-proportion="0.84695655">
+          <caret line="124" column="45" selection-start-line="124" selection-start-column="45" selection-end-line="124" selection-end-column="45" />
           <folding>
           <folding>
-            <element signature="e#214#3059#0#PHP" expanded="false" />
-            <marker date="1540541380232" expanded="true" signature="7701:7998" placeholder="SELECT a.id,... exams" />
-            <marker date="1540541380232" expanded="true" signature="8082:8210" placeholder="SELECT count... exams" />
+            <marker date="1540968561181" expanded="true" signature="8028:8325" placeholder="SELECT a.id,... exams" />
+            <marker date="1540968561181" expanded="true" signature="8409:8537" placeholder="SELECT count... exams" />
           </folding>
           </folding>
         </state>
         </state>
       </provider>
       </provider>

+ 17 - 17
application/inter/controller/Application.php

@@ -25,7 +25,7 @@ class Application extends Base
  * @ApiParams         (name="sessionid",                 type="string",      required=true,      description="参数json字符串")
  * @ApiParams         (name="sessionid",                 type="string",      required=true,      description="参数json字符串")
  * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
  * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
  * @ApiParams         (name="is_remote",                 type="string",      required=true,      description="参数json字符串")
  * @ApiParams         (name="is_remote",                 type="string",      required=true,      description="参数json字符串")
- * @ApiParams         (name="param.id",                  type="string",      sample="",          description="预约登记exams表id值<必填>")
+ * @ApiParams         (name="param[id]",                  type="string",      sample="",          description="预约登记exams表id值<必填>")
  * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
  * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
  * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
  * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
  * @ApiReturnParams   (name="info",                       type="string",      required=true,      sample="返回成功", description="返回信息")
  * @ApiReturnParams   (name="info",                       type="string",      required=true,      sample="返回成功", description="返回信息")
@@ -119,20 +119,20 @@ class Application extends Base
      * @ApiHeaders        (name="timestamp", type=string, required=true, description="请求头-时间戳s")
      * @ApiHeaders        (name="timestamp", type=string, required=true, description="请求头-时间戳s")
      * @ApiParams         (name="sessionid",                  type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="sessionid",                  type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                      type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                      type="string",      required=true,      description="参数json字符串")
-     * @ApiParams         (name="param.id",                   type="string",      sample="",          description="预约登记exams表id值<必填>")
-     * @ApiParams         (name="param.illness",              type="string",      sample="",          description="主诉<选填>")
-     * @ApiParams         (name="param.clin_symp",            type="string",      sample="",          description="临床症状<选填>")
-     * @ApiParams         (name="param.anamnesis",            type="string",      sample="",          description="既往史<选填>")
-     * @ApiParams         (name="param.family_ill",           type="string",      sample="",          description="家族史<选填>")
-     * @ApiParams         (name="param.remark",               type="string",      sample="",          description="备注<选填>")
-     * @ApiParams         (name="param.institution_id",       type="string",      sample="",          description="发起申请医院id值<选填>")
-     * @ApiParams         (name="param.clin_diag",            type="string",      sample="",          description="临床诊断<选填>")
-     * @ApiParams         (name="param.remote_institution",   type="string",      sample="",          description="申请的目标医院id值<选填>")
-     * @ApiParams         (name="param.is_urgent",            type="string",      sample="",          description="是否急诊 0否  1是<选填>")
-     * @ApiParams         (name="param.description",          type="string",      sample="",          description="申请描述<选填>")
-     * @ApiParams         (name="param.remote_doctor_id",     type="string",      sample="",          description="申请的目标医生id值<选填>")
-     * @ApiParams         (name="param.attachment",           type="string",      sample="",          description="附件<选填>")
-     * @ApiParams         (name="param.apply",                type="string",      sample="",          description="保存或者申请 存在值即保存 不存在则为申请<必填>")
+     * @ApiParams         (name="param[id]",                   type="string",      sample="",          description="预约登记exams表id值<必填>")
+     * @ApiParams         (name="param[illness]",              type="string",      sample="",          description="主诉<选填>")
+     * @ApiParams         (name="param[clin_symp]",            type="string",      sample="",          description="临床症状<选填>")
+     * @ApiParams         (name="param[anamnesis]",            type="string",      sample="",          description="既往史<选填>")
+     * @ApiParams         (name="param[family_ill]",           type="string",      sample="",          description="家族史<选填>")
+     * @ApiParams         (name="param[remark]",               type="string",      sample="",          description="备注<选填>")
+     * @ApiParams         (name="param[institution_id]",       type="string",      sample="",          description="发起申请医院id值<选填>")
+     * @ApiParams         (name="param[clin_diag]",            type="string",      sample="",          description="临床诊断<选填>")
+     * @ApiParams         (name="param[remote_institution]",   type="string",      sample="",          description="申请的目标医院id值<选填>")
+     * @ApiParams         (name="param[is_urgent]",            type="string",      sample="",          description="是否急诊 0否  1是<选填>")
+     * @ApiParams         (name="param[description]",          type="string",      sample="",          description="申请描述<选填>")
+     * @ApiParams         (name="param[remote_doctor_id]",     type="string",      sample="",          description="申请的目标医生id值<选填>")
+     * @ApiParams         (name="param[attachment]",           type="string",      sample="",          description="附件<选填>")
+     * @ApiParams         (name="param[apply]",                type="string",      sample="",          description="保存或者申请 存在值即保存 不存在则为申请<必填>")
      * @ApiReturnParams   (name="status",                     type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="status",                     type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="code",                       type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="code",                       type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="sessionid",                      type="object",      sample="{}",        description="缓存的数据key")
      * @ApiReturnParams   (name="sessionid",                      type="object",      sample="{}",        description="缓存的数据key")
@@ -270,8 +270,8 @@ class Application extends Base
      * @ApiHeaders        (name="timestamp", type=string, required=true, description="请求头-时间戳s")
      * @ApiHeaders        (name="timestamp", type=string, required=true, description="请求头-时间戳s")
      * @ApiParams         (name="sessionid",                 type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="sessionid",                 type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                        type="string",      required=true, sample="",          description="参数json字符串,预约登记exams表id值<必填>")
      * @ApiParams         (name="param",                        type="string",      required=true, sample="",          description="参数json字符串,预约登记exams表id值<必填>")
-     * @ApiParams         (name="param.id",                  type="string",      sample="",          description="预约登记exams表id值<必填>")
-     * @ApiParams         (name="param.description",                  type="string",      sample="",          description="驳回原因<必填>")
+     * @ApiParams         (name="param[id]",                  type="string",      sample="",          description="预约登记exams表id值<必填>")
+     * @ApiParams         (name="param[description]",                  type="string",      sample="",          description="驳回原因<必填>")
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="sessionid",                      type="object",      sample="{}",        description="缓存的数据key")
      * @ApiReturnParams   (name="sessionid",                      type="object",      sample="{}",        description="缓存的数据key")

+ 5 - 5
application/inter/controller/Doctors.php

@@ -158,11 +158,11 @@ class Doctors extends Base
      * @ApiHeaders        (name="timestamp", type=string, required=true, description="请求头-时间戳s")
      * @ApiHeaders        (name="timestamp", type=string, required=true, description="请求头-时间戳s")
      * @ApiParams         (name="sessionid",                  type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="sessionid",                  type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                      type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                      type="string",      required=true,      description="参数json字符串")
-     * @ApiParams         (name="param.realname",                   type="string",      sample="",          description="真实姓名<必填>")
-     * @ApiParams         (name="param.email",              type="string",      sample="",          description="邮箱<必填>")
-     * @ApiParams         (name="param.phone",            type="string",      sample="",          description="手机号<必填>")
-     * @ApiParams         (name="param.doctor_title",            type="string",      sample="",          description="职称<必填>")
-     * @ApiParams         (name="param.attachment",           type="string",      sample="",          description="附件<必填>")
+     * @ApiParams         (name="param[realname]",                   type="string",      sample="",          description="真实姓名<必填>")
+     * @ApiParams         (name="param[email]",              type="string",      sample="",          description="邮箱<必填>")
+     * @ApiParams         (name="param[phone]",            type="string",      sample="",          description="手机号<必填>")
+     * @ApiParams         (name="param[doctor_title]",            type="string",      sample="",          description="职称<必填>")
+     * @ApiParams         (name="param[attachment]",           type="string",      sample="",          description="附件<必填>")
      * @ApiReturnParams   (name="status",                     type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="status",                     type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="code",                       type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="code",                       type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="sessionid",                      type="object",      sample="{}",        description="缓存的数据key")
      * @ApiReturnParams   (name="sessionid",                      type="object",      sample="{}",        description="缓存的数据key")

+ 62 - 3
application/inter/controller/Index.php

@@ -11,7 +11,7 @@ class Index extends Controller
 {
 {
     public function _initialize()
     public function _initialize()
     {
     {
-        var_dump($_SERVER);die;
+        /*var_dump($_SERVER);die;
         parent::_initialize(); // TODO: Change the autogenerated stub
         parent::_initialize(); // TODO: Change the autogenerated stub
         $param = $_REQUEST;
         $param = $_REQUEST;
         var_dump($param);
         var_dump($param);
@@ -24,12 +24,71 @@ class Index extends Controller
         $info['doctor_id'] = $doctor['id'];
         $info['doctor_id'] = $doctor['id'];
         $info['doctor_name'] = $dname['realname'];
         $info['doctor_name'] = $dname['realname'];
         $info['url'] = $_SERVER['REQUEST_URI'];
         $info['url'] = $_SERVER['REQUEST_URI'];
-        var_dump($info);die;
+        var_dump($info);die;*/
     }
     }
 
 
     public function  index(){
     public function  index(){
+        // DR->DX
+        $a = DB::table('templates')->where('is_public','1')->where('exam_class_id','DR')->select();
+        foreach ($a as $k => $v) {
+            $b = array();
+            $p = DB::table('templates')->where('parent_id',$v['id'])->select();
+            unset($v['exam_class_id']);
+            unset($v['id']);
+            $b = $v;
+            $b['exam_class_id'] = 'DX';
+            $b['id'] = UUIDs::uuid16();
+            $c = DB::table('templates')->insert($b);
+            foreach ($p as $key => $value) {
+                unset($value['exam_class_id']);
+                unset($value['id']);
+                unset($value['parent_id']);
+                $y = array();
+                $y = $value;
+                $y['exam_class_id'] = 'DX';
+                $y['parent_id'] = $b['id'];
+                $y['id'] = UUIDs::uuid16();
+                DB::table('templates')->insert($y);
+            }
+        }
+        die;
+        // 菜单权限
+        /*$a = DB::table('doctors')->where('institution_id','74500001')->select();
+        $i = 1;
+        foreach($a as $k=>$v){
+            $info = array();
+            $info['id'] = UUIDs::uuid16();
+            $info['doctor_id'] = $v['id'];
+            $info['pass'] = '80ddb7d09ebc44b4';
+            $info['type'] = 1;
+            $c = DB::table('dr_cla_permission')->insert($info);
+            if($c){
+                echo $i;
+                $i++;
+            }
+        }*/
+        //  报告权限
+        $qx = DB::table('doctors')->where('institution_id','74500001')->select();
+        foreach($qx as $k=>$v){
+            $qxinfo = array();
+            if($v['department_id'] == 'd131507b77044283'){
+                // 写报告权限
+                $qxinfo['department_id'] = 'd131507b77044283';
+                $qxinfo['doctor_class'] = '2,3,4';
+            }else{
+                $qxinfo['department_id'] = $v['department_id'];
+                $qxinfo['doctor_class'] = '1';
+            }
+            $qxinfo['id'] = UUIDs::uuid16();
+            $qxinfo['doctor_id'] = $v['id'];
+            $qxx = DB::table('doctor_class')->insert($qxinfo);
+            if(!$qxx){
+                var_dump($qxinfo);
+            }
+        }
+        die;
         $a = "select count(1) from templates where id='00'";
         $a = "select count(1) from templates where id='00'";
-       $b = DB::query($a);
+        $b = DB::query($a);
         var_dump($b);
         var_dump($b);
         var_dump($b[0]['count(1)']);die;
         var_dump($b[0]['count(1)']);die;
         $c = DB::table('exam_class')->where('id',2)->find();
         $c = DB::table('exam_class')->where('id',2)->find();

+ 29 - 26
application/inter/controller/Inspectregister.php

@@ -75,7 +75,7 @@ class Inspectregister extends Base
      * @ApiHeaders        (name="timestamp", type=string, required=true, description="请求头-时间戳s")
      * @ApiHeaders        (name="timestamp", type=string, required=true, description="请求头-时间戳s")
      * @ApiParams         (name="sessionid",                 type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="sessionid",                 type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
-     * @ApiParams         (name="param.id",                  type="string",      sample="",          description="预约登记exams表id值<必填>")
+     * @ApiParams         (name="param[id]",                  type="string",      sample="",          description="预约登记exams表id值<必填>")
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="info",                       type="string",      required=true,      sample="返回成功", description="返回信息")
      * @ApiReturnParams   (name="info",                       type="string",      required=true,      sample="返回成功", description="返回信息")
@@ -93,7 +93,7 @@ class Inspectregister extends Base
         try{
         try{
             $sessionid = $_REQUEST['sessionid'];
             $sessionid = $_REQUEST['sessionid'];
             $examid = $_REQUEST['param']['id'];
             $examid = $_REQUEST['param']['id'];
-            $examinfo = DB::table('exams')->where('id',$examid)->field(['id','accession_num','exam_class','exam_sub_class','body_part','device','exam_datetime','anamnesis','family_ill','dept_id','charge','exam_project','illness_desc','phys_sign','clin_symp','remark','clin_diag','hopitalized_no','bed_no','patient_id'])->find();
+            $examinfo = DB::table('exams')->where('id',$examid)->field(['id','exam_status','accession_num','exam_class','exam_sub_class','body_part','device','exam_datetime','anamnesis','family_ill','dept_id','charge','exam_project','illness_desc','phys_sign','clin_symp','remark','clin_diag','hopitalized_no','bed_no','patient_id'])->find();
             $examinfo['family_ill'] = explode(',',$examinfo['family_ill']);
             $examinfo['family_ill'] = explode(',',$examinfo['family_ill']);
             $examinfo['anamnesis'] = explode(',',$examinfo['anamnesis']);
             $examinfo['anamnesis'] = explode(',',$examinfo['anamnesis']);
             $exam_class = DB::table('constant')->where('id',$examinfo['exam_class'])->field('constant_value as name')->cache(300)->find();
             $exam_class = DB::table('constant')->where('id',$examinfo['exam_class'])->field('constant_value as name')->cache(300)->find();
@@ -297,29 +297,29 @@ class Inspectregister extends Base
      * @ApiHeaders        (name="timestamp", type=string, required=true, description="请求头-时间戳s")
      * @ApiHeaders        (name="timestamp", type=string, required=true, description="请求头-时间戳s")
      * @ApiParams         (name="sessionid",                  type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="sessionid",                  type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                      type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                      type="string",      required=true,      description="参数json字符串")
-     * @ApiParams         (name="param.exam_id",                   type="string",      sample="",          description="预约登记exams表id值<必填>")
-     * @ApiParams         (name="param.pnum",              type="string",      sample="",          description="病历号<必填>")
-     * @ApiParams         (name="param.name",              type="string",      sample="",          description="患者姓名<选填>")
-     * @ApiParams         (name="param.phone",              type="string",      sample="",          description="手机号<选填>")
-     * @ApiParams         (name="param.sex",              type="string",      sample="",          description="性别<选填>")
-     * @ApiParams         (name="param.age",              type="string",      sample="",          description="年龄<选填>")
-     * @ApiParams         (name="param.anamnesis",            type="string",      sample="",          description="既往史<选填>")
-     * @ApiParams         (name="param.family_ill",           type="string",      sample="",          description="家族史<选填>")
-     * @ApiParams         (name="param.birthday",              type="string",      sample="",          description="生日<选填>")
-     * @ApiParams         (name="param.checknum",              type="string",      sample="",          description="检查号<必填>")
-     * @ApiParams         (name="param.checkclass",              type="string",      sample="",          description="检查类<选填>")
-     * @ApiParams         (name="param.checkchild",              type="string",      sample="",          description="检查子类<选填>")
-     * @ApiParams         (name="param.body",              type="string",      sample="",          description="检查部位<选填>")
-     * @ApiParams         (name="param.device",              type="string",      sample="",          description="检查设备<选填>")
-     * @ApiParams         (name="param.checktime",              type="string",      sample="",          description="检查时间<选填>")
-     * @ApiParams         (name="param.department",              type="string",      sample="",          description="检查科室(执行科室)<选填>")
-     * @ApiParams         (name="param.cost",              type="string",      sample="",          description="实际费用<选填>")
-     * @ApiParams         (name="param.project",              type="string",      sample="",          description="检查项目<选填>")
-     * @ApiParams         (name="param.illness",              type="string",      sample="",          description="主诉<选填>")
-     * @ApiParams         (name="param.phys_sign",              type="string",      sample="",          description="体征<选填>")
-     * @ApiParams         (name="param.clin_symp",            type="string",      sample="",          description="临床症状<选填>")
-     * @ApiParams         (name="param.remark",               type="string",      sample="",          description="备注<选填>")
-     * @ApiParams         (name="param.clin_diag",            type="string",      sample="",          description="临床诊断<选填>")
+     * @ApiParams         (name="param[exam_id]",                   type="string",      sample="",          description="预约登记exams表id值<必填>")
+     * @ApiParams         (name="param[pnum]",              type="string",      sample="",          description="病历号<必填>")
+     * @ApiParams         (name="param[name]",              type="string",      sample="",          description="患者姓名<选填>")
+     * @ApiParams         (name="param[phone]",              type="string",      sample="",          description="手机号<选填>")
+     * @ApiParams         (name="param[sex]",              type="string",      sample="",          description="性别<选填>")
+     * @ApiParams         (name="param[age]",              type="string",      sample="",          description="年龄<选填>")
+     * @ApiParams         (name="param[anamnesis]",            type="string",      sample="",          description="既往史<选填>")
+     * @ApiParams         (name="param[family_ill]",           type="string",      sample="",          description="家族史<选填>")
+     * @ApiParams         (name="param[birthday]",              type="string",      sample="",          description="生日<选填>")
+     * @ApiParams         (name="param[checknum]",              type="string",      sample="",          description="检查号<必填>")
+     * @ApiParams         (name="param[checkclass]",              type="string",      sample="",          description="检查类<选填>")
+     * @ApiParams         (name="param[checkchild]",              type="string",      sample="",          description="检查子类<选填>")
+     * @ApiParams         (name="param[body]",              type="string",      sample="",          description="检查部位<选填>")
+     * @ApiParams         (name="param[device]",              type="string",      sample="",          description="检查设备<选填>")
+     * @ApiParams         (name="param[checktime]",              type="string",      sample="",          description="检查时间<选填>")
+     * @ApiParams         (name="param[department]",              type="string",      sample="",          description="检查科室(执行科室)<选填>")
+     * @ApiParams         (name="param[cost]",              type="string",      sample="",          description="实际费用<选填>")
+     * @ApiParams         (name="param[project]",              type="string",      sample="",          description="检查项目<选填>")
+     * @ApiParams         (name="param[illness]",              type="string",      sample="",          description="主诉<选填>")
+     * @ApiParams         (name="param[phys_sign]",              type="string",      sample="",          description="体征<选填>")
+     * @ApiParams         (name="param[clin_symp]",            type="string",      sample="",          description="临床症状<选填>")
+     * @ApiParams         (name="param[remark]",               type="string",      sample="",          description="备注<选填>")
+     * @ApiParams         (name="param[clin_diag]",            type="string",      sample="",          description="临床诊断<选填>")
      * @ApiReturnParams   (name="status",                     type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="status",                     type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="code",                       type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="code",                       type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="msg",                       type="integer",     required=true,      sample="0", description="返回消息")
      * @ApiReturnParams   (name="msg",                       type="integer",     required=true,      sample="0", description="返回消息")
@@ -367,7 +367,10 @@ class Inspectregister extends Base
             }
             }
             $exam_info = array();
             $exam_info = array();
             if(isset($param['exam_id']) && !empty($param['exam_id'])){
             if(isset($param['exam_id']) && !empty($param['exam_id'])){
-                $pid = DB::table('exams')->where('id',$param['exam_id'])->field('patient_id')->find();
+                $pid = DB::table('exams')->where('id',$param['exam_id'])->field('patient_id,exam_status')->find();
+                if($pid['exam_status'] >= 3){
+                    return json_encode(['status'=>'fail','code'=>'1130','msg'=>'已经检查完毕,不允许在此修改']);
+                }
                 //存在并且有值 则修改
                 //存在并且有值 则修改
                 $patient = DB::table('patient_infos')->where('temp_patient_id',$pid['patient_id'])->update($patient_info);
                 $patient = DB::table('patient_infos')->where('temp_patient_id',$pid['patient_id'])->update($patient_info);
             }else{
             }else{

+ 3 - 4
application/inter/controller/Login.php

@@ -31,11 +31,10 @@ class Login extends Controller
      * @ApiHeaders        (name="sign", type="string", required=true, description="请求头-校验key")
      * @ApiHeaders        (name="sign", type="string", required=true, description="请求头-校验key")
      * @ApiHeaders        (name="nonce", type="string", required=true, description="请求头-随机数")
      * @ApiHeaders        (name="nonce", type="string", required=true, description="请求头-随机数")
      * @ApiHeaders        (name="timestamp", type=string, required=true, description="请求头-时间戳s")
      * @ApiHeaders        (name="timestamp", type=string, required=true, description="请求头-时间戳s")
-     * @ApiParams         (name="sessionid",                 type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
-     * @ApiParams         (name="param.userName",                  type="string",      sample="",          description="用户账号<必填>")
-     * @ApiParams         (name="param.pwd",                  type="string",      sample="",          description="用户密码<必填>")
-     * @ApiParams         (name="param.capture",                  type="string",      sample="",          description="验证码<选填>")
+     * @ApiParams         (name="param[userName]",                  type="string",      sample="",          description="用户账号<必填>")
+     * @ApiParams         (name="param[pwd]",                  type="string",      sample="",          description="用户密码<必填>")
+     * @ApiParams         (name="param[capture]",                  type="string",      sample="",          description="验证码<选填>")
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="info",                       type="string",      required=true,      sample="返回成功", description="返回信息")
      * @ApiReturnParams   (name="info",                       type="string",      required=true,      sample="返回成功", description="返回信息")

+ 3 - 3
application/inter/controller/Messages.php

@@ -21,8 +21,8 @@ class Messages extends Base
      * @ApiHeaders        (name="timestamp", type=string, required=true, description="请求头-时间戳s")
      * @ApiHeaders        (name="timestamp", type=string, required=true, description="请求头-时间戳s")
      * @ApiParams         (name="sessionid",                 type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="sessionid",                 type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
-     * @ApiParams         (name="param.page",                 type="string",      required=true,      description="当前页数<必填>")
-     * @ApiParams         (name="param.number",                  type="string",      sample="",          description="每页条数<必填>")
+     * @ApiParams         (name="param[page]",                 type="string",      required=true,      description="当前页数<必填>")
+     * @ApiParams         (name="param[number]",                  type="string",      sample="",          description="每页条数<必填>")
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="num",                      type="integer",     required=true,      sample="0", description="所有消息条数")
      * @ApiReturnParams   (name="num",                      type="integer",     required=true,      sample="0", description="所有消息条数")
@@ -110,7 +110,7 @@ class Messages extends Base
      * @ApiHeaders        (name="timestamp", type=string, required=true, description="请求头-时间戳s")
      * @ApiHeaders        (name="timestamp", type=string, required=true, description="请求头-时间戳s")
      * @ApiParams         (name="sessionid",                 type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="sessionid",                 type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
-     * @ApiParams         (name="param.id",                 type="string",      required=true,      description="消息所属id<必填>")
+     * @ApiParams         (name="param[id]",                 type="string",      required=true,      description="消息所属id<必填>")
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="info",                       type="string",      required=true,      sample="返回成功", description="返回信息")
      * @ApiReturnParams   (name="info",                       type="string",      required=true,      sample="返回成功", description="返回信息")

+ 7 - 7
application/inter/controller/Reciveremote.php

@@ -25,13 +25,13 @@ class Reciveremote extends Base
  * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
  * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
  * @ApiParams         (name="page",                 type="string",      required=true,      description="当前页")
  * @ApiParams         (name="page",                 type="string",      required=true,      description="当前页")
  * @ApiParams         (name="num",                 type="string",      required=true,      description="每页显示条数")
  * @ApiParams         (name="num",                 type="string",      required=true,      description="每页显示条数")
- * @ApiParams         (name="param.patient_num",        type="string",      sample="",          description="预约登记exams表id值<选填>")
- * @ApiParams         (name="param.exam_class",            type="string",      sample="",          description="检查类<选填>")
- * @ApiParams         (name="param.name",           type="string",      sample="",          description="患者姓名<选填>")
- * @ApiParams         (name="param.applicationtime",   type="string",      sample="",          description="申请时间<选填>")
- * @ApiParams         (name="param.is_urgent",           type="string",      sample="",          description="是否急诊<选填>")
- * @ApiParams         (name="param.report_result",                  type="string",      sample="",          description="检查结果<选填>")
- * @ApiParams         (name="param.exam_status",                  type="string",      sample="",          description="检查状态<选填>")
+ * @ApiParams         (name="param[patient_num]",        type="string",      sample="",          description="预约登记exams表id值<选填>")
+ * @ApiParams         (name="param[exam_class]",            type="string",      sample="",          description="检查类<选填>")
+ * @ApiParams         (name="param[name]",           type="string",      sample="",          description="患者姓名<选填>")
+ * @ApiParams         (name="param[applicationtime]",   type="string",      sample="",          description="申请时间<选填>")
+ * @ApiParams         (name="param[is_urgent]",           type="string",      sample="",          description="是否急诊<选填>")
+ * @ApiParams         (name="param[report_result]",                  type="string",      sample="",          description="检查结果<选填>")
+ * @ApiParams         (name="param[exam_status]",                  type="string",      sample="",          description="检查状态<选填>")
  * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
  * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
  * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
  * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
  * @ApiReturnParams   (name="info",                       type="string",      required=true,      sample="返回成功", description="返回信息")
  * @ApiReturnParams   (name="info",                       type="string",      required=true,      sample="返回成功", description="返回信息")

+ 7 - 7
application/inter/controller/Registerlist.php

@@ -24,11 +24,11 @@ class Registerlist extends Base
      * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="page",                 type="string",      required=true,      description="当前页")
      * @ApiParams         (name="page",                 type="string",      required=true,      description="当前页")
      * @ApiParams         (name="num",                 type="string",      required=true,      description="每页显示条数")
      * @ApiParams         (name="num",                 type="string",      required=true,      description="每页显示条数")
-     * @ApiParams         (name="param.patient_num",        type="string",      sample="",          description="预约登记exams表id值<选填>")
-     * @ApiParams         (name="param.accession_num",            type="string",      sample="",          description="检查号<选填>")
-     * @ApiParams         (name="param.name",           type="string",      sample="",          description="患者姓名<选填>")
-     * @ApiParams         (name="param.exam_datetime",   type="string",      sample="",          description="检查时间<选填>")
-     * @ApiParams         (name="param.exam_status",                  type="string",      sample="",          description="检查状态<选填>")
+     * @ApiParams         (name="param[patient_num]",        type="string",      sample="",          description="预约登记exams表id值<选填>")
+     * @ApiParams         (name="param[accession_num]",            type="string",      sample="",          description="检查号<选填>")
+     * @ApiParams         (name="param[name]",           type="string",      sample="",          description="患者姓名<选填>")
+     * @ApiParams         (name="param[exam_datetime]",   type="string",      sample="",          description="检查时间<选填>")
+     * @ApiParams         (name="param[exam_status]",                  type="string",      sample="",          description="检查状态<选填>")
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="info",                       type="string",      required=true,      sample="返回成功", description="返回信息")
      * @ApiReturnParams   (name="info",                       type="string",      required=true,      sample="返回成功", description="返回信息")
@@ -96,8 +96,8 @@ class Registerlist extends Base
             $num =  $_REQUEST['num'];
             $num =  $_REQUEST['num'];
             $fnum = ($page-1)*$num;
             $fnum = ($page-1)*$num;
             $limit = " limit ".$fnum.",".$num;
             $limit = " limit ".$fnum.",".$num;
-            log::record("SELECT e.id,e.is_remote,e.study_id,e.patient_num,e.institution_id,e.exam_datetime,e.exam_project,e.exam_status,p.name,p.sex,p.age from exams as e ,patient_infos as p where e.institution_id='".$doctor['institution_id']."' and p.id=e.patient_id".$where);
-            $sql = "SELECT e.id,e.is_remote,e.study_id,e.patient_num,e.institution_id,e.exam_datetime,e.exam_project,e.exam_status,p.name,p.sex,p.age from exams as e ,patient_infos as p where e.institution_id='".$doctor['institution_id']."' and p.id=e.patient_id".$where." order by e.createdAt desc,e.urgent desc ".$limit;
+            log::record("SELECT e.id,e.is_remote,e.study_id,e.patient_num,e.institution_id,e.exam_datetime,e.exam_class,e.exam_project,e.exam_status,p.name,p.sex,p.age from exams as e ,patient_infos as p where e.institution_id='".$doctor['institution_id']."' and p.id=e.patient_id".$where);
+            $sql = "SELECT e.id,e.is_remote,e.study_id,e.patient_num,e.institution_id,e.exam_datetime,e.exam_class,e.exam_project,e.exam_status,p.name,p.sex,p.age from exams as e ,patient_infos as p where e.institution_id='".$doctor['institution_id']."' and p.id=e.patient_id".$where." order by e.createdAt desc,e.urgent desc ".$limit;
             $list = DB::query($sql);
             $list = DB::query($sql);
             foreach ($list as $k => $v) {
             foreach ($list as $k => $v) {
                 $report_info = DB::table('report')->where('exam_id',$v['id'])->field(['report_datetime','report_doctor_id'])->find();
                 $report_info = DB::table('report')->where('exam_id',$v['id'])->field(['report_datetime','report_doctor_id'])->find();

+ 15 - 12
application/inter/controller/Report.php

@@ -26,13 +26,13 @@ class Report extends Base
      * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="page",                 type="string",      required=true,      description="当前页")
      * @ApiParams         (name="page",                 type="string",      required=true,      description="当前页")
      * @ApiParams         (name="num",                 type="string",      required=true,      description="每页显示条数")
      * @ApiParams         (name="num",                 type="string",      required=true,      description="每页显示条数")
-     * @ApiParams         (name="param.name",           type="string",      sample="",          description="患者姓名<选填>")
-     * @ApiParams         (name="param.patient_num",        type="string",      sample="",          description="预约登记exams表id值<选填>")
-     * @ApiParams         (name="param.accession_num",            type="string",      sample="",          description="检查号<选填>")
-     * @ApiParams         (name="param.exam_status",                  type="string",      sample="",          description="检查状态<选填>")
-     * @ApiParams         (name="param.exam_class",            type="string",      sample="",          description="检查类<选填>")
-     * @ApiParams         (name="param.exam_datetime",   type="string",      sample="",          description="申请时间<选填>")
-     * @ApiParams         (name="param.urgent",           type="string",      sample="",          description="是否急诊<选填>")
+     * @ApiParams         (name="param[name]",           type="string",      sample="",          description="患者姓名<选填>")
+     * @ApiParams         (name="param[patient_num]",        type="string",      sample="",          description="预约登记exams表id值<选填>")
+     * @ApiParams         (name="param[accession_num]",            type="string",      sample="",          description="检查号<选填>")
+     * @ApiParams         (name="param[exam_status]",                  type="string",      sample="",          description="检查状态<选填>")
+     * @ApiParams         (name="param[exam_class]",            type="string",      sample="",          description="检查类<选填>")
+     * @ApiParams         (name="param[exam_datetime]",   type="string",      sample="",          description="申请时间<选填>")
+     * @ApiParams         (name="param[urgent]",           type="string",      sample="",          description="是否急诊<选填>")
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="info",                       type="string",      required=true,      sample="返回成功", description="返回信息")
      * @ApiReturnParams   (name="info",                       type="string",      required=true,      sample="返回成功", description="返回信息")
@@ -117,6 +117,13 @@ class Report extends Base
                                 $where .= " and a.exam_status=".$v;
                                 $where .= " and a.exam_status=".$v;
                             }
                             }
                             break;
                             break;
+                        case 'exam_class' :
+                            if(empty($v)){
+                                break;
+                            }
+                            $ex = implode('\',\'',$v);
+                            $where .= " and a.exam_class in ('".$ex."')";
+                            break;
                         default :
                         default :
                             if(empty($v)){
                             if(empty($v)){
                                 break;
                                 break;
@@ -193,11 +200,7 @@ class Report extends Base
                 }
                 }
                 $list['institution'] = $institution;
                 $list['institution'] = $institution;
             }*/
             }*/
-            if($list){
-                return json_encode(['status'=>'ok','code'=>'0000','count'=>$count[0]['count(1)'],'info'=>$list,'sessionid'=>$sessionid]);
-            }else{
-                return json_encode(['status'=>'fail','code'=>'1020','count'=>$count[0]['count(1)'],'msg'=>'没有数据','sessionid'=>$sessionid]);
-            }
+            return json_encode(['status'=>'ok','code'=>'0000','count'=>$count[0]['count(1)'],'info'=>$list,'sessionid'=>$sessionid]);
         }catch(\Exception $e){
         }catch(\Exception $e){
             return json_encode(['status'=>'fail','code'=>'2000','msg'=>$e->getMessage()]);
             return json_encode(['status'=>'fail','code'=>'2000','msg'=>$e->getMessage()]);
         }
         }

+ 8 - 8
application/inter/controller/Template.php

@@ -120,7 +120,7 @@ class Template extends Base
      * @ApiHeaders        (name="timestamp", type=string, required=true, description="请求头-时间戳s")
      * @ApiHeaders        (name="timestamp", type=string, required=true, description="请求头-时间戳s")
      * @ApiParams         (name="sessionid",                 type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="sessionid",                 type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
-     * @ApiParams         (name="param.id",        type="string",      sample="",          description="模板id<必填>")
+     * @ApiParams         (name="param[id]",        type="string",      sample="",          description="模板id<必填>")
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="info",                       type="string",      required=true,      sample="返回成功", description="返回信息")
      * @ApiReturnParams   (name="info",                       type="string",      required=true,      sample="返回成功", description="返回信息")
@@ -158,11 +158,11 @@ class Template extends Base
      * @ApiHeaders        (name="timestamp", type=string, required=true, description="请求头-时间戳s")
      * @ApiHeaders        (name="timestamp", type=string, required=true, description="请求头-时间戳s")
      * @ApiParams         (name="sessionid",                 type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="sessionid",                 type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
-     * @ApiParams         (name="param.label",        type="string",      sample="",          description="模板标题<必填>")
-     * @ApiParams         (name="param.id",        type="string",      sample="",          description="模板id<二级模板必填>")
-     * @ApiParams         (name="param.impression",        type="string",      sample="",          description="影响所见<二级模板必填>")
-     * @ApiParams         (name="param.description",        type="string",      sample="",          description="意见建议<二级模板必填>")
-     * @ApiParams         (name="param.exam_class_id",        type="string",      sample="",          description="模板归属检查类id<必填>")
+     * @ApiParams         (name="param[label]",        type="string",      sample="",          description="模板标题<必填>")
+     * @ApiParams         (name="param[id]",        type="string",      sample="",          description="模板id<二级模板必填>")
+     * @ApiParams         (name="param[impression]",        type="string",      sample="",          description="影响所见<二级模板必填>")
+     * @ApiParams         (name="param[description]",        type="string",      sample="",          description="意见建议<二级模板必填>")
+     * @ApiParams         (name="param[exam_class_id]",        type="string",      sample="",          description="模板归属检查类id<必填>")
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="info",                       type="string",      required=true,      sample="返回成功", description="返回信息")
      * @ApiReturnParams   (name="info",                       type="string",      required=true,      sample="返回成功", description="返回信息")
@@ -222,8 +222,8 @@ class Template extends Base
      * @ApiHeaders        (name="timestamp", type=string, required=true, description="请求头-时间戳s")
      * @ApiHeaders        (name="timestamp", type=string, required=true, description="请求头-时间戳s")
      * @ApiParams         (name="sessionid",                 type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="sessionid",                 type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
-     * @ApiParams         (name="param.id",        type="string",      sample="",          description="模板id<必填>")
-     * @ApiParams         (name="param.label",        type="string",      sample="",          description="模板标题<必填>")
+     * @ApiParams         (name="param[id]",        type="string",      sample="",          description="模板id<必填>")
+     * @ApiParams         (name="param[label]",        type="string",      sample="",          description="模板标题<必填>")
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="msg",                       type="string",      required=true,      sample="返回成功", description="返回消息")
      * @ApiReturnParams   (name="msg",                       type="string",      required=true,      sample="返回成功", description="返回消息")

+ 14 - 14
application/inter/controller/Writereport.php

@@ -26,8 +26,8 @@ class Writereport extends Base
      * @ApiParams         (name="sessionid",                 type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="sessionid",                 type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="is_remote",                     type="string",      required=true,      description="是否为远程列表进入")
      * @ApiParams         (name="is_remote",                     type="string",      required=true,      description="是否为远程列表进入")
-     * @ApiParams         (name="param.id",        type="string",      sample="",          description="exams表id值<必填>")
-     * @ApiParams         (name="param.images",        type="string",      sample="",          description="影像图片<选填>")
+     * @ApiParams         (name="param[id]",        type="string",      sample="",          description="exams表id值<必填>")
+     * @ApiParams         (name="param[images]",        type="string",      sample="",          description="影像图片<选填>")
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="info",                       type="string",      required=true,      sample="返回成功", description="返回信息")
      * @ApiReturnParams   (name="info",                       type="string",      required=true,      sample="返回成功", description="返回信息")
@@ -142,15 +142,15 @@ class Writereport extends Base
      * @ApiParams         (name="sessionid",                 type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="sessionid",                 type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="is_remote",                     type="string",      required=true,      description="是否为远程列表进入")
      * @ApiParams         (name="is_remote",                     type="string",      required=true,      description="是否为远程列表进入")
-     * @ApiParams         (name="param.id",        type="string",      sample="",          description="exams表id值<必填>")
-     * @ApiParams         (name="param.pid",        type="string",      sample="",          description="患者id值<必填>")
-     * @ApiParams         (name="param.name",        type="string",      sample="",          description="患者姓名<必填>")
-     * @ApiParams         (name="param.age",        type="string",      sample="",          description="患者年龄<必填>")
-     * @ApiParams         (name="param.sex",        type="string",      sample="",          description="患者性别<必填>")
-     * @ApiParams         (name="param.impression",        type="string",      sample="",          description="影响所见<必填>")
-     * @ApiParams         (name="param.description",        type="string",      sample="",          description="意见建议<必填>")
-     * @ApiParams         (name="param.film_type",        type="string",      sample="",          description="胶片<必填>")
-     * @ApiParams         (name="param.r_result",        type="string",      sample="",          description="检查结果<必填>")
+     * @ApiParams         (name="param[id]",        type="string",      sample="",          description="exams表id值<必填>")
+     * @ApiParams         (name="param[pid]",        type="string",      sample="",          description="患者id值<必填>")
+     * @ApiParams         (name="param[name]",        type="string",      sample="",          description="患者姓名<必填>")
+     * @ApiParams         (name="param[age]",        type="string",      sample="",          description="患者年龄<必填>")
+     * @ApiParams         (name="param[sex]",        type="string",      sample="",          description="患者性别<必填>")
+     * @ApiParams         (name="param[impression]",        type="string",      sample="",          description="影响所见<必填>")
+     * @ApiParams         (name="param[description]",        type="string",      sample="",          description="意见建议<必填>")
+     * @ApiParams         (name="param[film_type]",        type="string",      sample="",          description="胶片<必填>")
+     * @ApiParams         (name="param[r_result]",        type="string",      sample="",          description="检查结果<必填>")
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="msg",                       type="string",      required=true,      sample="返回成功", description="返回消息")
      * @ApiReturnParams   (name="msg",                       type="string",      required=true,      sample="返回成功", description="返回消息")
@@ -410,9 +410,9 @@ class Writereport extends Base
      * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="param",                     type="string",      required=true,      description="参数json字符串")
      * @ApiParams         (name="is_remote",                     type="string",      required=true,      description="是否为远程列表进入")
      * @ApiParams         (name="is_remote",                     type="string",      required=true,      description="是否为远程列表进入")
      * @ApiParams         (name="id",        type="string",      sample="",          description="exams表id值<必填>")
      * @ApiParams         (name="id",        type="string",      sample="",          description="exams表id值<必填>")
-     * @ApiParams         (name="param.impression",        type="string",      sample="",          description="检查所见<必填>")
-     * @ApiParams         (name="param.description",        type="string",      sample="",          description="意见建议<必填>")
-     * @ApiParams         (name="param.r_result",        type="string",      sample="",          description="检查结果<必填>")
+     * @ApiParams         (name="param[impression]",        type="string",      sample="",          description="检查所见<必填>")
+     * @ApiParams         (name="param[description]",        type="string",      sample="",          description="意见建议<必填>")
+     * @ApiParams         (name="param[r_result]",        type="string",      sample="",          description="检查结果<必填>")
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="status",                      type="integer", required=true, sample="0", description="返回码 fail 失败 ok成功"))
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="code",                      type="integer",     required=true,      sample="0", description="返回状态码")
      * @ApiReturnParams   (name="msg",                       type="string",      required=true,      sample="返回成功", description="返回消息")
      * @ApiReturnParams   (name="msg",                       type="string",      required=true,      sample="返回成功", description="返回消息")

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 212 - 212
public/api.html


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio