1111

.idea/workspace.xml

@@ -22,28 +22,37 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="Application.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
+      <file leaf-file-name="Index.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-1.516129">
-              <caret line="297" column="26" selection-start-line="297" selection-start-column="26" selection-end-line="297" selection-end-column="26" />
+            <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" />
               <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" />
+                <marker date="1540785264875" expanded="true" signature="2148:2192" placeholder="select count... templates" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="api.html" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/public/api.html">
+      <file leaf-file-name="Report.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.25565216">
-              <caret line="9403" column="120" selection-start-line="9403" selection-start-column="115" selection-end-line="9403" selection-end-column="120" />
+            <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" />
+              <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" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Doctors.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/manage/controller/Doctors.php">
+          <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" />
               <folding />
             </state>
           </provider>
@@ -54,7 +63,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/application/inter/controller/Index.php" />
         <option value="$PROJECT_DIR$/application/manage/view/doctors/index.html" />
         <option value="$PROJECT_DIR$/.git/config" />
         <option value="$PROJECT_DIR$/../yuanchengpasc/public/index.php" />
@@ -75,7 +83,6 @@
         <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/Writereport.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" />
@@ -86,6 +93,10 @@
         <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$/../../../bin/apache/apache2.4.23/conf/extra/httpd-vhosts.conf" />
+        <option value="$PROJECT_DIR$/../../yanzhengma.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Writereport.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Index.php" />
       </list>
     </option>
   </component>
@@ -419,41 +430,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/../yuanchengpasc/public/index.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6504348">
-          <caret line="17" column="0" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/public/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.15304348">
-          <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/public/router.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/application/route.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.34434783">
-          <caret line="17" column="57" selection-start-line="17" selection-start-column="57" selection-end-line="17" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/library/ValidateCode.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.29391304">
-          <caret line="126" column="29" selection-start-line="126" selection-start-column="29" selection-end-line="126" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/manage/view/login/index.html">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5743119">
@@ -559,20 +535,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/manage/controller/Doctors.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="225" column="14" selection-start-line="225" selection-start-column="8" selection-end-line="225" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/application/index/controller/Index.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="15" column="29" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/manage/controller/Index.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-1.3773913">
@@ -647,6 +609,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.44173914">
           <caret line="13" column="68" selection-start-line="13" selection-start-column="64" selection-end-line="13" selection-end-column="68" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -685,13 +648,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Messages.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-36.903225">
@@ -713,13 +669,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-4.967742">
-          <caret line="13" column="1" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Template.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.68869567">
@@ -734,13 +683,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.26782608">
-          <caret line="13" column="7" selection-start-line="13" selection-start-column="7" selection-end-line="13" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Operating.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.19652174">
@@ -765,12 +707,114 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/public/api.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.25565216">
-          <caret line="9403" column="120" selection-start-line="9403" selection-start-column="115" selection-end-line="9403" selection-end-column="120" />
+        <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>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/../../testmysql.php">
+      <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>
+      </provider>
+    </entry>
+    <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">
+        <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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../../bin/apache/apache2.4.23/conf/httpd.conf">
+      <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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../../bin/apache/apache2.4.23/conf/extra/httpd-vhosts.conf">
+      <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>
+      </provider>
+    </entry>
+    <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">
+        <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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../yanzhengma.php">
+      <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" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/library/UUIDs.php">
+      <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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/index/controller/Index.php">
+      <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" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-10.645162">
+          <caret line="214" column="18" selection-start-line="214" selection-start-column="18" selection-end-line="214" selection-end-column="18" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/manage/controller/Doctors.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-14.193548">
+          <caret line="238" column="40" selection-start-line="238" selection-start-column="23" selection-end-line="238" selection-end-column="40" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Index.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-4.354839">
+          <caret line="46" column="81" selection-start-line="46" selection-start-column="81" selection-end-line="46" selection-end-column="81" />
+          <folding>
+            <marker date="1540785264875" expanded="true" signature="2148:2192" placeholder="select count... templates" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
+      <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" />
+          <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" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

application/inter/controller/Writereport.php

@@ -187,7 +187,6 @@ class Writereport extends Base
                 }
             }
             $this->uuids = new UUIDs();
-            $id = $this->uuids->uuid16();
             //初步报告生成
             $film_type = isset($param['film_type']) ? $param['film_type'] : '';
             $exam_status = $this->get_exam_status($doctor['id'],7);
@@ -212,7 +211,9 @@ class Writereport extends Base
             $report_info = DB::table('report')->where('exam_id',$param['id'])->find();
             if($report_info){
                 $report = DB::table('report')->where('exam_id',$param['id'])->update($info);
+                $id = $report_info['id'];
             }else{
+                $id = $this->uuids->uuid16();
                 $info['id'] = $id;
                 $info['createdAt'] = date('Y-m-d H:i:s',time());
                 $report = DB::table('report')->insert($info);