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

src/api/common/common.js

@@ -47,6 +47,7 @@ export function getConfigurationList(limit, page) {
 }
 
 export function getConfigurationDetail(id, params) {
+  console.log('id=====', id)
   return request({
     url: 'com/api/getconfigurationdetail?id=' + id,
     method: 'get',
@@ -383,7 +384,7 @@ export function getNormData(params) {
 }
 
 export function getFirstQuarter(params) {
-  console.log('params', params)
+  // console.log('params', params)
   return request({
     url: '/com/api/getfirstquarter',
     method: 'get',
@@ -415,7 +416,6 @@ export function getPatientsControl(lapstor, startime, endtime, page, limit) {
     page: page,
     limit: limit
   }
-  console.log('params', params)
   return request({
     url: '/com/api/getpatientscontrol',
     method: 'get',
@@ -448,7 +448,6 @@ export function getPatientContorlAnalysis(params) {
 }
 
 export function GetQualityControl(params) {
-  console.log('params是', params)
   return request({
     url: '/com/api/getqualitycontrol',
     method: 'Get',
@@ -471,3 +470,36 @@ export function getPatientComplianceDetail(params) {
     params: params
   })
 }
+
+export function getBloodPressureDetail(id, params) {
+  return request({
+    url: '/com/api/getbloodpressuredetail?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function UpdateBloodPrussre(id, data) {
+  console.log('data', data)
+  return request({
+    url: '/com/api/updatebloodprussre?id=' + id,
+    method: 'post',
+    data: data
+  })
+}
+
+export function getBloodPressureList(params) {
+  return request({
+    url: '/com/api/getbloodpressurelist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getMonthBloodList(params) {
+  return request({
+    url: '/com/api/getmonthbloodlist',
+    method: 'get',
+    params: params
+  })
+}

src/utils/tools.js

@@ -153,10 +153,10 @@ export function uParseTime(time, cFormat) {
 }
 
 export function calculateAnticoagulantZL(type, shouji, shichang, weichi) {
-  console.log(type)
-  console.log(shouji)
-  console.log(shichang)
-  console.log(weichi)
+  // console.log(type)
+  // console.log('首剂', shouji)
+  // console.log('总量', shichang)
+  // console.log('维持', weichi)
 
   var t = 0.5
   if (type == 1) {
@@ -172,6 +172,6 @@ export function calculateAnticoagulantZL(type, shouji, shichang, weichi) {
   if (isNaN(shouji) || isNaN(shichang) || isNaN(weichi)) {
     return 0
   }
-  console.log((shouji + (shichang - t) * weichi).toFixed(1))
+  // console.log((shouji + (shichang - t) * weichi).toFixed(1))
   return (shouji + (shichang - t) * weichi).toFixed(1)
 }

src/xt_pages/data/prescription.vue

@@ -930,6 +930,17 @@ export default {
           return false;
         } else {
            var prescription =  response.data.data.prescription
+           console.log("prescription",prescription)
+            prescription.dialysis_duration = parseFloat(prescription.dialysis_duration_hour) + parseFloat((prescription.dialysis_duration_minute / 60).toFixed(2))
+           if(prescription.dialysate_formulation == 0){
+              prescription.dialysate_formulation = ""
+           } 
+           if(prescription.body_fluid ==0 ){
+             prescription.body_fluid = ""
+           }
+           if(prescription.anticoagulant == 0){
+               prescription.anticoagulant = ""
+           }
            if(prescription.anticoagulant == 3){
               prescription.anticoagulant = "低分子肝素"
            }
@@ -969,7 +980,6 @@ export default {
           return false;
         } else {
           this.system_prescription = response.data.data.prescriptions;
-          console.log("为什么",this.system_prescription)
 
           for (let i = 0; i < this.system_prescription.length; i++) {
             if (this.system_prescription[i].mode == 1) {
@@ -1017,7 +1027,6 @@ export default {
             this.isEdit = true;
             this.system_prescription = [];
             this.system_prescription = response.data.data.prescriptions;
-            console.log("触发了吗",this.system_prescription)
             this.addPlan.id = response.data.data.prescription.id;
             return false;
           }
@@ -1056,6 +1065,7 @@ export default {
 
     this.blood_filters = this.$store.getters.blood_filters;
     this.dialysate_formulation = this.$store.getters.dialysate_formulation;
+   
     this.body_fluid_option = this.$store.getters.body_fluid;
     this.special_medicine_option = this.$store.getters.special_medicine;
     this.displace_liqui_part_option = this.$store.getters.displace_liqui;
@@ -1071,9 +1081,9 @@ export default {
   },
   watch: {
     "addPlan.dialysis_duration": function() {
-      console.log(this.addPlan.anticoagulant_shouji);
-      console.log(this.addPlan.dialysis_duration);
-      console.log(this.addPlan.anticoagulant_weichi);
+      // console.log(this.addPlan.anticoagulant_shouji);
+      // console.log(this.addPlan.dialysis_duration);
+      // console.log(this.addPlan.anticoagulant_weichi);
 
       this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(
         1,
@@ -1083,21 +1093,21 @@ export default {
       );
     },
     "addPlan.anticoagulant_shouji": function() {
-      console.log("首剂", this.addPlan.anticoagulant_shouji);
-      console.log("维持", this.addPlan.anticoagulant_weichi);
-      console.log("总量", this.addPlan.dialysis_duration);
+      // console.log("首剂", this.addPlan.anticoagulant_shouji);
+      // console.log("维持", this.addPlan.anticoagulant_weichi);
+      // console.log("总量", this.addPlan.dialysis_duration);
       this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(
         1,
         this.addPlan.anticoagulant_shouji,
         this.addPlan.dialysis_duration,
         this.addPlan.anticoagulant_weichi
       );
-      console.log("总量----", this.addPlan.anticoagulant_zongliang);
+      // console.log("总量----", this.addPlan.anticoagulant_zongliang);
     },
     "addPlan.anticoagulant_weichi": function() {
-      console.log(this.addPlan.anticoagulant_shouji);
-      console.log(this.addPlan.dialysis_duration);
-      console.log(this.addPlan.anticoagulant_weichi);
+      // console.log(this.addPlan.anticoagulant_shouji);
+      // console.log(this.addPlan.dialysis_duration);
+      // console.log(this.addPlan.anticoagulant_weichi);
       this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(
         1,
         this.addPlan.anticoagulant_shouji,

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -410,13 +410,21 @@
                       </div>
                       <div class="inline_block">
                         穿刺方法：
-                        <div class="under_line" style="width: 300px;">
+                        <!-- <div class="under_line" style="width: 300px;">
                           {{
                             record.assessment_before_dislysis
                               ? record.assessment_before_dislysis
                                   .puncture_method
                               : ""
                           }}
+                        </div> -->
+                        <div class="under_line" style="width: 300px;">
+                          {{
+                            record.assessment_before_dislysis
+                              ? record.assessment_before_dislysis
+                                  .puncture_way
+                              : ""
+                          }}
                         </div>
                       </div>
                     </div>

src/xt_pages/dialysis/batch_print/batch_print_order_eight.vue

@@ -678,7 +678,7 @@
                <tr>
                 <td style="text-align:left;" colspan="8">
                 <span style="display:inline-block;margin-left:15px;">皮肤:</span>
-                 <label-box
+                 <!-- <label-box
                       showValue="完整"
                       :isChecked="record.assessment_before_dislysis.skin == 1 ? true : false"
                     ></label-box>
@@ -714,6 +714,43 @@
                     <label-box
                       showValue="皮下淤血"
                       :isChecked="record.assessment_before_dislysis.skin == 9 ? true : false"
+                    ></label-box> -->
+                    <label-box
+                      showValue="完整"
+                      :isChecked="record.assessment_before_dislysis.skin.indexOf('完整') >-1 ? true : false"
+                    ></label-box>
+                    <label-box
+                      showValue="干燥"
+                      :isChecked="record.assessment_before_dislysis.skin.indexOf('干燥') >-1 ? true : false"
+                    ></label-box>
+                    <label-box
+                      showValue="瘙痒"
+                      :isChecked="record.assessment_before_dislysis.skin.indexOf('瘙痒') >-1 ? true : false"
+                    ></label-box>
+                    <label-box
+                      showValue="菲薄"
+                      :isChecked="record.assessment_before_dislysis.skin.indexOf('菲薄') >-1 ? true : false"
+                    ></label-box
+                    >/
+                    <label-box
+                      showValue="水肿"
+                      :isChecked="record.assessment_before_dislysis.skin.indexOf('水肿') >-1 ? true : false"
+                    ></label-box>
+                    <label-box
+                      showValue="皮疹"
+                      :isChecked="record.assessment_before_dislysis.skin.indexOf('皮疹') >-1 ? true : false"
+                    ></label-box>
+                    <label-box
+                      showValue="出血点"
+                      :isChecked="record.assessment_before_dislysis.skin.indexOf('出血点') >-1 ? true : false"
+                    ></label-box>
+                    <label-box
+                      showValue="压疮"
+                      :isChecked="record.assessment_before_dislysis.skin.indexOf('压疮') >-1 ? true : false"
+                    ></label-box>
+                    <label-box
+                      showValue="皮下淤血"
+                      :isChecked="record.assessment_before_dislysis.skin.indexOf('皮下淤血') >-1 ? true : false"
                     ></label-box>
                </td>
             </tr>

src/xt_pages/dialysis/batch_print/batch_print_order_fifteen.vue

@@ -365,9 +365,12 @@
                         <td style="text-align:left;padding-left:5px;border:none;">
                             <span style="width:70px;display: inline-block;"></span>
                             <span style="width:60px;display: inline-block;">穿刺方式:</span>
-                            <label-box showValue="绳梯" :isChecked="record.assessment_before_dislysis.puncture_way == 1 ? true : false"></label-box>&nbsp;&nbsp;
+                            <!-- <label-box showValue="绳梯" :isChecked="record.assessment_before_dislysis.puncture_way == 1 ? true : false"></label-box>&nbsp;&nbsp;
                             <label-box showValue="扣眼" :isChecked="record.assessment_before_dislysis.puncture_way == 2 ? true : false"></label-box>&nbsp;&nbsp;
-                            <label-box showValue="其他" :isChecked="record.assessment_before_dislysis.puncture_way > 0 ? ((record.assessment_before_dislysis.puncture_way != 1 && record.assessment_before_dislysis.puncture_way != 2) ? true : false) : false"></label-box>&nbsp;&nbsp;
+                            <label-box showValue="其他" :isChecked="record.assessment_before_dislysis.puncture_way > 0 ? ((record.assessment_before_dislysis.puncture_way != 1 && record.assessment_before_dislysis.puncture_way != 2) ? true : false) : false"></label-box>&nbsp;&nbsp; -->
+                             <label-box showValue="绳梯" :isChecked="record.assessment_before_dislysis.puncture_way.indexOf('绳梯')>-1 ? true : false"></label-box>&nbsp;&nbsp;
+                            <label-box showValue="扣眼" :isChecked="record.assessment_before_dislysis.puncture_way.indexOf('扣眼')>-1? true : false"></label-box>&nbsp;&nbsp;
+                            <label-box showValue="其他" :isChecked="record.assessment_before_dislysis.puncture_way.indexOf('其他')>-1? true : false"></label-box>&nbsp;&nbsp;
                         </td>
                     </tr>
                 </table>

src/xt_pages/dialysis/batch_print/batch_print_order_five_one.vue

@@ -166,9 +166,12 @@
                   <div class="row" style="padding: 2px 0;line-height:19px;">
                     <div class="inline_block">
                       &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;穿刺方式:
-                      <check-box text="绳梯" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'puncture_way', 1)"></check-box>
+                      <!-- <check-box text="绳梯" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'puncture_way', 1)"></check-box>
                       <check-box text="扣眼" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'puncture_way', 2)"></check-box>
-                      <check-box text="区域" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'puncture_way', 3)"></check-box>
+                      <check-box text="区域" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'puncture_way', 3)"></check-box> -->
+                      <check-box text="绳梯" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'puncture_way', '绳梯')"></check-box>
+                      <check-box text="扣眼" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'puncture_way', '扣眼')"></check-box>
+                      <check-box text="区域" :checked="isValueIndexOfCheck(record.assessment_before_dislysis,'puncture_way', '区域')"></check-box>
                     </div>
                     <div class="inline_block" style="margin-left: 30px;">
                       感染：
@@ -229,7 +232,7 @@
                   <div class="row" style="padding: 2px 0;line-height:19px;">
                     <div class="inline_block">
                       皮肤：
-                      <check-box text="完整" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'skin', 1)"></check-box>
+                      <!-- <check-box text="完整" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'skin', 1)"></check-box>
                       <check-box text="干燥" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'skin', 2)"></check-box>
                       <check-box text="瘙痒" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'skin', 3)"></check-box>
                       <check-box text="菲薄" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'skin', 4)"></check-box>/
@@ -237,7 +240,16 @@
                       <check-box text="皮疹" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'skin', 6)"></check-box>
                       <check-box text="出血点" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'skin', 7)"></check-box>
                       <check-box text="压疮" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'skin', 8)"></check-box>
-                      <check-box text="皮下淤血" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'skin', 9)"></check-box>
+                      <check-box text="皮下淤血" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'skin', 9)"></check-box> -->
+                      <check-box text="完整" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'skin', '完整')"></check-box>
+                      <check-box text="干燥" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'skin', '干燥')"></check-box>
+                      <check-box text="瘙痒" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'skin', '瘙痒')"></check-box>
+                      <check-box text="菲薄" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'skin', '菲薄')"></check-box>/
+                      <check-box text="水肿" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'skin', '水肿')"></check-box>
+                      <check-box text="皮疹" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'skin', '皮疹')"></check-box>
+                      <check-box text="出血点" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'skin', '出血点')"></check-box>
+                      <check-box text="压疮" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'skin', '压疮')"></check-box>
+                      <check-box text="皮下淤血" :checked="isValueIndexOfCheck(record.assessment_before_dislysis, 'skin', '皮下淤血')"></check-box>
                       <div class="inline_block">
                         其它：
                         <div class="under_line" style="width: 150px;text-align: left">

src/xt_pages/dialysis/batch_print/batch_print_order_nine.vue

@@ -413,7 +413,79 @@
                               <div
                                 style="display:flex;justify-content:space-between;"
                               >
+                               <label-box
+                                  showValue="完整"
+                                  :isChecked="
+                                    record.assessment_before_dislysis.skin.indexOf('完整')>-1
+                                      ? true
+                                      : false
+                                  "
+                                ></label-box>
+                                <label-box
+                                  showValue="干燥"
+                                  :isChecked="
+                                    record.assessment_before_dislysis.skin.indexOf('干燥')>-1
+                                      ? true
+                                      : false
+                                  "
+                                ></label-box>
+                                <label-box
+                                  showValue="瘙痒"
+                                  :isChecked="
+                                    record.assessment_before_dislysis.skin.indexOf('瘙痒')>-1
+                                      ? true
+                                      : false
+                                  "
+                                ></label-box>
+                                <label-box
+                                  showValue="菲薄"
+                                  :isChecked="
+                                    record.assessment_before_dislysis.skin.indexOf('菲薄')>-1
+                                      ? true
+                                      : false
+                                  "
+                                ></label-box>
+                                <label-box
+                                  showValue="水肿"
+                                  :isChecked="
+                                    record.assessment_before_dislysis.skin.indexOf('水肿')>-1
+                                      ? true
+                                      : false
+                                  "
+                                ></label-box>
+                                <label-box
+                                  showValue="皮疹"
+                                  :isChecked="
+                                    record.assessment_before_dislysis.skin.indexOf('皮疹')>-1
+                                      ? true
+                                      : false
+                                  "
+                                ></label-box>
                                 <label-box
+                                  showValue="出血点"
+                                  :isChecked="
+                                    record.assessment_before_dislysis.skin.indexOf('出血点')>-1
+                                      ? true
+                                      : false
+                                  "
+                                ></label-box>
+                                <label-box
+                                  showValue="压疮"
+                                  :isChecked="
+                                    record.assessment_before_dislysis.skin.indexOf('压疮')>-1
+                                      ? true
+                                      : false
+                                  "
+                                ></label-box>
+                                <label-box
+                                  showValue="皮下淤血"
+                                  :isChecked="
+                                    record.assessment_before_dislysis.skin.indexOf('皮下淤血')>-1
+                                      ? true
+                                      : false
+                                  "
+                                ></label-box>
+                                <!-- <label-box
                                   showValue="完整"
                                   :isChecked="
                                     record.assessment_before_dislysis.skin == 1
@@ -484,7 +556,7 @@
                                       ? true
                                       : false
                                   "
-                                ></label-box>
+                                ></label-box> -->
                                 &ensp;
                               </div>
                             </td>

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -397,7 +397,22 @@
                           "
                         ></check-box
                         >&emsp;穿刺方式:
-                        <check-box
+                          <check_box
+                           text="绳梯"
+                            :checked="record.assessment_before_dislysis.puncture_way.indexOf('绳梯')>-1?true:false"
+                          >
+                          </check_box>
+                           <check_box
+                           text="扣眼"
+                            :checked="record.assessment_before_dislysis.puncture_way.indexOf('扣眼')>-1?true:false"
+                          >
+                          </check_box>
+                           <check_box
+                           text="区域"
+                            :checked="record.assessment_before_dislysis.puncture_way.indexOf('区域')>-1?true:false"
+                          >
+                          </check_box>
+                        <!-- <check-box
                           text="绳梯"
                           :checked="
                             isCheckBoxChecked(
@@ -426,7 +441,7 @@
                               3
                             )
                           "
-                        ></check-box>
+                        ></check-box> -->
                       </div>
                     </div>
                     <div class="row" style="padding: 2px 0;line-height:19px;">

src/xt_pages/dialysis/batch_print/batch_print_order_other_one.vue

@@ -394,8 +394,25 @@
                             )
                           "
                         ></check-box>
+
                         &emsp;穿刺方式:
                         <check-box
+                           text="绳梯"
+                            :checked="record.assessment_before_dislysis.puncture_way.indexOf('绳梯')>-1?true:false"
+                          >
+                          </check-box>
+                           <check-box
+                           text="扣眼"
+                            :checked="record.assessment_before_dislysis.puncture_way.indexOf('扣眼')>-1?true:false"
+                          >
+                          </check-box>
+                           <check-box
+                           text="区域"
+                            :checked="record.assessment_before_dislysis.puncture_way.indexOf('区域')>-1?true:false"
+                          >
+                          </check-box>
+                        
+                        <!-- <check-box
                           text="绳梯"
                           :checked="
                             isCheckBoxChecked(
@@ -424,7 +441,7 @@
                               3
                             )
                           "
-                        ></check-box>
+                        ></check-box> -->
                       </div>
                     </div>
                     <div class="row" style="padding: 2px 0;line-height:19px;">

src/xt_pages/dialysis/batch_print/batch_print_order_seven.vue

@@ -767,14 +767,14 @@
                   <td>
                    <span v-if="getTime(monitor.operate_time)!=''">{{
                     monitor.systolic_blood_pressure
-                    ? monitor.systolic_blood_pressure 
+                    ? monitor.systolic_blood_pressure
                     : '0'
                     }}/{{
                     monitor.diastolic_blood_pressure
                     ? monitor.diastolic_blood_pressure
                     : '0'
                     }}
-                    </span> 
+                    </span>
                   </td>
                   <td>
                    <span v-if="getTime(monitor.operate_time)!=''">
@@ -795,7 +795,7 @@
                     <span v-if="getTime(monitor.operate_time)!=''">{{
                        monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : '0'
                      }}
-                    </span> 
+                    </span>
                   </td>
                   <td>
                     <span v-if="getTime(monitor.operate_time)!=''">
@@ -1009,7 +1009,7 @@
                           核对护士:
                          <span class="under-line">&nbsp;
                            <span v-if="setAdminUserES(record.check, 'modifier') == ''">{{getAdminUser(record.check, 'modifier')?getAdminUser(record.check, 'modifier'):"/"}}</span>
-                            <img class="es-img" :src="setAdminUserES(record.check, 'modifier')" alt="" srcset="" style="height:40px"> 
+                            <img class="es-img" :src="setAdminUserES(record.check, 'modifier')" alt="" srcset="" style="height:40px">
                          </span>
                       </td>
                     </tr>
@@ -1301,7 +1301,7 @@
 
             this.records = this.records.concat(resp.data.schedules)
 
-            console.log('记录', this.records)
+              console.log('记录', this.records)
 
             for (const recordIndex in this.records) {
               var dlegh = 0

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -336,7 +336,7 @@
                           v-if="record.assessment_before_dislysis"
                           style="display: inline-block;"
                         >
-                          <div
+                          <!-- <div
                             class="under_line"
                             style="width: 100px;text-align: center"
                             v-if="
@@ -373,6 +373,44 @@
                             "
                           >
                             区域
+                          </div> -->
+
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center"
+                            v-if="
+                              record.assessment_before_dislysis.puncture_way == ''
+                                
+                            "
+                          ></div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center"
+                            v-if="
+                              record.assessment_before_dislysis.puncture_way.indexOf('绳梯')>-1
+                            "
+                          >
+                            绳梯
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center"
+                            v-if="
+                              record.assessment_before_dislysis.puncture_way.indexOf('扣眼')>-1
+                               
+                            "
+                          >
+                            扣眼
+                          </div>
+                          <div
+                            class="under_line"
+                            style="width: 100px;text-align: center"
+                            v-if="
+                              record.assessment_before_dislysis.puncture_way.indexOf('区域')>-1
+                                
+                            "
+                          >
+                            区域
                           </div>
                         </div>
                       </div>

src/xt_pages/dialysis/batch_print/batch_print_order_twenty.vue

@@ -182,7 +182,7 @@
                                 <td width="">
                                 <div class="under-line">
                                     &nbsp;
-                                    <span v-if="record.assessment_before_dislysis.is_hemorrhage == 1">{{ record.assessment_before_dislysis.hemorrhage && ['穿刺点渗血','牙龈出血','消化道出血','女性经期','置管处渗血'].indexOf(record.assessment_before_dislysis.hemorrhage) == -1 ? record.assessment_before_dislysis.hemorrhage : '' }}</span>
+                                    <span v-if="record.assessment_before_dislysis.is_hemorrhage == 1">{{ record.assessment_before_dislysis.hemorrhage_other ? record.assessment_before_dislysis.hemorrhage_other : '' }}</span>
                                 </div>
                                 </td>
                             </tr>
@@ -218,9 +218,13 @@
                                 <td width="65">穿刺方法:</td>
                                 <td width="120">
                                 <div>
-                                    <label-box :isChecked="record.assessment_before_dislysis.puncture_way && getPunctureWay(record.assessment_before_dislysis.puncture_way).indexOf('顺穿') > -1 ? true : false" showValue="顺穿"></label-box>
+                                    <!-- <label-box :isChecked="record.assessment_before_dislysis.puncture_way && getPunctureWay(record.assessment_before_dislysis.puncture_way).indexOf('顺穿') > -1 ? true : false" showValue="顺穿"></label-box>
                                     &nbsp;
                                     <label-box :isChecked="record.assessment_before_dislysis.puncture_way && getPunctureWay(record.assessment_before_dislysis.puncture_way).indexOf('反穿') > -1 ? true : false" showValue="反穿"></label-box>
+                                    &nbsp; -->
+                                   <label-box :isChecked="record.assessment_before_dislysis.puncture_way && record.assessment_before_dislysis.puncture_way.indexOf('顺穿') > -1 ? true : false" showValue="顺穿"></label-box>
+                                    &nbsp;
+                                    <label-box :isChecked="record.assessment_before_dislysis.puncture_way && record.assessment_before_dislysis.puncture_way.indexOf('反穿') > -1 ? true : false" showValue="反穿"></label-box>
                                     &nbsp;
                                 </div>
                                 </td>
@@ -805,7 +809,7 @@
                                 </td>
                                 <td width="20">Kg</td>
                                 <td></td>
-                                <td width="95">透析器凝血:</td>
+                                <td width="95">透析器堵塞:</td>
                                 <td width="200">
                                 <label-box :isChecked="record.assessment_after_dislysis.cruor ? (record.assessment_after_dislysis.cruor.indexOf('凝血0级') > -1 ? true : false) :false" showValue="0级"></label-box>
                                 <label-box :isChecked="record.assessment_after_dislysis.cruor ? (record.assessment_after_dislysis.cruor.indexOf('凝血Ⅰ级') > -1 ? true : false) :false" showValue="Ⅰ级"></label-box>
@@ -885,7 +889,7 @@
                                 <td width='40'>其他</td>
                                 <td width='160'>
                                 <div class="under-line">
-                                    &nbsp;{{ ['低血压','高血压','心律失常','头晕','头痛','呕吐','抽搐','出血','心衰','腹痛'].indexOf(record.assessment_after_dislysis.complication) == -1 ? record.assessment_after_dislysis.complication : '' }}
+                                    &nbsp;{{ record.assessment_after_dislysis.complication ? getComplication(record.assessment_after_dislysis.complication) : '' }}
                                 </div>
                                 </td>
                                 <td></td>
@@ -933,7 +937,7 @@
                                     <span v-if="record.assessment_after_dislysis.patient_gose == 3">{{ record.assessment_after_dislysis.inpatient_department }}</span>
                                 </div>
                                 </td>
-                                <td width="70">下机护士:</td>
+                                <td width="70">护士签名:</td>
                                 <td width="100">
                                 <div class="under-line">&nbsp;
                                     <span v-if="setAdminUserES(record.dialysis_order, 'finish_nurse') == ''">
@@ -1277,6 +1281,44 @@ export default {
       })
   },
   methods: {
+    getComplication(complication){
+      if(complication.indexOf(',') == -1){
+        let str = complication
+        if(['低血压','高血压','心律失常','头晕','头痛','呕吐','抽搐','出血','心衰','腹痛'].indexOf(str) == -1){
+          return str
+        }
+      }else if(complication.indexOf(',') > -1){
+        let str = complication
+        if(['低血压','高血压','心律失常','头晕','头痛','呕吐','抽搐','出血','心衰','腹痛'].indexOf(str) == -1){
+          let newStr = ''
+          str.split(',').map(item => {
+            if(['低血压','高血压','心律失常','头晕','头痛','呕吐','抽搐','出血','心衰','腹痛'].indexOf(item) == -1){
+              newStr += item + ','
+            }
+          })
+          return newStr.substring(0, newStr.length - 1)
+        }
+      }
+    },
+    getHemorrhage(hemorrhage){
+      if(hemorrhage.indexOf(',') == -1){
+        let str = hemorrhage
+        if(['无','穿刺点渗血','牙龈出血','消化道出血','女性经期','置管处渗血'].indexOf(str) == -1){
+          return str
+        }
+      }else if(hemorrhage.indexOf(',') > -1){
+        let str = hemorrhage
+        if(['无','穿刺点渗血','牙龈出血','消化道出血','女性经期','置管处渗血'].indexOf(str) == -1){
+          let newStr = ''
+          str.split(',').map(item => {
+            if(['无','穿刺点渗血','牙龈出血','消化道出血','女性经期','置管处渗血'].indexOf(item) == -1){
+              newStr += item + ','
+            }
+          })
+          return newStr.substring(0, newStr.length - 1)
+        }
+      }
+    },
     dialysateFormulationName(id) {
       if (id in this.dialysateFormulationOptions) {
         return this.dialysateFormulationOptions[id].name

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -136,7 +136,8 @@
         </li>
         <li v-if="isShow('穿刺方式')">
           <label>穿刺方式 : </label>
-          <span class="content">{{ getWay(this.record.puncture_way) }}</span>
+          <!-- <span class="content">{{ getWay(this.record.puncture_way) }}</span> -->
+           <span class="content">{{record.puncture_way}}</span>
         </li>
         <li v-if="isShow('其他位置')">
           <label>其他位置</label>
@@ -261,7 +262,8 @@
 
         <li v-if="isShow('皮肤')">
           <label>皮肤:</label>
-          <span class="content">{{ getSkin(this.record.skin) }}</span>
+          <!-- <span class="content">{{ getSkin(this.record.skin) }}</span> -->
+          <span class="content">{{this.record.skin}}</span>
           <span class="unit"></span>
         </li>
 

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

@@ -227,6 +227,15 @@
                 <el-option label="有" value="1"></el-option>
                 <el-option label="无" value="2"></el-option>
               </el-select>
+
+              <!-- <el-select v-model="assessmentBeforeDislysis.catheter_bend" placeholder="请选择">
+                <el-option
+                  v-for="item in catheters"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select> -->
             </el-form-item>
           </el-col>
 
@@ -247,12 +256,15 @@
 
           <el-col :span="8">
             <el-form-item label="穿刺方式： " v-if="isShow('穿刺方式')">
-              <el-select v-model="assessmentBeforeDislysis.puncture_way">
+              <!-- <el-select v-model="assessmentBeforeDislysis.puncture_way">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
                 <el-option v-for="item in this.puncture_ways" :label="item.name" :value="item.id"
                            :key="item.id"></el-option>
-              </el-select>
+              </el-select> -->
+              <el-input v-model="assessmentBeforeDislysis.puncture_way" readonly
+                      @focus="showInnerDialog('13')">
+              </el-input>
             </el-form-item>
           </el-col>
 
@@ -261,10 +273,18 @@
             <el-form-item label="出血： " v-if="isShow('出血')">
               <el-select v-model="assessmentBeforeDislysis.is_hemorrhage">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
-
                 <el-option label="是" value="1"></el-option>
                 <el-option label="否" value="2"></el-option>
               </el-select>
+
+             <!-- <el-select v-model="assessmentBeforeDislysis.is_hemorrhage" placeholder="请选择">
+                <el-option
+                  v-for="item in hemorrhages"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select> -->
             </el-form-item>
           </el-col>
 
@@ -279,12 +299,16 @@
 
           <el-col :span="8" v-if="isShow('皮肤')">
             <el-form-item label="皮肤： ">
-              <el-select v-model="assessmentBeforeDislysis.skin">
+              <!-- <el-select v-model="assessmentBeforeDislysis.skin">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
                 <el-option v-for="item in this.$store.getters.skin" :label="item.name" :value="item.id"
                            :key="item.id"></el-option>
-              </el-select>
+              </el-select> -->
+             
+              <el-input v-model="assessmentBeforeDislysis.skin" readonly
+                      @focus="showInnerDialog('12')">
+              </el-input>
             </el-form-item>
           </el-col>
 
@@ -520,6 +544,16 @@
     name: 'assessment-after-dislysis-dialog',
     data() {
       return {
+        hemorrhages:[
+          {value:0,label:'请选择'},
+          {value:1,label: '是'},
+          {value:2,label: '否'},
+        ],
+        catheters:[
+          {value:0,label:'请选择'},
+          {value:1,label:'有'},
+          {value:2,label:'无'}
+          ],
         showTxt: '',
         hasPermission: true,
         weight_adjust: {
@@ -605,7 +639,8 @@
           type: '' // 不同弹框类型，用来匹配数据
         },
         machineType: [],
-        puncture_ways: ''
+        puncture_ways: '',
+        skins:[]
 
       }
     },
@@ -646,9 +681,21 @@
         return false
       },
       show(assessment, lastDryWeightDislysis,last_predialysis_evaluation) {
-        console.log(last_predialysis_evaluation)
-
         this.lastPredialysisEvaluation = last_predialysis_evaluation
+        if(this.lastPredialysisEvaluation.is_hemorrhage == 1){
+           this.lastPredialysisEvaluation.is_hemorrhage = "1"
+        }
+        if(this.lastPredialysisEvaluation.is_hemorrhage == 2){
+          this.lastPredialysisEvaluation.is_hemorrhage = "2"
+        }
+        if(this.lastPredialysisEvaluation.catheter_bend == 1){
+          this.lastPredialysisEvaluation.catheter_bend = "1"
+        }
+        if(this.lastPredialysisEvaluation.catheter_bend == 2){
+            this.lastPredialysisEvaluation.catheter_bend = "2"
+        }
+         console.log("22222222",this.lastPredialysisEvaluation)
+        // console.log("乐行",typeof(this.lastPredialysisEvaluation.is_hemorrhage))
         this.assessment = assessment
         this.getPermission()
         this.isVisibility = true
@@ -806,6 +853,22 @@
             this.InnerDialogProps.selected = this.assessmentBeforeDislysis.puncture_needle
             this.InnerDialogProps.isShowTextArea = false
 
+            break
+            case '12': // 皮肤
+            this.InnerDialogProps.values = this.skins
+            this.InnerDialogProps.titles = '皮肤'
+            this.InnerDialogProps.type = 'skin'
+            this.InnerDialogProps.selected = this.assessmentBeforeDislysis.skin
+            this.InnerDialogProps.isShowTextArea = false
+
+            break
+            case '13': // 穿刺方式
+            this.InnerDialogProps.values =  this.puncture_ways
+            this.InnerDialogProps.titles = '穿刺方式'
+            this.InnerDialogProps.type = 'puncture_way'
+            this.InnerDialogProps.selected = this.assessmentBeforeDislysis.puncture_way
+            this.InnerDialogProps.isShowTextArea = false
+
             break
         }
       },
@@ -849,25 +912,33 @@
           case 'puncture_needle':
             this.assessmentBeforeDislysis.puncture_needle = val.value.join(',')
             break
+          case 'skin':
+            this.assessmentBeforeDislysis.skin = val.value.join(',')
+            break
+          case 'puncture_way':
+            this.assessmentBeforeDislysis.puncture_way = val.value.join(',')
+            break
         }
       },
       innerDialogCancle: function() {
         this.InnerDialogProps.visibility = false
       }, handleComfirm: function() {
+        
         var arr = this.assessmentBeforeDislysis
+        console.log("arr是多少----------",arr)
         for (let i = 0; i < this.machineType.length; i++) {
           if (arr.machine_type == this.machineType[i].id) {
             arr.machine_type = this.machineType[i].name
           }
         }
-        console.log('arr', arr)
+        // console.log('arr', arr)
         const ParamsQuery = arr
-        console.log('paramsquery', ParamsQuery)
+        // console.log('paramsquery', ParamsQuery)
         ParamsQuery['patient'] = this.patient.id
         ParamsQuery['record_date'] = this.record_date
         ParamsQuery['mode'] = '1'
 
-        console.log(this.predialysis_evaluation)
+        // console.log(this.predialysis_evaluation)
 
         if (this.predialysis_evaluation.id == 0) {
           ParamsQuery['mode'] = '1'
@@ -895,7 +966,7 @@
             })
 
             const assessment_before_dislysis_resp = response.data.data.assessmentBeforeDislysis
-            console.log("返回数据",assessment_before_dislysis_resp)
+            // console.log("返回数据",assessment_before_dislysis_resp)
             // prop
             var predialysis_evaluation = this.predialysis_evaluation
             for (var index in assessment_before_dislysis_resp) {
@@ -946,9 +1017,9 @@
             module: 3
           }
         }).then(res => {
-          console.log(res)
-          console.log('透前', this.patient_prop)
-          console.log('透前', this.assessment)
+          // console.log(res)
+          // console.log('透前', this.patient_prop)
+           console.log('透前', this.assessment)
           if (res.data.state == 0) {
             this.hasPermission = false
           } else if (res.data.state == 1) {
@@ -993,7 +1064,9 @@
       this.blood_access_noise = this.$store.getters.blood_access_noise
       var date = this.$route.query && this.$route.query.date
       this.record_date = uParseTime(date, '{y}-{m}-{d}')
-
+      //获取皮肤
+      this.skins = getDataConfig('hemodialysis','skin')
+      console.log("皮肤",this.skins)
       // this.weight_adjust.weight = this.dry_weight.dry_weight
 
       // if(this.predialysis_evaluation.id == 0){

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

@@ -1300,12 +1300,12 @@
           'vascular_access_desc'
         )
 
-        console.log('血管通路', this.blood_access_option)
+        // console.log('血管通路', this.blood_access_option)
         this.dialyzerPerfusionApparatus = getDataConfig(
           'hemodialysis',
           'dialyzer_perfusion_apparatus'
         )
-        console.log('灌流器', this.dialyzerPerfusionApparatus)
+       console.log('灌流器', this.dialyzerPerfusionApparatus)
 
         if (this.$route.query && this.$route.query.date) {
           var date = this.$route.query && this.$route.query.date
@@ -1354,13 +1354,11 @@
             }
           }
         } else {
-          console.log('排班----------', schedual.mode_id)
           if (
             schedual.mode_id == 2 ||
             schedual.mode_id == 5 ||
             schedual.mode_id == 12
           ) {
-            console.log('进来----')
             this.zhiShow = true
             this.huShow = true
             this.totalShow = true
@@ -1422,11 +1420,11 @@
             }
 
             var arr = this.dialysisPrescription
-            console.log('arr', arr)
+            // console.log('arr', arr)
 
 
             const ParamsQuery = arr
-            console.log('医嘱推送2', ParamsQuery)
+            // console.log('医嘱推送2', ParamsQuery)
 
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
@@ -1501,11 +1499,11 @@
               return
             }
             var arr = this.dialysisPrescription
-            console.log('arr', arr)
+            // console.log('arr', arr)
 
 
             const ParamsQuery = arr
-            console.log('医嘱推送3', ParamsQuery)
+            // console.log('医嘱推送3', ParamsQuery)
 
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
@@ -1521,7 +1519,7 @@
                   type: 'success',
                   duration: 2000
                 })
-                console.log(hour + ':' + minute)
+                // console.log(hour + ':' + minute)
                 var date = new Date()
 
                 var hour =
@@ -1584,11 +1582,11 @@
 
 
             const ParamsQuery = arr
-            console.log('医嘱推送4', ParamsQuery)
+            // console.log('医嘱推送4', ParamsQuery)
 
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
-            console.log(this.prescription)
+            // console.log(this.prescription)
             let mode = ''
             if (this.prescription.creater <= 0) {
               mode = 1
@@ -1754,7 +1752,7 @@
           this.add_weight = parseFloat(weight_before - last_weight_after).toFixed(
             2
           )
-          console.log('体重增加', this.add_weight)
+          // console.log('体重增加', this.add_weight)
         }
 
         this.isVisibility = true
@@ -1820,7 +1818,7 @@
             var arr = this.dialysisPrescription
 
             const ParamsQuery = arr
-            console.log('night', ParamsQuery)
+            // console.log('night', ParamsQuery)
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
             ParamsQuery['mode'] = '1'
@@ -1862,7 +1860,7 @@
 
 
               const ParamsQuery = arr
-              console.log('ParamsQuerytwo', ParamsQuery)
+              // console.log('ParamsQuerytwo', ParamsQuery)
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '1'
@@ -1909,7 +1907,7 @@
               var arr = this.dialysisPrescription
 
               const ParamsQuery = arr
-              console.log('paramsquerythree', ParamsQuery)
+              // console.log('paramsquerythree', ParamsQuery)
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '1'
@@ -1973,8 +1971,8 @@
               var arr = this.dialysisPrescription
 
               const ParamsQuery = arr
-              console.log('paramsqueryfour', ParamsQuery)
-              console.log('创建者', this.prescription.creater)
+              // console.log('paramsqueryfour', ParamsQuery)
+              // console.log('创建者', this.prescription.creater)
               // if (this.prescription.creater <= 0) {
               //  mode = 1;
               // } else {
@@ -2018,11 +2016,11 @@
               }
 
               var arr = this.dialysisPrescription
-              console.log('arr', arr)
+              // console.log('arr', arr)
 
 
               const ParamsQuery = arr
-              console.log('paramsqueryfive', ParamsQuery)
+              // console.log('paramsqueryfive', ParamsQuery)
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '1'
@@ -2061,11 +2059,11 @@
                 }
 
                 var arr = this.dialysisPrescription
-                console.log('arr', arr)
+                // console.log('arr', arr)
 
 
                 const ParamsQuery = arr
-                console.log('ParamsQuerysix', ParamsQuery)
+                // console.log('ParamsQuerysix', ParamsQuery)
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = '1'
@@ -2110,11 +2108,11 @@
                 }
 
                 var arr = this.dialysisPrescription
-                console.log('arr', arr)
+                // console.log('arr', arr)
 
 
                 const ParamsQuery = arr
-                console.log('parasmqueryseven', parasmqueryseven)
+                // console.log('parasmqueryseven', parasmqueryseven)
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = '1'
@@ -2180,10 +2178,10 @@
                 }
 
                 var arr = this.dialysisPrescription
-                console.log('arr', arr)
+                // console.log('arr', arr)
 
                 const ParamsQuery = arr
-                console.log('eight', ParamsQuery)
+                // console.log('eight', ParamsQuery)
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = '1'
@@ -2219,11 +2217,11 @@
             }
 
             var arr = this.dialysisPrescription
-            console.log('arr', arr)
+            // console.log('arr', arr)
 
 
             const ParamsQuery = arr
-            console.log('night', ParamsQuery)
+            // console.log('night', ParamsQuery)
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
             ParamsQuery['mode'] = '2'
@@ -2291,11 +2289,11 @@
               return
             }
             var arr = this.dialysisPrescription
-            console.log('arr', arr)
+            // console.log('arr', arr)
 
 
             const ParamsQuery = arr
-            console.log('长期处方1', ParamsQuery)
+            // console.log('长期处方1', ParamsQuery)
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
             ParamsQuery['mode'] = '1'
@@ -2339,11 +2337,11 @@
                 return
               }
               var arr = this.dialysisPrescription
-              console.log('arr', arr)
+              // console.log('arr', arr)
 
 
               const ParamsQuery = arr
-              console.log('长期处方2', ParamsQuery)
+              // console.log('长期处方2', ParamsQuery)
 
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
@@ -2395,15 +2393,15 @@
               }
 
               var arr = this.dialysisPrescription
-              console.log('arr', arr)
+              // console.log('arr', arr)
 
 
               const ParamsQuery = arr
-              console.log('长期处方3', ParamsQuery)
+              // console.log('长期处方3', ParamsQuery)
 
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
-              console.log(this.prescription)
+              // console.log(this.prescription)
 
               ParamsQuery['mode'] = '1'
 
@@ -2464,11 +2462,11 @@
                 return
               }
               var arr = this.dialysisPrescription
-              console.log('arr', arr)
+              // console.log('arr', arr)
 
 
               const ParamsQuery = arr
-              console.log('长期处方5', ParamsQuery)
+              // console.log('长期处方5', ParamsQuery)
 
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
@@ -2512,11 +2510,11 @@
                 return
               }
               var arr = this.dialysisPrescription
-              console.log('arr', arr)
+              // console.log('arr', arr)
 
 
               const ParamsQuery = arr
-              console.log('长期处方6', ParamsQuery)
+              // console.log('长期处方6', ParamsQuery)
               ParamsQuery['patient'] = this.patient.id
               ParamsQuery['record_date'] = this.record_date
               ParamsQuery['mode'] = '1'
@@ -2560,11 +2558,11 @@
                   return
                 }
                 var arr = this.dialysisPrescription
-                console.log('arr', arr)
+                // console.log('arr', arr)
 
 
                 const ParamsQuery = arr
-                console.log('长期处方7', ParamsQuery)
+                // console.log('长期处方7', ParamsQuery)
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = '1'
@@ -2614,11 +2612,11 @@
                   return
                 }
                 var arr = this.dialysisPrescription
-                console.log('arr', arr)
+                // console.log('arr', arr)
 
 
                 const ParamsQuery = arr
-                console.log('长期处方8', ParamsQuery)
+                // console.log('长期处方8', ParamsQuery)
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = '1'
@@ -2688,10 +2686,10 @@
                   return
                 }
                 var arr = this.dialysisPrescription
-                console.log('arr', arr)
+                // console.log('arr', arr)
 
                 const ParamsQuery = arr
-                console.log('长期处方9', ParamsQuery)
+                // console.log('长期处方9', ParamsQuery)
                 ParamsQuery['patient'] = this.patient.id
                 ParamsQuery['record_date'] = this.record_date
                 ParamsQuery['mode'] = '1'
@@ -2732,10 +2730,10 @@
               return
             }
             var arr = this.dialysisPrescription
-            console.log('arr', arr)
+            // console.log('arr', arr)
 
             const ParamsQuery = arr
-            console.log('长期处方10', ParamsQuery)
+            // console.log('长期处方10', ParamsQuery)
 
             ParamsQuery['patient'] = this.patient.id
             ParamsQuery['record_date'] = this.record_date
@@ -2997,9 +2995,9 @@
             }
           })
           .then(res => {
-            console.log(res)
-            console.log('predialysis.creater', this.pre.creater)
-            console.log('admin.id', this.$store.getters.xt_user.user.id)
+            // console.log(res)
+            // console.log('predialysis.creater', this.pre.creater)
+            // console.log('admin.id', this.$store.getters.xt_user.user.id)
             if (res.data.state == 0) {
               this.hasPermission = false
             } else if (res.data.state == 1) {

src/xt_pages/dialysis/details/index.vue

@@ -607,7 +607,7 @@ export default {
       search_keyword: '', // 确定用于搜索的关键字
       search_input: '', // 输入中的关键字
       patient_state: [
-        { value: 0, label: '全部' },
+        { value: 0, label: '全部患者' },
         { value: 1, label: '已签到' },
         { value: 2, label: '未签到' },
         { value: 3, label: '已上机' },
@@ -615,20 +615,20 @@ export default {
       ],
       patientStateVal: 0,
       treat_state: [
-        { value: 0, label: '全部' },
+        { value: 0, label: '全部治疗' },
         { value: 1, label: '待开处方' },
         { value: 2, label: '待开小结' }
       ],
       treatStateVal: 0,
       schedule_options: [
-        { value: 0, label: '全部' },
+        { value: 0, label: '全部班' },
         { value: 1, label: '上午' },
         { value: 2, label: '下午' },
         { value: 3, label: '晚上' }
       ],
       scheduleStateVal: 0,
       zone_options: [
-        { id: 0, text: '全部' }
+        { id: 0, text: '全部分区' }
       ],
       zoneVal: 0,
       tableData: [],
@@ -882,6 +882,7 @@ export default {
           console.log('receiver_treatment_access', receiver_treatment_access)
           var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估
           console.log('透前评估', predialysis_evaluation)
+          
           if (predialysis_evaluation != null) {
             if (predialysis_evaluation.blood_access_part_id == -2) {
               predialysis_evaluation.blood_access_part_id = 0
@@ -1056,7 +1057,7 @@ export default {
         if (resp.state == 1) {
           var zones = resp.data.zones
           var schedules = resp.data.schedules
-          var zone_options = [{ id: 0, text: '全部' }]
+          var zone_options = [{ id: 0, text: '全部分区' }]
           for (let z_i = 0; z_i < zones.length; z_i++) {
             const zone = zones[z_i]
             zone_options.push({ id: zone.id, text: zone.name })

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -253,6 +253,16 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 21">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
@@ -437,6 +447,10 @@
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 20"
           ></DialysisPrintOrderTwenty>
+          <DialysisPrintOrderTwentyOne
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 21"
+          ></DialysisPrintOrderTwentyOne>
         </div>
       </el-container>
     </div>
@@ -476,10 +490,12 @@ import DialysisPrintOrderSeventeen from "./template/DialysisPrintOrderSeventeen"
 import DialysisPrintOrderEighteen from "./template/DialysisPrintOrderEighteen";
 import DialysisPrintOrderNineteen from "./template/DialysisPrintOrderNineteen";
 import DialysisPrintOrderTwenty from "./template/DialysisPrintOrderTwenty";
+import DialysisPrintOrderTwentyOne from "./template/DialysisPrintOrderTwentyOne";
 
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderTwentyOne,
     DialysisPrintOrderTwenty,
     DialysisPrintOrderNineteen,
     DialysisPrintOrderEighteen,
@@ -806,6 +822,13 @@ export default {
           style: style,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 21) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       } 
     },
     printThisOnePage() {

src/xt_pages/dialysis/schedualPatient.vue

@@ -108,14 +108,14 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
         selected_date: new Date(), // this.$store.getters.app.dialysis_area.schedule_date,
         schedule_type_selected: 0, // this.$store.getters.app.dialysis_area.schedule_type_select_index,
         schedule_type_options: [
-          { value: 0, text: '全部' },
+          { value: 0, text: '全部班' },
           { value: 1, text: '上午' },
           { value: 2, text: '下午' },
           { value: 3, text: '晚上' }
         ],
         zone_selected: 0, // this.$store.getters.app.dialysis_area.zone_select_index,
         zone_options: [
-          { id: 0, text: '全部' }
+          { id: 0, text: '全部分区' }
         ],
         zone_schedules: [],
 
@@ -324,7 +324,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
           if (resp.state == 1) {
             var zones = resp.data.zones
             var schedules = resp.data.schedules
-            var zone_options = [{ id: 0, text: '全部' }]
+            var zone_options = [{ id: 0, text: '全部分区' }]
             for (let z_i = 0; z_i < zones.length; z_i++) {
               const zone = zones[z_i]
               zone_options.push({ id: zone.id, text: zone.name })

src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue

@@ -552,7 +552,7 @@
         <tr>
           <td style="text-align:left;" colspan="8">
             <span style="display:inline-block;margin-left:15px;">皮肤:</span>
-            <label-box showValue="完整" :isChecked="predialysis.skin == 1 ? true : false"></label-box>
+            <!-- <label-box showValue="完整" :isChecked="predialysis.skin == 1 ? true : false"></label-box>
             <label-box showValue="干燥" :isChecked="predialysis.skin == 2 ? true : false"></label-box>
             <label-box showValue="瘙痒" :isChecked="predialysis.skin == 3 ? true : false"></label-box>
             <label-box showValue="菲薄" :isChecked="predialysis.skin == 4 ? true : false"></label-box>/
@@ -560,7 +560,17 @@
             <label-box showValue="皮疹" :isChecked="predialysis.skin == 6 ? true : false"></label-box>
             <label-box showValue="出血点" :isChecked="predialysis.skin == 7 ? true : false"></label-box>
             <label-box showValue="压疮" :isChecked="predialysis.skin == 8 ? true : false"></label-box>
-            <label-box showValue="皮下淤血" :isChecked="predialysis.skin == 9 ? true : false"></label-box>
+            <label-box showValue="皮下淤血" :isChecked="predialysis.skin == 9 ? true : false"></label-box> -->
+
+            <label-box showValue="完整" :isChecked="predialysis.skin.indexOf('完整') >-1 ? true : false"></label-box>
+            <label-box showValue="干燥" :isChecked="predialysis.skin.indexOf('干燥') >-1? true : false"></label-box>
+            <label-box showValue="瘙痒" :isChecked="predialysis.skin.indexOf('瘙痒') >-1 ? true : false"></label-box>
+            <label-box showValue="菲薄" :isChecked="predialysis.skin.indexOf('菲薄') >-1 ? true : false"></label-box>/
+            <label-box showValue="水肿" :isChecked="predialysis.skin.indexOf('水肿') >-1? true : false"></label-box>
+            <label-box showValue="皮疹" :isChecked="predialysis.skin.indexOf('皮疹') >-1? true : false"></label-box>
+            <label-box showValue="出血点" :isChecked="predialysis.skin.indexOf('出血点') >-1 ? true : false"></label-box>
+            <label-box showValue="压疮" :isChecked="predialysis.skin.indexOf('压疮') >-1 ? true : false"></label-box>
+            <label-box showValue="皮下淤血" :isChecked="predialysis.skin.indexOf('皮下淤血') >-1 ? true : false"></label-box>
           </td>
         </tr>
         <tr>

src/xt_pages/dialysis/template/DialysisPrintOrderEleven.vue

@@ -172,7 +172,19 @@
                   </div>
                   <div class="inline_block" style="margin-left:10px;flex:1;">
                     穿刺方式：
-                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 0">
+                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == ''">
+                      /
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way.indexOf('绳梯')>-1">
+                      绳梯
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way.indexOf('扣眼')>-1">
+                      扣眼
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way.indexOf('区域')>-1">
+                      区域
+                    </div>
+                    <!-- <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 0">
                       /
                     </div>
                     <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 1">
@@ -183,7 +195,7 @@
                     </div>
                     <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 3">
                       区域
-                    </div>
+                    </div> -->
                   </div>
                   <div class="inline_block" style="margin-left:10px;flex:1;">
                     穿刺针：

src/xt_pages/dialysis/template/DialysisPrintOrderFifteen.vue

@@ -342,9 +342,12 @@
               <td style="text-align:left;padding-left:5px;border:none;">
                 <span style="width:70px;display: inline-block;"></span>
                 <span style="width:60px;display: inline-block;">穿刺方式:</span>
-                <label-box showValue="绳梯" :isChecked="predialysis.puncture_way == 1 ? true : false"></label-box>&nbsp;&nbsp;
+                <!-- <label-box showValue="绳梯" :isChecked="predialysis.puncture_way == 1 ? true : false"></label-box>&nbsp;&nbsp;
                 <label-box showValue="扣眼" :isChecked="predialysis.puncture_way == 2 ? true : false"></label-box>&nbsp;&nbsp;
-                <label-box showValue="其他" :isChecked="predialysis.puncture_way > 0 ? ((predialysis.puncture_way != 1 && predialysis.puncture_way != 2) ? true : false) : false"></label-box>&nbsp;&nbsp;
+                <label-box showValue="其他" :isChecked="predialysis.puncture_way > 0 ? ((predialysis.puncture_way != 1 && predialysis.puncture_way != 2) ? true : false) : false"></label-box>&nbsp;&nbsp; -->
+                <label-box showValue="绳梯" :isChecked="predialysis.puncture_way.indexOf('绳梯')>-1 ? true : false"></label-box>&nbsp;&nbsp;
+                <label-box showValue="扣眼" :isChecked="predialysis.puncture_way.indexOf('扣眼')>-1 ? true : false"></label-box>&nbsp;&nbsp;
+                <label-box showValue="其他" :isChecked="predialysis.puncture_way.indexOf('其他')>-1 ? true:false"></label-box>&nbsp;&nbsp;
               </td>
           </tr>
       </table>

src/xt_pages/dialysis/template/DialysisPrintOrderFourteen.vue

@@ -251,11 +251,17 @@
                     <td width="65">穿刺方法:</td>
                     <td width="180">
                       <div>
-                        <label-box :isChecked="predialysis.puncture_way && getPunctureWay(predialysis.puncture_way).indexOf('绳梯') > -1 ? true : false" showValue="绳梯"></label-box>
+                        <!-- <label-box :isChecked="predialysis.puncture_way && getPunctureWay(predialysis.puncture_way).indexOf('绳梯') > -1 ? true : false" showValue="绳梯"></label-box>
                         &nbsp;
                         <label-box :isChecked="predialysis.puncture_way && getPunctureWay(predialysis.puncture_way).indexOf('定点') > -1 ? true : false" showValue="定点"></label-box>
                         &nbsp;
                         <label-box :isChecked="predialysis.puncture_way && getPunctureWay(predialysis.puncture_way).indexOf('区域') > -1 ? true : false" showValue="区域"></label-box>
+                        &nbsp; -->
+                        <label-box :isChecked="predialysis.puncture_way.indexOf('绳梯') > -1 ? true : false" showValue="绳梯"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.puncture_way.indexOf('定点') > -1 ? true : false" showValue="定点"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.puncture_way.indexOf('区域') > -1 ? true : false" showValue="区域"></label-box>
                         &nbsp;
                       </div>
                     </td>

src/xt_pages/dialysis/template/DialysisPrintOrderNine.vue

@@ -249,7 +249,7 @@
                   <td width="40">皮肤:</td>
                   <td width="600">
                     <div style="display:flex;justify-content:space-between;">
-                      <label-box showValue="完整" :isChecked="predialysis.skin == 1 ? true : false"></label-box>
+                      <!-- <label-box showValue="完整" :isChecked="predialysis.skin == 1 ? true : false"></label-box>
                       <label-box showValue="干燥" :isChecked="predialysis.skin == 2 ? true : false"></label-box>
                       <label-box showValue="瘙痒" :isChecked="predialysis.skin == 3 ? true : false"></label-box>
                       <label-box showValue="菲薄" :isChecked="predialysis.skin == 4 ? true : false"></label-box>
@@ -257,7 +257,16 @@
                       <label-box showValue="皮疹" :isChecked="predialysis.skin == 6 ? true : false"></label-box>
                       <label-box showValue="出血点" :isChecked="predialysis.skin == 7 ? true : false"></label-box>
                       <label-box showValue="压疮" :isChecked="predialysis.skin == 8 ? true : false"></label-box>
-                      <label-box showValue="皮下淤血" :isChecked="predialysis.skin == 9 ? true : false"></label-box>
+                      <label-box showValue="皮下淤血" :isChecked="predialysis.skin == 9 ? true : false"></label-box> -->
+                      <label-box showValue="完整" :isChecked="predialysis.skin.indexOf('完整')>-1 ? true : false"></label-box>
+                      <label-box showValue="干燥" :isChecked="predialysis.skin.indexOf('干燥')>-1? true : false"></label-box>
+                      <label-box showValue="瘙痒" :isChecked="predialysis.skin.indexOf('瘙痒')>-1 ? true : false"></label-box>
+                      <label-box showValue="菲薄" :isChecked="predialysis.skin.indexOf('菲薄')>-1? true : false"></label-box>
+                      <label-box showValue="水肿" :isChecked="predialysis.skin.indexOf('水肿')>-1 ? true : false"></label-box>
+                      <label-box showValue="皮疹" :isChecked="predialysis.skin.indexOf('皮疹')>-1 ? true : false"></label-box>
+                      <label-box showValue="出血点" :isChecked="predialysis.skin.indexOf('出血点')>-1 ? true : false"></label-box>
+                      <label-box showValue="压疮" :isChecked="predialysis.skin.indexOf('压疮')>-1 ? true : false"></label-box>
+                      <label-box showValue="皮下淤血" :isChecked="predialysis.skin.indexOf('皮下淤血')>-1 ? true : false"></label-box>
                       &ensp;
                     </div>
                   </td>

src/xt_pages/dialysis/template/DialysisPrintOrderNineteen.vue

@@ -181,7 +181,7 @@
                   </div>
                   <div class="inline_block" style="margin-left:10px;flex:1;">
                     穿刺方式：
-                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 0">
+                    <!-- <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 0">
                       /
                     </div>
                     <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 1">
@@ -192,6 +192,18 @@
                     </div>
                     <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 3">
                       区域
+                    </div> -->
+                     <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == ''">
+                      /
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way.indexOf('绳梯')>-1">
+                      绳梯
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way.indexOf('扣眼')>-1">
+                      扣眼
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way.indexOf('区域')>-1">
+                      区域
                     </div>
                   </div>
                   <div class="inline_block" style="margin-left:10px;flex:1;">

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -202,7 +202,8 @@
                     <td width="100">
                       <div class="under-line">
                         &nbsp;
-                        <span v-if="predialysis.puncture_method">{{ predialysis.puncture_method }}</span>
+                        <!-- <span v-if="predialysis.puncture_method">{{ predialysis.puncture_method }}</span> -->
+                        <span v-if="predialysis.puncture_way">{{ predialysis.puncture_way }}</span>
                       </div>
                     </td>
 

src/xt_pages/dialysis/template/DialysisPrintOrderSeventeen.vue

@@ -577,7 +577,7 @@
         <tr>
           <td style="text-align:left;" colspan="8">
             <span style="display:inline-block;margin-left:15px;">皮肤:</span>
-            <label-box showValue="完整" :isChecked="predialysis.skin == 1 ? true : false"></label-box>
+            <!-- <label-box showValue="完整" :isChecked="predialysis.skin == 1 ? true : false"></label-box>
             <label-box showValue="干燥" :isChecked="predialysis.skin == 2 ? true : false"></label-box>
             <label-box showValue="瘙痒" :isChecked="predialysis.skin == 3 ? true : false"></label-box>
             <label-box showValue="菲薄" :isChecked="predialysis.skin == 4 ? true : false"></label-box>/
@@ -585,7 +585,16 @@
             <label-box showValue="皮疹" :isChecked="predialysis.skin == 6 ? true : false"></label-box>
             <label-box showValue="出血点" :isChecked="predialysis.skin == 7 ? true : false"></label-box>
             <label-box showValue="压疮" :isChecked="predialysis.skin == 8 ? true : false"></label-box>
-            <label-box showValue="皮下淤血" :isChecked="predialysis.skin == 9 ? true : false"></label-box>
+            <label-box showValue="皮下淤血" :isChecked="predialysis.skin == 9 ? true : false"></label-box> -->
+             <label-box showValue="完整" :isChecked="predialysis.skin.indexOf('完整')>-1 ? true : false"></label-box>
+            <label-box showValue="干燥" :isChecked="predialysis.skin.indexOf('干燥')>-1 ? true : false"></label-box>
+            <label-box showValue="瘙痒" :isChecked="predialysis.skin.indexOf('瘙痒')>-1? true : false"></label-box>
+            <label-box showValue="菲薄" :isChecked="predialysis.skin.indexOf('菲薄')>-1? true : false"></label-box>/
+            <label-box showValue="水肿" :isChecked="predialysis.skin.indexOf('水肿')>-1? true : false"></label-box>
+            <label-box showValue="皮疹" :isChecked="predialysis.skin.indexOf('皮疹')>-1 ? true : false"></label-box>
+            <label-box showValue="出血点" :isChecked="predialysis.skin.indexOf('出血点')>-1? true : false"></label-box>
+            <label-box showValue="压疮" :isChecked="predialysis.skin.indexOf('压疮')>-1 ? true : false"></label-box>
+            <label-box showValue="皮下淤血" :isChecked="predialysis.skin.indexOf('皮下淤血')>-1 ? true : false"></label-box>
           </td>
         </tr>
         <tr>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -181,7 +181,7 @@
                   </div>
                   <div class="inline_block" style="margin-left:10px;flex:1;">
                     穿刺方式：
-                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 0">
+                    <!-- <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 0">
                       /
                     </div>
                     <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 1">
@@ -192,7 +192,19 @@
                     </div>
                     <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 3">
                       区域
+                    </div> -->
+                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == ''">
+                      /
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way.indexOf('绳梯')>-1">
+                      绳梯
                     </div>
+                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way.indexOf('扣眼')>-1">
+                      扣眼
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way.indexOf('区域')>-1">
+                      区域
+                    </div> 
                   </div>
                   <div class="inline_block" style="margin-left:10px;flex:1;">
                     穿刺针：

src/xt_pages/dialysis/template/DialysisPrintOrderSixteen.vue

@@ -202,10 +202,11 @@
                     <td width="100">
                       <div class="under-line">
                         &nbsp;
-                        <span v-if="predialysis.puncture_way == 1">绳梯</span>
+                        <!-- <span v-if="predialysis.puncture_way == 1">绳梯</span>
                         <span v-if="predialysis.puncture_way == 2">扣眼</span>
                         <span v-if="predialysis.puncture_way == 3">区域</span>
-                        <span v-if="predialysis.puncture_way == 4">其他</span>
+                        <span v-if="predialysis.puncture_way == 4">其他</span> -->
+                        <span>{{predialysis.puncture_way}}</span> 
                       </div>
                     </td>
 

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -172,7 +172,19 @@
                   </div>
                   <div class="inline_block" style="margin-left:10px;flex:1;">
                     穿刺方式：
-                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 0">
+                     <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == ''">
+                      /
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way.indexOf('绳梯')>-1">
+                      绳梯
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way.indexOf('扣眼')>-1">
+                      扣眼
+                    </div>
+                    <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way.indexOf('区域')>-1">
+                      区域
+                    </div>
+                    <!-- <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 0">
                       /
                     </div>
                     <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 1">
@@ -183,7 +195,7 @@
                     </div>
                     <div class="under_line" style="width: 100px;text-align: center" v-if="predialysis.puncture_way == 3">
                       区域
-                    </div>
+                    </div> -->
                   </div>
                   <div class="inline_block" style="margin-left:10px;flex:1;">
                     穿刺针：

src/xt_pages/dialysis/template/DialysisPrintOrderTwenty.vue

@@ -21,7 +21,7 @@
 
             <td width="50">年 龄:</td>
             <td width="40">
-              <div class="under-line">{{ getAge(patientInfo) }}</div>
+              <div class="under-line">{{ getNewAge(patientInfo.id_card_no) }}</div>
             </td>
             <td width='10'>岁</td>
             <td width="30"></td>
@@ -173,7 +173,7 @@
                     <td width="">
                       <div class="under-line">
                         &nbsp;
-                        <span v-if="predialysis.is_hemorrhage == 1">{{ predialysis.hemorrhage && ['穿刺点渗血','牙龈出血','消化道出血','女性经期','置管处渗血'].indexOf(predialysis.hemorrhage) == -1 ? predialysis.hemorrhage : '' }}</span>
+                        <span v-if="predialysis.is_hemorrhage == 1">{{ predialysis.hemorrhage_other ? predialysis.hemorrhage_other : '' }}</span>
                       </div>
                     </td>
                   </tr>
@@ -209,9 +209,12 @@
                     <td width="65">穿刺方法:</td>
                     <td width="120">
                       <div>
-                        <label-box :isChecked="predialysis.puncture_way && getPunctureWay(predialysis.puncture_way).indexOf('顺穿') > -1 ? true : false" showValue="顺穿"></label-box>
+                        <!-- <label-box :isChecked="predialysis.puncture_way && getPunctureWay(predialysis.puncture_way).indexOf('顺穿') > -1 ? true : false" showValue="顺穿"></label-box>
                         &nbsp;
-                        <label-box :isChecked="predialysis.puncture_way && getPunctureWay(predialysis.puncture_way).indexOf('反穿') > -1 ? true : false" showValue="反穿"></label-box>
+                        <label-box :isChecked="predialysis.puncture_way && getPunctureWay(predialysis.puncture_way).indexOf('反穿') > -1 ? true : false" showValue="反穿"></label-box> -->
+                          <label-box :isChecked="predialysis.puncture_way && predialysis.puncture_way.indexOf('顺穿') > -1 ? true : false" showValue="顺穿"></label-box>
+                        &nbsp;
+                        <label-box :isChecked="predialysis.puncture_way && predialysis.puncture_way.indexOf('反穿') > -1 ? true : false" showValue="反穿"></label-box>
                         &nbsp;
                       </div>
                     </td>
@@ -760,7 +763,7 @@
                     </td>
                     <td width="20">Kg</td>
                     <td></td>
-                    <td width="95">透析器凝血:</td>
+                    <td width="95">透析器堵塞:</td>
                     <td width="200">
                       <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('凝血0级') > -1 ? true : false) :false" showValue="0级"></label-box>
                       <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('凝血Ⅰ级') > -1 ? true : false) :false" showValue="Ⅰ级"></label-box>
@@ -840,7 +843,7 @@
                     <td width='40'>其他</td>
                     <td width='160'>
                       <div class="under-line">
-                        &nbsp;{{ ['低血压','高血压','心律失常','头晕','头痛','呕吐','抽搐','出血','心衰','腹痛'].indexOf(afterdialysis.complication) == -1 ? afterdialysis.complication : '' }}
+                        &nbsp;{{ afterdialysis.complication ? getComplication(afterdialysis.complication) : '' }}
                       </div>
                     </td>
                     <td></td>
@@ -888,7 +891,7 @@
                         <span v-if="afterdialysis.patient_gose == 3">{{ afterdialysis.inpatient_department }}</span>
                       </div>
                     </td>
-                    <td width="70">下机护士:</td>
+                    <td width="70">护士签名:</td>
                     <td width="100">
                       <div class="under-line">&nbsp;
                         <span v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse) == ''">
@@ -1075,6 +1078,57 @@ export default {
     }
   },
   methods: {
+    getNewAge(UUserCard) {
+      if (UUserCard != null && UUserCard != '') {
+        // 获取年龄
+        var myDate = new Date()
+        var month = myDate.getMonth() + 1
+        var day = myDate.getDate()
+        var age = myDate.getFullYear() - UUserCard.substring(6, 10) - 1
+        if (UUserCard.substring(10, 12) < month || UUserCard.substring(10, 12) == month && UUserCard.substring(12, 14) <= day) {
+          age++
+        }
+        return age
+      }
+    },
+    getComplication(complication){
+      if(complication.indexOf(',') == -1){
+        let str = complication
+        if(['低血压','高血压','心律失常','头晕','头痛','呕吐','抽搐','出血','心衰','腹痛'].indexOf(str) == -1){
+          return str
+        }
+      }else if(complication.indexOf(',') > -1){
+        let str = complication
+        if(['低血压','高血压','心律失常','头晕','头痛','呕吐','抽搐','出血','心衰','腹痛'].indexOf(str) == -1){
+          let newStr = ''
+          str.split(',').map(item => {
+            if(['低血压','高血压','心律失常','头晕','头痛','呕吐','抽搐','出血','心衰','腹痛'].indexOf(item) == -1){
+              newStr += item + ','
+            }
+          })
+          return newStr.substring(0, newStr.length - 1)
+        }
+      }
+    },
+    getHemorrhage(hemorrhage){
+      if(hemorrhage.indexOf(',') == -1){
+        let str = hemorrhage
+        if(['无','穿刺点渗血','牙龈出血','消化道出血','女性经期','置管处渗血'].indexOf(str) == -1){
+          return str
+        }
+      }else if(hemorrhage.indexOf(',') > -1){
+        let str = hemorrhage
+        if(['无','穿刺点渗血','牙龈出血','消化道出血','女性经期','置管处渗血'].indexOf(str) == -1){
+          let newStr = ''
+          str.split(',').map(item => {
+            if(['无','穿刺点渗血','牙龈出血','消化道出血','女性经期','置管处渗血'].indexOf(item) == -1){
+              newStr += item + ','
+            }
+          })
+          return newStr.substring(0, newStr.length - 1)
+        }
+      }
+    },
     QueryPartById: function(val) {
       let vascular_access_part_name = '/'
       const vascular_access = getDataConfig('hemodialysis', 'vascular_access')

src/xt_pages/dialysis/template/dialysisPrintOrderFive.vue

@@ -149,10 +149,15 @@
                 </div>  
                 <div class="row" style="padding: 2px 0;line-height:19px;">
                   <div class="inline_block">
-                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;穿刺方式:
-                    <check-box text="绳梯" :checked="predialysis.puncture_way == 1 ? true : false"></check-box>
+                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    穿刺方式:
+                    <!-- <check-box text="绳梯" :checked="predialysis.puncture_way == 1 ? true : false"></check-box>
                     <check-box text="扣眼" :checked="predialysis.puncture_way == 2 ? true : false"></check-box>
-                    <check-box text="区域" :checked="predialysis.puncture_way == 3 ? true : false"></check-box>
+                    <check-box text="区域" :checked="predialysis.puncture_way == 3 ? true : false"></check-box> -->
+
+                    <check-box text="绳梯" :checked="predialysis.puncture_way.indexOf('绳梯')>-1 ? true : false"></check-box>
+                    <check-box text="扣眼" :checked="predialysis.puncture_way.indexOf('扣眼')>-1 ? true : false"></check-box>
+                    <check-box text="区域" :checked="predialysis.puncture_way.indexOf('区域')>-1 ? true : false"></check-box>
                   </div>
 
                   <div class="inline_block" style="margin-left: 30px;">
@@ -218,7 +223,7 @@
                 <div class="row" style="padding: 2px 0;line-height:19px;">
                   <div class="inline_block">
                     皮肤：
-                    <check-box text="完整" :checked="predialysis.skin == 1 ? true : false"></check-box>
+                    <!-- <check-box text="完整" :checked="predialysis.skin == 1 ? true : false"></check-box>
                     <check-box text="干燥" :checked="predialysis.skin == 2 ? true : false"></check-box>
                     <check-box text="瘙痒" :checked="predialysis.skin == 3 ? true : false"></check-box>
                     <check-box text="菲薄" :checked="predialysis.skin == 4 ? true : false"></check-box>
@@ -227,7 +232,18 @@
                     <check-box text="皮疹" :checked="predialysis.skin == 6 ? true : false"></check-box>
                     <check-box text="出血点" :checked="predialysis.skin == 7 ? true : false"></check-box>
                     <check-box text="压疮" :checked="predialysis.skin == 8 ? true : false"></check-box>
-                    <check-box text="皮下淤血" :checked="predialysis.skin == 9 ? true : false"></check-box>
+                    <check-box text="皮下淤血" :checked="predialysis.skin == 9 ? true : false"></check-box> -->
+
+                    <check-box text="完整" :checked="predialysis.skin.indexOf('完整')>-1 ? true : false"></check-box>
+                    <check-box text="干燥" :checked="predialysis.skin.indexOf('干燥')>-1 ? true : false"></check-box>
+                    <check-box text="瘙痒" :checked="predialysis.skin.indexOf('瘙痒')>-1 ? true : false"></check-box>
+                    <check-box text="菲薄" :checked="predialysis.skin.indexOf('菲薄')>-1 ? true : false"></check-box>
+                     /
+                    <check-box text="水肿" :checked="predialysis.skin.indexOf('水肿')>-1 ? true : false"></check-box>
+                    <check-box text="皮疹" :checked="predialysis.skin.indexOf('皮疹')>-1 ? true : false"></check-box>
+                    <check-box text="出血点" :checked="predialysis.skin.indexOf('出血点')>-1 ? true : false"></check-box>
+                    <check-box text="压疮" :checked="predialysis.skin.indexOf('压疮')>-1? true : false"></check-box>
+                    <check-box text="皮下淤血" :checked="predialysis.skin.indexOf('皮下淤血')>-1? true : false"></check-box>
                     <div class="inline_block">
                       其它：
                       <div class="under_line" style="width: 200px;text-align: left">

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -131,9 +131,12 @@
                     <check-box text="不存在" :checked="predialysis.blood_access_noise == 2 ? true : false"></check-box>
                     <check-box text="减弱" :checked="predialysis.blood_access_noise == 3 ? true : false"></check-box>&emsp;
                     穿刺方式:
-                    <check-box text="绳梯" :checked="predialysis.puncture_way == 1 ? true : false"></check-box>
+                    <!-- <check-box text="绳梯" :checked="predialysis.puncture_way == 1 ? true : false"></check-box>
                     <check-box text="扣眼" :checked="predialysis.puncture_way == 2 ? true : false"></check-box>
-                    <check-box text="区域" :checked="predialysis.puncture_way == 3 ? true : false"></check-box>
+                    <check-box text="区域" :checked="predialysis.puncture_way == 3 ? true : false"></check-box> -->
+                    <check-box text="绳梯" :checked="predialysis.puncture_way.indexOf('绳梯')>-1? true : false"></check-box>
+                    <check-box text="扣眼" :checked="predialysis.puncture_way.indexOf('扣眼')>-1 ? true : false"></check-box>
+                    <check-box text="区域" :checked="predialysis.puncture_way.indexOf('区域')>-1 ? true : false"></check-box>
                   </div>
                 </div>
                 <div class="row" style="padding: 2px 0;line-height:19px;">
@@ -1446,7 +1449,7 @@ export default {
         }
         this.check = response.data.data.check;
         this.predialysis = response.data.data.PredialysisEvaluation;
-        // console.log("透前数据", this.predialysis);
+         console.log("透前数据", this.predialysis);
         this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(
           this.predialysis.blood_access_part_opera_id
         );

src/xt_pages/qcd/patientComplianceDetails.vue

@@ -347,7 +347,7 @@ export default {
               normal: {
                 show: true,
                 position: "top",
-                formatter: "{c}g/L"
+                formatter: "{c}"
               }
             },
             //配置样式

src/xt_pages/user/dialysisSolution.vue

@@ -353,7 +353,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShows('置换量')">
+          <el-col :span="8" v-if="isShows('置换量')" v-show="zhiShow">
             <el-form-item label="置换量(L) : " prop="replacement_total">
               <el-input
                 v-model="addPlan.replacement_total"
@@ -466,6 +466,7 @@
                 isShows('置换液') &&
                   this.$store.getters.xt_user.template_info.template_id != 6
               "
+              v-show="huShow"
             >
               <el-select
                 v-model="addPlan.displace_liqui_part"
@@ -503,7 +504,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShows('置换液总量')">
+          <el-col :span="8" v-if="isShows('置换液总量')" v-show="totalShow">
             <el-form-item label="置换液总量(L)">
               <el-input v-model="addPlan.displace_liqui_value"></el-input>
             </el-form-item>
@@ -647,6 +648,9 @@ export default {
       callback()
     }
     return {
+      zhiShow:false,
+      huShow:false,
+      totalShow:false,
       InnerDialogProps: {
         values: [],
         visibility: false,
@@ -1279,7 +1283,7 @@ export default {
       })
     },
     handleEdit(index, row) {
-      console.log(index, row)
+      // console.log(index, row)
     },
     handleSizeChange(val) {
       this.queryParams.limit = val
@@ -1307,13 +1311,21 @@ export default {
         this.addPlan.anticoagulant = '低分子肝素'
       }
       if (row.anticoagulant != 3) {
-        this.addPlan.anticoagulant = row.anticoagulant
+        if(row.anticoagulant == 0){
+           this.addPlan.anticoagulant = ""
+        }else{
+          this.addPlan.anticoagulant = row.anticoagulant
+        }
+        
       }
       this.addPlan.replacement_total = row.replacement_total
 
       this.addPlan.target_ktv = row.target_ktv.toString()
       this.addPlan.target_ultrafiltration = row.target_ultrafiltration.toString()
-
+      
+      this.addPlan.dialysis_duration = parseFloat(row.dialysis_duration_hour) + parseFloat((row.dialysis_duration_minute / 60).toFixed(2))
+      this.addPlan.dialysis_duration_hour = row.dialysis_duration_hour
+      this.addPlan.dialysis_duration_minute = row.dialysis_duration_minute
       this.addPlan.anticoagulant_shouji = row.anticoagulant_shouji.toString()
       this.addPlan.anticoagulant_weichi = row.anticoagulant_weichi.toString()
       this.addPlan.anticoagulant_zongliang = row.anticoagulant_zongliang.toString()
@@ -1330,7 +1342,12 @@ export default {
       this.addPlan.remark = row.remark
 
       this.addPlan.dialyzer_perfusion_apparatus = row.dialyzer_perfusion_apparatus.toString()
-      this.addPlan.body_fluid = row.body_fluid
+
+     if(row.body_fluid == 0){
+       this.addPlan.body_fluid = ""
+      }else{
+        this.addPlan.body_fluid = row.body_fluid
+      }
       this.addPlan.body_fluid_other = row.body_fluid_other.toString()
       this.addPlan.special_medicine = row.special_medicine
       this.addPlan.special_medicine_other = row.special_medicine_other.toString()
@@ -1343,6 +1360,9 @@ export default {
 
       this.dialogVisible = true
       this.isEdit = true
+      if(row.dialysate_formulation==0){
+        this.addPlan.dialysate_formulation= ""
+      }
       this.addPlan.dialysate_formulation = row.dialysate_formulation
       this.dialysisTimeShow = new Date(
         2018,
@@ -1500,6 +1520,15 @@ export default {
 
     addPlanModeChange() {
       var thismode = parseInt(this.addPlan.mode)
+      if(thismode == 2 || thismode == 5 || thismode ==12){
+          this.zhiShow = true
+          this.huShow= true
+          this.totalShow = true
+      }else{
+        this.zhiShow= false
+        this.huShow = false
+        this.totalShow = false
+      }
       if (isNaN(thismode) || thismode <= 0) {
         return false
       }
@@ -1517,6 +1546,13 @@ export default {
 
       getSystemPrescription(params).then(response => {
         if (response.data.state == 1) {
+           var prescription =   response.data.data.prescription
+           if(prescription.anticoagulant == 0){
+              prescription.anticoagulant = ""
+           }
+           if(prescription.body_fluid == 0){
+             prescription.body_fluid = ""
+           }
           if (response.data.data.prescription.id > 0) {
             for (const key in response.data.data.prescription) {
               // 因为el-input特性整数类型或者浮点数类型需要转换成字符串，所以加上toString()