Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -106,8 +106,8 @@
           <span class="content">{{
             target_ultrafiltration != "0" ? target_ultrafiltration : ""
           }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.org_id != 9555" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9555" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
         <li v-if="isShow('葡萄糖')">
           <label>葡萄糖 : </label>

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -17,8 +17,8 @@
           <span class="content" v-if="actual_ultrafiltration != '0'">{{
             actual_ultrafiltration
           }}</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.org_id == 9555) " >ml</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 &&  this.$store.getters.xt_user.template_info.org_id == 9555 " >L</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9555) " >ml</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.org_id == 9555 " >L</span>
         </li>
         <li v-if="isShow('导管')">
           <label>导管 : </label>

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

@@ -28,7 +28,7 @@
           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): "
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.$store.getters.xt_user.template_info.org_id == 9555 "  >
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9555 "  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else>

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -87,7 +87,7 @@
           </el-col>
 
           <el-col :span="8"
-                  v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.org_id == 9555 )">
+                  v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9555 )">
             <el-form-item label="目标超滤量(ml)：">
               <el-input
                 type="number"
@@ -97,7 +97,7 @@
           </el-col>
 
           <el-col :span="8"
-                  v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.org_id != 9555 ">
+                  v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9555 ">
             <el-form-item label="目标超滤量(L)：">
               <el-input
                 type="number"

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -165,6 +165,7 @@
                   template_id == 34 ||
                   template_id == 35 ||
                   template_id == 36 ||
+                  template_id == 38 ||
                   org_id == 9555)
             "
           >
@@ -206,6 +207,7 @@
                 template_id != 34 &&
                 template_id != 35 &&
                 template_id != 36 &&
+                template_id != 38 &&
                 org_id!=9555
             "
           >
@@ -223,7 +225,7 @@
             align="center"
             label="超滤率(ml/h)"
             width="100"
-            v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35) "
+            v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38) "
           >
             <template slot-scope="scope">
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
@@ -234,7 +236,7 @@
             align="center"
             label="超滤率(L/h)"
             width="100"
-            v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22  && template_id != 23 && template_id != 24 && template_id != 26 && template_id != 29 && template_id != 30 && template_id != 31 && template_id != 34 && template_id != 35"
+            v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22  && template_id != 23 && template_id != 24 && template_id != 26 && template_id != 29 && template_id != 30 && template_id != 31 && template_id != 34 && template_id != 35 && template_id != 38"
           >
             <template slot-scope="scope">
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -14,10 +14,10 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35)" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38)" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29) " width="92px" > 置换率(ml/min) </th>

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyEight.vue

@@ -69,7 +69,7 @@
       </div>
       <div class="lineHeight">
           <div class="widthLength25">T：{{ predialysis.temperature ? predialysis.temperature : '' }} ℃</div>
-          <div class="widthLength25">P：{{ predialysis.pulse_frequency ? predialysis.pulse_frequency : '' }}</div>
+          <div class="widthLength25">P：{{ predialysis.pulse_frequency ? predialysis.pulse_frequency : '' }} 次/分</div>
           <div class="widthLength25">意识：
             <span v-for="(item, index) in consciousness_arr" :key="index">
               <span v-if="receiverTreatmentAccess.consciousness == item.id">{{ item.name }}</span>
@@ -95,7 +95,7 @@
           <div class="widthLength25">BP：{{ afterdialysis.systolic_blood_pressure ? afterdialysis.systolic_blood_pressure : "" }}/
             {{ afterdialysis.diastolic_blood_pressure ? afterdialysis.diastolic_blood_pressure : "" }} mmHg
           </div>
-          <div class="widthLength25">T：{{ afterdialysis.temperature ? afterdialysis.temperature : '' }}</div>
+          <div class="widthLength25">T：{{ afterdialysis.temperature ? afterdialysis.temperature : '' }}℃</div>
           <div class="widthLength25">意识：
 
           </div>
@@ -133,19 +133,21 @@
           <div class="widthLength25">治疗总时长：{{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : 0 }}小时
             {{ prescription.dialysis_duration_minute ? prescription.dialysis_duration_minute : 0 }}分钟
           </div>
-          <div class="widthLength25">透析器：{{ prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : '' }}</div>
+          <div class="widthLength25">透析器：{{ prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : '' }} 
+            <span v-if="prescription.dialysis_irrigation!=''">/{{prescription.dialysis_irrigation}}</span>
+          </div>
       </div>
       <div class="lineHeight">
           <div class="widthLength25">血流量：{{ prescription.blood_flow_volume ? prescription.blood_flow_volume : "" }} ml/min</div>
-          <div class="widthLength25">设定UF量：{{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "" }} L</div>
-          <div class="widthLength25">实际UF量：{{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "" }} L</div>
+          <div class="widthLength25">设定UF量：{{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "" }} ml</div>
+          <div class="widthLength25">实际UF量：{{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "" }} ml</div>
           <div class="widthLength25">分区：{{ patientInfo.DialysisSchedule.device_zone.name }}</div>
       </div>
       <div class="lineHeight">
           <div class="widthLength25">透析液温度：{{ prescription.dialysate_temperature ? prescription.dialysate_temperature : "" }} ℃</div>
           <div class="widthLength25">透析液流量：{{ prescription.dialysate_flow ? prescription.dialysate_flow : "" }} ml/min</div>
           <div class="widthLength25">碳酸氢根：{{ prescription.bicarbonate ? prescription.bicarbonate : "" }} mmol/L</div>
-          <div class="widthLength25">血管通路：{{ predialysis.blood_access_part_opera_name ? predialysis.blood_access_part_opera_name : '' }}</div>
+          <div class="widthLength25">血管通路：{{ prescription.blood_access_part_opera_name ? prescription.blood_access_part_opera_name : '' }}</div>
       </div>
       <div class="lineHeight">
           透析液浓度(mmol/L)：Ca： {{ prescription.calcium ? prescription.calcium : "" }}  &nbsp; Na： {{ prescription.sodium ? prescription.sodium : "" }} &nbsp;  K： {{ prescription.kalium ? prescription.kalium : "" }} &nbsp; 葡萄糖：{{ prescription.amylaceum ? prescription.amylaceum : "" }}
@@ -714,9 +716,11 @@ export default {
           this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(
             this.predialysis.blood_access_part_opera_id
           );
+          
           this.assessmentafter = response.data.data.assessmentAfterDislysis;
           console.log("上次透后体重", this.assessmentafter);
           var doctorAdevieInfo = response.data.data.doctorAdevieInfo;
+          var doctorAdevieInfo = response.data.data.advices;
           var tableAdvice = doctorAdevieInfo;
           console.log("医生", tableAdvice);
           if (tableAdvice.length === 0) {
@@ -979,6 +983,9 @@ export default {
           this.prescription.dialysate_formulation_name = this.dialysateFormulationName(
             this.prescription.dialysate_formulation
           );
+          this.prescription.blood_access_part_opera_name = this.bloodAccessParOperaName(
+            this.prescription.blood_access
+          );
 
           var paLen = this.perfusionApparatus.length;
           this.prescription.perfusion_apparatus_name = "";

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -1267,7 +1267,8 @@
             <td style="line-height:20px;" width="40">钠<br />浓<br />度<br /><span style="font-size:10px; !important">mmol/L</span></td>
             <td style="line-height:20px;" width="40">电<br />导<br />度<br /><span style="font-size:10px; !important">ms/cm</span></td>
             
-            <td style="line-height:20px;" width="60">透析液<br />温度<br /><span style="font-size:10px; !important">ml</span></td>
+            <td style="line-height:20px;" width="60">透析液<br />温度<br /><span style="font-size:10px; !important">℃</span></td>
+            <td style="line-height:20px;" width="100">抗凝剂</td>
             <td style="line-height:20px;" width="">病情变化及处理</td>
             <td style="line-height:20px;" width="60">签名</td>
           </tr>
@@ -1305,11 +1306,24 @@
             <td>
               &nbsp;{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }}
             </td>
-            <td>&nbsp;{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : "" }}</td>
+            <td>&nbsp;<span v-if="getTime(monitor.operate_time, '{h}:{i}')">{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : "0" }}</span></td>
             <td>&nbsp;{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</td>
             <td>&nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}</td>
 
             <td>&nbsp;{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : '' }}</td>
+            <td>&nbsp;
+              <span v-if="monitor.monitor_anticoagulant == 0"></span>
+              <span v-if="monitor.monitor_anticoagulant == 1">无肝素</span>
+              <span v-if="monitor.monitor_anticoagulant == 2">普通肝素</span>
+              <span v-if="monitor.monitor_anticoagulant == 3">低分子肝素</span>
+              <span v-if="monitor.monitor_anticoagulant == 4">阿加曲班</span>
+              <span v-if="monitor.monitor_anticoagulant == 5">枸橼酸钠</span>
+              <span v-if="monitor.monitor_anticoagulant == 6">低分子肝素钙</span>
+              <span v-if="monitor.monitor_anticoagulant == 7">低分子肝素钠</span>
+              <span v-if="monitor.monitor_anticoagulant == 8">依诺肝素</span>
+              <span v-if="monitor.monitor_anticoagulant == 9">达肝素</span>
+              <span v-if="monitor.monitor_anticoagulant_value!=undefined && monitor.monitor_anticoagulant_value!='' ">({{monitor.monitor_anticoagulant_value}})</span>
+            </td>
             <td style="text-align:left;line-height:20px;">
               &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
             </td>

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -79,7 +79,7 @@
 
       <el-form-item label="处方类型：" prop="p_type" :validate-event="is_Name">
         <el-select style="margin-right:5px;width:100px;" v-model="form.p_type" placeholder=""
-                   >
+        >
           <el-option
             v-for="(item,index) in registers"
             :key="index"
@@ -155,7 +155,7 @@
         </div>
       </el-form-item>
 
-      <el-form-item label="挂号类型：" prop="register" :validate-event="is_Name">
+      <el-form-item label="挂号类型："  >
         <el-select v-model="form.register" placeholder="请选择" style="width:100%;">
           <el-option
             v-for="item in register"
@@ -166,7 +166,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="挂号费：">
-        <el-input  v-model="form.registration_fee"></el-input>
+        <el-input v-model="form.registration_fee"></el-input>
       </el-form-item>
       <el-form-item label="诊疗费：">
         <el-input v-model="form.medical_expenses"></el-input>
@@ -182,7 +182,7 @@
 </template>
 
 <script>
-  import {uParseTime,jsGetAge} from "@/utils/tools";
+  import {jsGetAge, uParseTime} from "@/utils/tools";
   import axios from 'axios'
   import {PostSearch} from '@/api/patient'
 
@@ -204,7 +204,7 @@
           {value: 16, label: "门诊慢性病"},
           {value: 21, label: "普通住院"},
         ],
-        medical_care:[
+        medical_care: [
           {value: 11, label: "普通门诊"},
           {value: 12, label: '家庭通道'},
           {value: 13, label: "门诊大病"},
@@ -218,8 +218,6 @@
         ],
 
 
-
-
         form: {
           id: '',
           settlement_value: '',
@@ -227,9 +225,9 @@
           name: '',
           gender: '',
           certificates: 1,
-          p_type:'',
-          sick_type:'',
-          diagnosis:'',
+          p_type: '',
+          sick_type: '',
+          diagnosis: '',
           medical_care: '',
           birthday: '',
           age: '',
@@ -238,8 +236,8 @@
           doctor: '',
           id_card_type: 1,
           department: '',
-          registration_fee: '',
-          medical_expenses: '',
+          registration_fee: 0,
+          medical_expenses: 0,
           cost: '',
           phone: '',
           social_type: '',
@@ -307,9 +305,9 @@
           value: 6,
           label: "城乡居民大病医疗保险"
         }, {
-            value: 7,
-            label: "生育保险"
-          }],
+          value: 7,
+          label: "生育保险"
+        }],
         register: [{
           value: 1,
           label: '普通'
@@ -391,13 +389,13 @@
     },
     methods: {
       handleSelect(val) {
-        this.form.id = val.id
-        this.form.name = val.name
-        this.form.gender = val.gender
-        this.form.birthday = uParseTime(val.birthday, '{y}-{m}-{d}')
-        this.form.phone = val.phone
-        this.form.id_card = val.id_card_no
-        var thisLen =  this.form.id_card.length;
+        this.form.id = val.id;
+        this.form.name = val.name;
+        this.form.gender = val.gender;
+        this.form.birthday = uParseTime(val.birthday, '{y}-{m}-{d}');
+        this.form.phone = val.phone;
+        this.form.id_card = val.id_card_no;
+        var thisLen = this.form.id_card.length;
         var birth = "";
         if (thisLen == 15) {
           birth = "19" + this.form.id_card.substr(6, 6);
@@ -405,22 +403,22 @@
           birth = this.form.id_card.substr(6, 8);
         }
         var births =
-                birth.substr(0, 4) +
-                "-" +
-                birth.substr(4, 2) +
-                "-" +
-                birth.substr(6, 2);
+          birth.substr(0, 4) +
+          "-" +
+          birth.substr(4, 2) +
+          "-" +
+          birth.substr(6, 2);
         this.form.age = jsGetAge(births, "-");
       },
       querySearchAsync(keyword, cb) {
-        let key = ''
+        let key = '';
         if (keyword != undefined) {
           key = keyword
         }
-        let searchArray = []
+        let searchArray = [];
         PostSearch(key).then(response => {
           if (response.data.state == 1) {
-            searchArray = response.data.data.patient
+            searchArray = response.data.data.patient;
             cb(searchArray)
           } else {
             cb([])
@@ -428,43 +426,43 @@
         })
       },
       reading(medicalInsuranceCard) {
-        var that = this
+        var that = this;
         if (this.form.id_card_type.length == 0 || this.form.id_card_type == 0) {
-          this.$message.error("请先选择读卡类型")
+          this.$message.error("请先选择读卡类型");
           return
         }
         let params = {
           'id_card_type': this.form.id_card_type,
-          'admin_user_id':this.$store.getters.xt_user.user.id,
+          'admin_user_id': this.$store.getters.xt_user.user.id,
 
-        }
+        };
         axios.get('http://127.0.0.1:9532/api/sscard', {
           params: params
         })
           .then(function (response) {
             if (response.data.state == 0) {
-              that.$message.error(response.data.msg)
+              that.$message.error(response.data.msg);
               return false
             } else {
-              var patient = response.data.data.patient
+              var patient = response.data.data.patient;
 
               if (that.form.id_card_type == 1) {
-                this.form.id = patient.id
-                that.form.name = patient.name
-                that.form.sex = patient.gender
-                that.form.age = patient.age
-                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
-                that.form.phone = patient.phone
-                that.form.idCard = patient.id_card_no
+                this.form.id = patient.id;
+                that.form.name = patient.name;
+                that.form.sex = patient.gender;
+                that.form.age = patient.age;
+                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}');
+                that.form.phone = patient.phone;
+                that.form.idCard = patient.id_card_no;
                 that.form.medicalInsuranceCard = response.data.data.number
 
               } else if (that.form.id_card_type == 2) {
-                this.form.id = patient.id
-                that.form.name = patient.name
-                that.form.sex = patient.gender
-                that.form.age = patient.age
-                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
-                that.form.phone = patient.phone
+                this.form.id = patient.id;
+                that.form.name = patient.name;
+                that.form.sex = patient.gender;
+                that.form.age = patient.age;
+                that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}');
+                that.form.phone = patient.phone;
                 that.form.idCard = patient.id_card_no
               }
               that.$message({message: '读卡成功', type: 'success'})
@@ -479,33 +477,33 @@
       getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
       },
-    show: function() {
-        this.visibility = true
+      show: function () {
+        this.visibility = true;
         // this.form = Object.assign({}, this.resetForm)
-        this.form.id = 0
-        this.form.settlement_value = ''
-        this.form.medical_insurance_card = ''
-        this.form.name = ''
-        this.form.gender = ''
-        this.form.medical_care = ''
-        this.form.birthda = ''
-        this.form.age = ''
-        this.form.id_card = ''
-        this.form.register = ''
-        this.form.doctor = ''
-        this.form.department = ''
-        this.form.registration_fee = ''
-        this.form.medical_expenses = ''
-        this.form.cost = ''
-        this.form.phone = ''
-        this.form.social_type = ''
-
-        this.form.p_type = 14
-        this.form.sick_type = this.sick[0].id
-        this.form.diagnosis = this.diagnoses[0].id
-        this.form.id_card_type = 2
-        this.form.certificates = 1
-
+        this.form.id = 0;
+        this.form.settlement_value = '';
+        this.form.medical_insurance_card = '';
+        this.form.name = '';
+        this.form.gender = '';
+        this.form.medical_care = '';
+        this.form.birthda = '';
+        this.form.age = '';
+        this.form.id_card = '';
+        this.form.register = '';
+        this.form.doctor = '';
+        this.form.department = '';
+        this.form.registration_fee = 0;
+        this.form.medical_expenses = 0;
+        this.form.cost = '';
+        this.form.phone = '';
+        this.form.social_type = '';
+
+        this.form.p_type = 14;
+        this.form.sick_type = this.sick[0].id;
+        this.form.diagnosis = this.diagnoses[0].id;
+        this.form.id_card_type = 2;
+        this.form.certificates = 1;
+        this.form.settlement_value = 1
         // this.form.name = patientInfo.name
         // this.form.gender = patientInfo.gender
         // this.form.age = patientInfo.age
@@ -519,26 +517,26 @@
         // }
 
       },
-      
+
       hide: function () {
-        this.visibility = false
+        this.visibility = false;
         this.$refs['formValue'].resetFields()
       }, cancel: function (formName) {
-        this.$emit('cancel', this.getValue())
+        this.$emit('cancel', this.getValue());
         this.$refs['formValue'].resetFields()
       },
       confirm: function (formName) {
         this.$refs['formValue'].validate((valid) => {
           if (valid) {
-            let value = {}
-            value = this.getValue()
+            let value = {};
+            value = this.getValue();
             this.$emit('confirm', value)
           }
         })
       },
       getValue: function () {
-        let form = {}
-        form = this.form
+        let form = {};
+        form = this.form;
         return form
       }
     }

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -204,7 +204,7 @@
                                     <ul class="basicUl">
                                         <li style="width:50%;">姓名：{{patientInfo.name}}</li>
                                         <li style="width:50%;">性别：{{patientInfo.gender == 1 ? '男' : '女' }}</li>
-                                        <li style="width:50%;">年龄：{{patientInfo.age }}</li>
+                                        <li style="width:50%;">年龄：{{getAge(patientInfo.id_card_no)}}</li>
                                         <li style="width:50%;">电话：{{patientInfo.phone}}</li>
 
                                         <!--<span>过敏病史:</span>-->
@@ -372,7 +372,7 @@
 
 <script>
   import axios from 'axios'
-
+  import { jsGetAge, uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import noCharge from './components/noCharge'
   import charged from './components/charged'
@@ -524,6 +524,32 @@
       this.getPatientList()
     },
     methods: {
+      getAge(id_card_no){
+        if (id_card_no){
+
+          var thisLen = id_card_no.length;
+          var birth = '';
+          if (thisLen == 15) {
+            birth = '19' + id_card_no.substr(6, 6)
+          } else {
+            birth = id_card_no.substr(6, 8)
+          }
+          var births =
+            birth.substr(0, 4) +
+            '-' +
+            birth.substr(4, 2) +
+            '-' +
+            birth.substr(6, 2);
+          return jsGetAge(births, '-')
+
+        }else{
+
+          return 0
+
+        }
+
+
+      },
       query() {
         if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990 ) {
           var that = this;

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -361,7 +361,7 @@
               </el-tab-pane>
               <el-tab-pane label="项目组套" name="2">
                 <div style="width: 100%;flex:1;overflow-y: auto;">
-                  <el-table :data="tabPrjectTeam" border
+                  <el-table :data="tabPrjectTeam" border ref="tabProjectTeam"
                             :height="multipleTableHeight != '' ? multipleTableHeight : '200'"
                             :row-style="{ color: '#303133' }"
                             :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
@@ -2076,7 +2076,6 @@
           '-' +
           (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (hours < 10 ? '0' + hours : hours) +
           ':' + (min < 10 ? '0' + min : min);
-
         this.prescriptions.push({
           id: 0,
           name: newTabName,
@@ -2084,7 +2083,8 @@
           advices: [],
           project: [],
           addition: [],
-          pre_time: nowTime
+          pre_time: this.prescriptions[0].pre_time
+          // pre_time: nowTime
 
         });
         this.editableTabsValue = newTabName;
@@ -2552,6 +2552,9 @@
              this.hisList = hisprojectlist
           }
         })
+      },
+      clearSelection(){
+        this.$refs.tabProjectTeam.clearSelection()
       }
     }, mounted() {
       this.request_record_date = this.record_date;

src/xt_pages/outpatientDoctorStation/components/inquiriesDetail.vue

@@ -111,7 +111,7 @@
       append-to-body>
 
       <print v-if="activeName == 'first'" :paramsObj='paramsObj'></print>
-      <recordPrint v-if="activeName == 'second'" :patientid="patientid"></recordPrint>
+      <recordPrint v-if="activeName == 'second'" ref="recordPrint" :patientid="patientid"></recordPrint>
     </el-dialog>
   </el-dialog>
 </div>
@@ -192,6 +192,7 @@
           var record_date = this.format(this.case_history.sick_date)
           this.patientid = this.patientInfo.id
           this.innerVisible = true
+          this.$refs.recordPrint.show(this.patientid)
           // this.$router.push("/outpatientDoctorStation/recordPrint?record="+record_date+"&patient_id="+this.case_history.patient_id)
         }
       },
@@ -241,6 +242,7 @@
         let params={
           id:id,
         }
+        console.log(id)
         getHisPrescriptionInfo(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -41,11 +41,11 @@
       </el-table-column>
 
 
-      <el-table-column align="center" prop="day" width="50" label="天数">
+      <el-table-column align="center" prop="day" width="70" label="天数">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.day" @input="getDay(scope)" placeholder=""></el-input>
-          <div>{{'天'}}</div>
-
+          <div style="display:flex;align-items:center;">
+          <el-input v-model="scope.row.day" @input="getDay(scope)" placeholder=""></el-input>{{'天'}}
+          </div>
         </template>
       </el-table-column>
 
@@ -57,10 +57,12 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="retail_price" width="60" label="单价">
+      <el-table-column align="center" prop="retail_price" width="80" label="单价">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
-          <div>{{'元'}}</div>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>
+            <div>{{'元'}}</div>
+          </div>
 
         </template>
       </el-table-column>
@@ -108,10 +110,12 @@
           <el-input v-model="scope.row.execution_frequency" placeholder=""></el-input>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="number_days" width="50" label="天数">
+      <el-table-column align="center" prop="number_days" width="70" label="天数">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.number_days" @input="getProjectDay(scope)" placeholder=""></el-input>
-          <div>{{'天'}}</div>
+          <div style="display:flex;align-items:center;">
+            <el-input v-model="scope.row.number_days" @input="getProjectDay(scope)" placeholder=""></el-input>
+            <div>{{'天'}}</div>
+          </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="total" width="70" label="总量">

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1902,7 +1902,7 @@
 
         }
         }
-
+        this.$refs.prescriptions.clearSelection()
 
 
 

src/xt_pages/outpatientRegistration/index.vue

@@ -315,7 +315,7 @@
             <div class="nameTitle">患者挂号信息:</div>
             <div class="formMain">
                 <el-form class="basicForm" :model="form" :rules="rules" ref="form" label-width="100px">
-                    <el-form-item label="挂号类型：" prop="register" :validate-event="is_Name">
+                    <el-form-item label="挂号类型：" >
                         <el-select v-model="form.register" placeholder="请选择">
                             <el-option
                                     v-for="item in his_registers"
@@ -611,7 +611,6 @@
           name: [{ required: true, message: '患者姓名不能为空', trigger: 'blur' }],
           sex: [{ required: true, message: '患者性别不能为空', trigger: 'blur' }],
           idCard: [{ required: true, message: '证件号码不能为空', trigger: 'blur' }],
-          register: [{ required: true, message: '请选择挂号类型', trigger: 'blur' }],
           doctor: [{ required: true, message: '请选择医生', trigger: 'blur' }],
           department: [{ required: true, message: '请填写科室', trigger: 'blur' }],
           age: [{ required: true, message: '患者年龄不能为空', trigger: 'blur' }],
@@ -1121,12 +1120,6 @@
           this.$message.error('患者性别不能为空')
         }
 
-        if (this.form.register == '') {
-          this.$message.error('挂号类型不能为空');
-          this.is_Name = true;
-          return
-        }
-
         if (this.form.doctor == '') {
           this.$message.error('医生不能为空');
           this.is_Name = true;
@@ -1461,7 +1454,9 @@
         this.form.certificates = 2;
         this.form.id_card_type = 1
       }else{
+        this.form.settlementValue = 1;
         this.form.registrationFee = 0;
+        this.form.medicalExpenses = 0;
         this.form.certificates = 1;
         this.form.id_card_type = 2
       }