Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/xt_pages/data/druguseTemplate.vue

@@ -146,27 +146,30 @@
 
                 </template>
               </el-table-column>
+
               <el-table-column
                 prop="amount3"
                 align="center"
-
-                label="使用频率">
+                label="给药途径">
                 <template slot-scope="scope" v-if="scope.row.parent_id == 0">
-                  <span>{{scope.row.execution_frequency}}</span>
+                  <span>{{scope.row.delivery_way}}</span>
                 </template>
               </el-table-column>
 
+
               <el-table-column
                 prop="amount3"
                 align="center"
 
-                label="给药途径">
+                label="执行频率">
                 <template slot-scope="scope" v-if="scope.row.parent_id == 0">
-                  <span>{{scope.row.delivery_way}}</span>
+                  <span>{{scope.row.execution_frequency}}</span>
                 </template>
               </el-table-column>
 
 
+
+
               <el-table-column prop="blood_flow_volume" align="center" label="提醒频率">
                 <template slot-scope="scope">
                   <span v-if="scope.row.frequency_type == 1">每次必推</span>

src/xt_pages/dialysis/batch_print/batch_print_order_five.vue

@@ -916,7 +916,7 @@
                 <div class="row" style="padding: 2px 0;line-height:24px;">
                   <div class="inline_block">
                     透前体重:
-                    <div class="under_line" style="width: 60px;text-align: left" v-if="record.assessment_before_dislysis">
+                    <div class="under_line" style="width: 60px;text-align: left" v-if="record.assessment_before_dislysis&&record.assessment_before_dislysis.weight_before">
                       {{record.assessment_before_dislysis.weight_before}}
                     </div>
                     <div class="under_line" style="width: 60px;" v-else>

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -840,7 +840,7 @@
                 <div class="row" style="padding: 2px 0;line-height:24px;">
                   <div class="inline_block">
                     透前体重:
-                    <div class="under_line" style="width: 60px;text-align: left" v-if="record.assessment_before_dislysis">
+                    <div class="under_line" style="width: 60px;text-align: left" v-if="record.assessment_before_dislysis&&record.assessment_before_dislysis.weight_before">
                       {{record.assessment_before_dislysis.weight_before}}
                     </div>
                     <div class="under_line" style="width: 60px;" v-else>

src/xt_pages/dialysis/batch_print/batch_print_order_other_two.vue

@@ -228,7 +228,7 @@
                   <div class="row" style="padding: 2px 0;line-height:24px;">
                     <div class="inline_block">
                       透前体重:
-                      <div class="under_line" style="width: 60px;text-align: left" v-if="record.assessment_before_dislysis">
+                      <div class="under_line" style="width: 60px;text-align: left" v-if="record.assessment_before_dislysis&&record.assessment_before_dislysis.weight_before">
                         {{record.assessment_before_dislysis.weight_before}}
                       </div>
                       <div class="under_line" style="width: 60px;" v-else>

src/xt_pages/dialysis/details/BasicInfor.vue

@@ -20,7 +20,7 @@
         </li>
         <li>
           <label>年龄:</label>
-          <span>{{ patient.age }}</span>
+          <span>{{ getAge(patient) }}</span>
         </li>
         <li>
           <label>透析号 : </label>
@@ -101,6 +101,16 @@ export default {
     }
   },
   methods: {
+    getAge: function(val) {
+      if (val.age == 0) {
+        if (val.birthday == 0) {
+          return ''
+        }
+        return jsGetAge(uParseTime(val.birthday, '{y}-{m}-{d}'), '-')
+      } else {
+        return val.age
+      }
+    },
     stepState: function() {
       return parseInt((Math.random() * 1000) + '') % 2 == 1
     }

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -371,11 +371,11 @@
                   <div v-if="prescription.anticoagulant != 1"  class="under_line" style="width: 50px;text-align: center;">
                     {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:"0"}}
                   </div>
-                  <span v-if="prescription.anticoagulant == 5">ml</span>
-                  <span v-if="prescription.anticoagulant == 4">mg</span>
-                  <span v-if="prescription.anticoagulant == 3">iu</span>
-                  <span v-if="prescription.anticoagulant == 2">iu</span>
-                  <span v-if="prescription.anticoagulant == 1">mg</span>
+                  <span v-if="prescription.anticoagulant == 5">ml/h</span>
+                  <span v-if="prescription.anticoagulant == 4">mg/h</span>
+                  <span v-if="prescription.anticoagulant == 3">iu/h</span>
+                  <span v-if="prescription.anticoagulant == 2">iu/h</span>
+                  <span v-if="prescription.anticoagulant == 1">mg/h</span>
 
                 </div>
                 <div class="inline_block" style="margin-left:20px;" v-if="prescription.anticoagulant == 5">

src/xt_pages/user/dialysisRecord.vue

@@ -117,7 +117,7 @@
             <template slot-scope="scope"
               ><span
                 >{{ scope.row.partition_name }}-{{
-                  scope.row.device_number
+                  scope.row.device.number
                 }}</span
               ></template
             >
@@ -140,7 +140,7 @@
           >
           </el-table-column>
           <el-table-column
-            prop="prescription.dry_weight"
+            prop="predialysis_evaluation.dry_weight"
             width="96"
             align="center"
             label="干体重(kg)"
@@ -192,25 +192,19 @@
               ></template
             >
           </el-table-column>
-          <el-table-column
-            prop="predialysis_evaluation.ultrafiltration_amount"
-            width="110"
-            align="center"
-            label="超滤总量(L)"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="access"
-            width="100"
-            align="center"
-            label="血管通路"
-          >
-            <template slot-scope="scope"
-              ><span>{{
-                setVascularAccess(scope.row.prescription)
-              }}</span></template
-            >
-          </el-table-column>
+
+          <!--<el-table-column-->
+            <!--prop="access"-->
+            <!--width="100"-->
+            <!--align="center"-->
+            <!--label="血管通路"-->
+          <!--&gt;-->
+            <!--<template slot-scope="scope"-->
+              <!--&gt;<span>{{-->
+                <!--setVascularAccess(scope.row.prescription)-->
+              <!--}}</span></template-->
+            <!--&gt;-->
+          <!--</el-table-column>-->
           <el-table-column
             prop="type"
             width="200"
@@ -221,18 +215,18 @@
               <span>{{ setAnticoagulantsConfit(scope.row.prescription) }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="model"
-            width="100"
-            align="center"
-            label="透析器型号"
-          >
-            <template slot-scope="scope"
-              ><span>{{
-                setDialyzerModel(scope.row.prescription)
-              }}</span></template
-            >
-          </el-table-column>
+          <!--<el-table-column-->
+            <!--prop="model"-->
+            <!--width="100"-->
+            <!--align="center"-->
+            <!--label="透析器型号"-->
+          <!--&gt;-->
+            <!--<template slot-scope="scope"-->
+              <!--&gt;<span>{{-->
+                <!--setDialyzerModel(scope.row.prescription)-->
+              <!--}}</span></template-->
+            <!--&gt;-->
+          <!--</el-table-column>-->
           <el-table-column
             prop="nurse"
             width="90"

src/xt_pages/user/doctorAdvice.vue

@@ -2532,7 +2532,7 @@
           }, 1)
         } else {
           this.$message.error(
-            '请先将医嘱类型切换到长期或临时，将勾选需要打印的医嘱!'
+            '请先将医嘱类型切换到长期或临时，勾选需要打印的医嘱!'
           )
           return false
         }