Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/views/layout/components/Navbar.vue

@@ -274,10 +274,7 @@ export default {
       );
     },
     toClick() {
-      window.location.href = "https://testsso.sgjyun.com/help";
-    },
-    getCreatorName() {
-      getCreatorName().then(response => {});
+      window.location.href = "https://sso.kuyicloud.com/help";
     }
   },
   created() {
@@ -294,7 +291,6 @@ export default {
         }
       }
     });
-    this.getCreatorName();
   }
 };
 </script>

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -1232,7 +1232,7 @@
                           text="存在"
                           :checked="
                             isCheckBoxChecked(
-                              record.assessment_after_dislysis,
+                              record.predialysis,
                               'internal_fistula_tremor_ac',
                               1
                             )
@@ -1242,7 +1242,7 @@
                           text="减弱"
                           :checked="
                             isCheckBoxChecked(
-                              record.assessment_after_dislysis,
+                              record.predialysis,
                               'internal_fistula_tremor_ac',
                               2
                             )
@@ -1252,7 +1252,7 @@
                           text="无"
                           :checked="
                             isCheckBoxChecked(
-                              record.assessment_after_dislysis,
+                              record.predialysis,
                               'internal_fistula_tremor_ac',
                               3
                             )

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -13,14 +13,6 @@
           <span class="unit" v-if="weight_before != '0'">kg</span>
         </li>
 
-        <li v-if="isShow('前次透析后')">
-          <label>前次透析后: </label>
-          <span class="content" v-if="last_post_dialysis != '0'">{{
-            last_post_dialysis
-          }}</span>
-          <span class="unit" v-if="last_post_dialysis != '0'"></span>
-        </li>
-
         <li v-if="isShow('干体重')">
           <label>干体重 : </label>
           <span class="content" v-if="dry_weight != '0'">{{ dry_weight }}</span>
@@ -112,13 +104,7 @@
           <span class="content">{{ catheter }}</span>
           <span class="unit"></span>
         </li>
-        <li v-if="isShow('透析期间')">
-          <label>透析期间 : </label>
-          <span class="content" v-if="dialysis_interphase != '0'">{{
-            dialysis_interphase
-          }}</span>
-          <span class="unit" v-if="dialysis_interphase != '0'"></span>
-        </li>
+
         <li v-if="isShow('呼吸频率')">
           <label>呼吸频率 : </label>
           <span class="content" v-if="breathing_rate != '0'">{{
@@ -212,12 +198,28 @@
           }}</span>
           <span class="unit" v-if="temperature != '0'">℃</span>
         </li>
+
+        <li v-if="isShow('前次透析后症状')">
+          <label>前次透析后症状: </label>
+          <span class="content" v-if="last_post_dialysis != '0'">{{
+            last_post_dialysis
+          }}</span>
+          <span class="unit" v-if="last_post_dialysis != '0'"></span>
+        </li>
         <li v-if="isShow('透析前症状')">
           <label>透析前症状 : </label>
           <span class="content">{{ symptom_before_dialysis }}</span>
           <span class="unit"></span>
         </li>
 
+        <li v-if="isShow('透析期间')">
+          <label>透析期间 : </label>
+          <span class="content" v-if="dialysis_interphase != '0'">{{
+            dialysis_interphase
+          }}</span>
+          <span class="unit" v-if="dialysis_interphase != '0'"></span>
+        </li>
+
         <li v-if="isShow('透析机型号')">
           <label>透析机型号:</label>
           <span class="content" v-if="machine_type != '0'">

src/xt_pages/dialysis/details/index.vue

@@ -236,7 +236,7 @@
               <td>张三</td>
               <td>2018-90-09</td>
               <td>张三</td>
-              <td>88</td>
+              <td>888</td>
             </tr>
             </tbody>
           </table>

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -632,10 +632,10 @@
                 <td></td>
                 <td width="95">透析器凝血:</td>
                 <td width="220">
-                  <label-box :isChecked="afterdialysis.txqnx==0?true:false" showValue='0 级'></label-box>
-                  <label-box :isChecked="afterdialysis.txqnx==1?true:false" showValue='Ⅰ 级'></label-box>
-                  <label-box :isChecked="afterdialysis.txqnx==2?true:false" showValue='Ⅱ 级'></label-box>
-                  <label-box :isChecked="afterdialysis.txqnx==3?true:false" showValue='Ⅲ 级'></label-box>
+                  <label-box :isChecked="afterdialysis.dialyzer==1?true:false" showValue='0 级'></label-box>
+                  <label-box :isChecked="afterdialysis.dialyzer==2?true:false" showValue='Ⅰ 级'></label-box>
+                  <label-box :isChecked="afterdialysis.dialyzer==3?true:false" showValue='Ⅱ 级'></label-box>
+                  <label-box :isChecked="afterdialysis.dialyzer==4?true:false" showValue='Ⅲ 级'></label-box>
                 </td>
               </tr>
               </tbody>
@@ -663,12 +663,14 @@
                 <td width="10"></td>
                 <td width="105">压迫后内瘘震颤:</td>
                 <td width="140">
-                  <label-box :isChecked="afterdialysis.internal_fistula_tremor_ac==1?true:false"
-                             showValue='存在'></label-box>
-                  <label-box :isChecked="afterdialysis.internal_fistula_tremor_ac==2?true:false"
-                             showValue='减弱'></label-box>
-                  <label-box :isChecked="afterdialysis.internal_fistula_tremor_ac==3?true:false"
-                             showValue='无'></label-box>
+                  <label-box :isChecked="predialysis.internal_fistula.indexOf('震颤-存在')>-1?true:false"
+                               showValue='存在'></label-box>
+                    &nbsp;
+                    <label-box :isChecked="predialysis.internal_fistula.indexOf('震颤-减弱')>-1?true:false"
+                               showValue='减弱'></label-box>
+                    &nbsp;
+                    <label-box :isChecked="predialysis.internal_fistula.indexOf('震颤-无')>-1?true:false"
+                               showValue='无'></label-box>
                 </td>
                 <td width="">
                 </td>
@@ -1242,6 +1244,7 @@
             this.predialysis = response.data.data.PredialysisEvaluation
             this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(this.predialysis.blood_access_part_opera_id)
             this.afterdialysis = response.data.data.AssessmentAfterDislysis
+            console.log("透后评估数据",this.afterdialysis)
             this.operators = response.data.data.operators
             this.dialysisOrder = response.data.data.dialysisOrder === null ? null : response.data.data.dialysisOrder