lgy 6 år sedan
förälder
incheckning
7100d0d71e
2 ändrade filer med 36 tillägg och 36 borttagningar
  1. 34 34
      .idea/workspace.xml
  2. 2 2
      application/inter/controller/Writereport.php

+ 34 - 34
.idea/workspace.xml

@@ -50,28 +50,28 @@
       <file leaf-file-name="Writereport.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.44347826">
-              <caret line="615" column="5" selection-start-line="615" selection-start-column="5" selection-end-line="615" selection-end-column="5" />
+            <state vertical-scroll-proportion="0.32869565">
+              <caret line="282" column="8" selection-start-line="282" selection-start-column="8" selection-end-line="282" selection-end-column="8" />
               <folding>
                 <element signature="e#260#2235#0#PHP" expanded="false" />
                 <element signature="e#5629#6944#0#PHP" expanded="false" />
                 <element signature="e#6949#7552#0#PHP" expanded="false" />
                 <element signature="e#7557#10222#0#PHP" expanded="false" />
-                <marker date="1541054804855" expanded="true" signature="6390:6841" placeholder="..." />
-                <marker date="1541054804855" expanded="true" signature="8560:10102" placeholder="..." />
-                <marker date="1541054804855" expanded="true" signature="8678:10102" placeholder="..." />
-                <marker date="1541054804855" expanded="true" signature="8796:10102" placeholder="..." />
-                <marker date="1541054804855" expanded="true" signature="8913:10102" placeholder="..." />
-                <marker date="1541054804855" expanded="true" signature="9030:10102" placeholder="..." />
-                <marker date="1541054804855" expanded="true" signature="9154:10102" placeholder="..." />
-                <marker date="1541054804855" expanded="true" signature="9279:10102" placeholder="..." />
-                <marker date="1541054804855" expanded="true" signature="9400:10102" placeholder="..." />
-                <marker date="1541054804855" expanded="true" signature="9522:10102" placeholder="..." />
-                <marker date="1541054804855" expanded="true" signature="19316:19882" placeholder="..." />
-                <marker date="1541054804855" expanded="true" signature="22544:23365" placeholder="..." />
-                <marker date="1541054804855" expanded="true" signature="22668:23365" placeholder="..." />
-                <marker date="1541054804855" expanded="true" signature="22793:23365" placeholder="..." />
-                <marker date="1541054804855" expanded="true" signature="22915:23365" placeholder="..." />
+                <marker date="1541064875727" expanded="true" signature="6390:6841" placeholder="..." />
+                <marker date="1541064875727" expanded="true" signature="8560:10102" placeholder="..." />
+                <marker date="1541064875727" expanded="true" signature="8678:10102" placeholder="..." />
+                <marker date="1541064875727" expanded="true" signature="8796:10102" placeholder="..." />
+                <marker date="1541064875727" expanded="true" signature="8913:10102" placeholder="..." />
+                <marker date="1541064875727" expanded="true" signature="9030:10102" placeholder="..." />
+                <marker date="1541064875727" expanded="true" signature="9154:10102" placeholder="..." />
+                <marker date="1541064875727" expanded="true" signature="9279:10102" placeholder="..." />
+                <marker date="1541064875727" expanded="true" signature="9400:10102" placeholder="..." />
+                <marker date="1541064875727" expanded="true" signature="9522:10102" placeholder="..." />
+                <marker date="1541064875727" expanded="true" signature="19448:20014" placeholder="..." />
+                <marker date="1541064875727" expanded="true" signature="22676:23497" placeholder="..." />
+                <marker date="1541064875727" expanded="true" signature="22800:23497" placeholder="..." />
+                <marker date="1541064875727" expanded="true" signature="22925:23497" placeholder="..." />
+                <marker date="1541064875727" expanded="true" signature="23047:23497" placeholder="..." />
               </folding>
             </state>
           </provider>
@@ -822,28 +822,28 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44347826">
-          <caret line="615" column="5" selection-start-line="615" selection-start-column="5" selection-end-line="615" selection-end-column="5" />
+        <state vertical-scroll-proportion="0.32869565">
+          <caret line="282" column="8" selection-start-line="282" selection-start-column="8" selection-end-line="282" selection-end-column="8" />
           <folding>
             <element signature="e#260#2235#0#PHP" expanded="false" />
             <element signature="e#5629#6944#0#PHP" expanded="false" />
             <element signature="e#6949#7552#0#PHP" expanded="false" />
             <element signature="e#7557#10222#0#PHP" expanded="false" />
-            <marker date="1541054804855" expanded="true" signature="6390:6841" placeholder="..." />
-            <marker date="1541054804855" expanded="true" signature="8560:10102" placeholder="..." />
-            <marker date="1541054804855" expanded="true" signature="8678:10102" placeholder="..." />
-            <marker date="1541054804855" expanded="true" signature="8796:10102" placeholder="..." />
-            <marker date="1541054804855" expanded="true" signature="8913:10102" placeholder="..." />
-            <marker date="1541054804855" expanded="true" signature="9030:10102" placeholder="..." />
-            <marker date="1541054804855" expanded="true" signature="9154:10102" placeholder="..." />
-            <marker date="1541054804855" expanded="true" signature="9279:10102" placeholder="..." />
-            <marker date="1541054804855" expanded="true" signature="9400:10102" placeholder="..." />
-            <marker date="1541054804855" expanded="true" signature="9522:10102" placeholder="..." />
-            <marker date="1541054804855" expanded="true" signature="19316:19882" placeholder="..." />
-            <marker date="1541054804855" expanded="true" signature="22544:23365" placeholder="..." />
-            <marker date="1541054804855" expanded="true" signature="22668:23365" placeholder="..." />
-            <marker date="1541054804855" expanded="true" signature="22793:23365" placeholder="..." />
-            <marker date="1541054804855" expanded="true" signature="22915:23365" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="6390:6841" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="8560:10102" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="8678:10102" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="8796:10102" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="8913:10102" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="9030:10102" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="9154:10102" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="9279:10102" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="9400:10102" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="9522:10102" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="19448:20014" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="22676:23497" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="22800:23497" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="22925:23497" placeholder="..." />
+            <marker date="1541064875727" expanded="true" signature="23047:23497" placeholder="..." />
           </folding>
         </state>
       </provider>

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

@@ -288,7 +288,7 @@ class Writereport extends Base
         $exam = $_REQUEST['exam_class'];
         //第一级  公共模板
         $info = $this->get_template(1,$doctor['id'],$exam);
-        echo json_encode($info);
+        return json_encode(['status'=>'ok','code'=>'0000','info'=>$info,'sessionid'=>$sessionid]);
     }
     /**
      * 私有模板列表
@@ -316,7 +316,7 @@ class Writereport extends Base
         $exam = $_REQUEST['exam_class'];
         //第一级  公共模板
         $info = $this->get_template(2,$doctor['id'],$exam);
-        echo json_encode($info);
+        return json_encode(['status'=>'ok','code'=>'0000','info'=>$info,'sessionid'=>$sessionid]);
     }
 
     public function get_template($public,$id,$exam){