xiugai yunxu shenqing zhuangtai

.idea/workspace.xml

@@ -32,10 +32,10 @@
           </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="false">
         <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.5008696">
+            <state vertical-scroll-proportion="-36.967743">
               <caret line="120" column="43" selection-start-line="120" selection-start-column="43" selection-end-line="120" selection-end-column="43" />
               <folding>
                 <marker date="1543993938878" expanded="true" signature="8355:8654" placeholder="SELECT a.id,... exams" />
@@ -99,11 +99,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Application.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name="Application.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-2.548387">
-              <caret line="154" column="36" selection-start-line="154" selection-start-column="36" selection-end-line="154" selection-end-column="36" />
+            <state vertical-scroll-proportion="0.17565218">
+              <caret line="161" column="30" selection-start-line="161" selection-start-column="30" selection-end-line="161" selection-end-column="30" />
               <folding />
             </state>
           </provider>
@@ -112,8 +112,8 @@
       <file leaf-file-name="Verify.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/common/library/Verify.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-15.290322">
-              <caret line="142" column="1" selection-start-line="142" selection-start-column="1" selection-end-line="142" selection-end-column="1" />
+            <state vertical-scroll-proportion="-4.354839">
+              <caret line="128" column="5" selection-start-line="128" selection-start-column="5" selection-end-line="128" selection-end-column="5" />
               <folding />
             </state>
           </provider>
@@ -176,7 +176,6 @@
         <option value="$PROJECT_DIR$/../yuanchengpasc/application/database.php" />
         <option value="$PROJECT_DIR$/../../shenqingxinxi/application/admin/controller/Openapplication.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Reciveremote.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Application.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Index.php" />
         <option value="$PROJECT_DIR$/application/common/controller/Version.php" />
         <option value="$PROJECT_DIR$/application/database.php" />
@@ -187,6 +186,7 @@
         <option value="$PROJECT_DIR$/application/inter/controller/Dcquery.php" />
         <option value="$PROJECT_DIR$/application/common/versionsql/Version2" />
         <option value="$PROJECT_DIR$/application/inter/controller/Report.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Application.php" />
       </list>
     </option>
   </component>
@@ -680,7 +680,7 @@
         <state vertical-scroll-proportion="0.0">
           <caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
           <folding>
-            <element signature="e#6#80#0#PHP" expanded="true" />
+            <element signature="e#6#80#0#PHP" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -690,7 +690,7 @@
         <state vertical-scroll-proportion="-39.741936">
           <caret line="56" column="28" selection-start-line="56" selection-start-column="28" selection-end-line="56" selection-end-column="28" />
           <folding>
-            <element signature="e#36#62#0#PHP" expanded="true" />
+            <element signature="e#36#62#0#PHP" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -748,14 +748,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="-9.225806">
-          <caret line="116" column="9" selection-start-line="116" selection-start-column="9" selection-end-line="116" selection-end-column="9" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/manage/controller/Remoteapplication.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-1.4921739">
@@ -772,22 +764,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-2.548387">
-          <caret line="154" column="36" selection-start-line="154" selection-start-column="36" selection-end-line="154" selection-end-column="36" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/library/Verify.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-15.290322">
-          <caret line="142" column="1" selection-start-line="142" selection-start-column="1" selection-end-line="142" selection-end-column="1" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Reciveremote.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-14.903226">
@@ -799,6 +775,17 @@
         </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="-36.967743">
+          <caret line="120" column="43" selection-start-line="120" selection-start-column="43" selection-end-line="120" selection-end-column="43" />
+          <folding>
+            <marker date="1543993938878" expanded="true" signature="8355:8654" placeholder="SELECT a.id,... exams" />
+            <marker date="1543993938878" expanded="true" signature="8738:8866" placeholder="SELECT count... exams" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Registerlist.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-7.903226">
@@ -811,14 +798,27 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Report.php">
+    <entry file="file://$PROJECT_DIR$/application/manage/controller/Doctors.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5008696">
-          <caret line="120" column="43" selection-start-line="120" selection-start-column="43" selection-end-line="120" selection-end-column="43" />
-          <folding>
-            <marker date="1543993938878" expanded="true" signature="8355:8654" placeholder="SELECT a.id,... exams" />
-            <marker date="1543993938878" expanded="true" signature="8738:8866" placeholder="SELECT count... exams" />
-          </folding>
+        <state vertical-scroll-proportion="-9.225806">
+          <caret line="116" column="9" selection-start-line="116" selection-start-column="9" selection-end-line="116" selection-end-column="9" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/library/Verify.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-4.354839">
+          <caret line="128" column="5" selection-start-line="128" selection-start-column="5" selection-end-line="128" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Application.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.17565218">
+          <caret line="161" column="30" selection-start-line="161" selection-start-column="30" selection-end-line="161" selection-end-column="30" />
+          <folding />
         </state>
       </provider>
     </entry>

application/inter/controller/Application.php

@@ -158,9 +158,26 @@ class Application extends Base
             }
             $param = $_REQUEST['param'];
             $exam_info =  DB::table('exams')->where('id',$param['id'])->field('exam_status')->find();
-            if($exam_info['exam_status'] != 3 && $exam_info['exam_status'] != 5){
+            if($exam_info['exam_status'] != 3 && $exam_info['exam_status'] != 5 && $exam_info['exam_status'] != 8){
                 // 3 检查完毕 5已驳回
-                 return json_encode(['status'=>'fail','code'=>'1029','msg'=>'未到达申请的步骤，没有操作权限']);
+                switch($exam_info['exam_status']){
+                    case 1:
+                        $msg = '患者还未检查，请检查完毕后再进行远程申请';
+                        break;
+                    case 2:
+                        $msg = '影像未到达，不能发起远程申请';
+                        break;
+                    case 4:
+                        $msg = '已经发起了远程申请，请勿重复操作';
+                        break;
+                    case 9:
+                        $msg = '';
+                        break;
+                    default:
+                        $msg = '医师已经接受该远程申请，请耐心等待';
+                        break;
+                }
+                 return json_encode(['status'=>'fail','code'=>'1029','msg'=>$msg]);
             }
             Verify::applicationCheck($param);
             $application_info = array();