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

src/api/dialysis_record.js

   })
 }
 
-export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode) {
+export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode,washpipe_nurse) {
   var params = {
     patient_id: patient_id,
     date: schedule_date,
     start_time: start_time,
     lood_drawing: lood_drawing,
     schedual_type: schedual_type,
-    mode: mode
+    mode: mode,
+    washpipe_nurse:washpipe_nurse
   }
   return request({
     url: '/api/dialysis/start_record',

src/xt_pages/data/showConfig.vue

           </el-tab-pane>
           <el-tab-pane label="透析上机">
             <dialysis-computer
-              :dialysis_monitor_data="dialysis_computer_data"
+              :dialysis_computer_data="dialysis_computer_data"
               @change="changeComputerData"
             ></dialysis-computer>
           </el-tab-pane>
   },
   created() {
     var filedList = store.getters.xt_user.fileds;
-    console.log("filedList",filedList)
-    var arr = [];
-    for (let i = 0; i < filedList.length; i++) {
-      if (filedList[i].module == 6) {
-        arr.push(filedList[i]);
-      }
-    }
-    console.log("arr", arr);
+
     for (let i = 0; i < filedList.length; i++) {
       switch (filedList[i].module) {
         case 1:
         case 6:
           this.dialysis_summary_data.push(filedList[i]);
           break;
+        case 7:
+          this.dialysis_computer_data.push(filedList[i]);
+          break;
+
       }
     }
   }

src/xt_pages/dialysis/details/DialysisPrescription.vue

           }}</span>
           <span v-if="this.$store.getters.xt_user.template_info.template_id != 20" class="unit">{{ replacement_total != "0" ? "L" : "" }}</span>
           <span v-if="this.$store.getters.xt_user.template_info.template_id == 20" class="unit">{{ replacement_total != "0" ? "ml" : "" }}</span>
-          
+
         </li>
 
         <li v-if="isShow('透析液配方')">
           <label>目标KT/V: </label>
           <span class="content">{{ target_ktv != "0" ? target_ktv : "" }}</span>
         </li>
+
+        <li v-if="isShow('目标KT/V')">
+          <label>目标KT/V: </label>
+          <span class="content">{{ target_ktv != "0" ? target_ktv : "" }}</span>
+        </li>
+
+
+        <li v-if="isShow('抗凝提前停止')">
+          <label>抗凝提前停止 : </label>
+          <span class="content" v-if="this.prescription.anticoagulant_stop_time_hour > 0 && this.prescription.anticoagulant_stop_time_min > 0 ">{{this.prescription.anticoagulant_stop_time_hour }}小时{{this.prescription.anticoagulant_stop_time_min }}分钟</span>
+          <span class="content" v-if="this.prescription.anticoagulant_stop_time_hour > 0 && this.prescription.anticoagulant_stop_time_min == 0 ">{{this.prescription.anticoagulant_stop_time_hour }}小时</span>
+          <span class="content" v-if="this.prescription.anticoagulant_stop_time_hour == 0 && this.prescription.anticoagulant_stop_time_min > 0 ">{{this.prescription.anticoagulant_stop_time_min }}分钟</span>
+          <span class="content" v-if="this.prescription.anticoagulant_stop_time_hour == 0 && this.prescription.anticoagulant_stop_time_min == 0 "></span>
+          <span class="unit"></span>
+        </li>
+
+
       </ul>
     </div>
   </div>

src/xt_pages/dialysis/details/assessmentBefore.vue

           <span class="content">{{ internal_fistula_skin }}</span>
           <span class="unit"></span>
         </li>
+
+        <li v-if="isShow('导管缝线')">
+          <label>导管缝线: </label>
+          <span class="content" v-if="this.record && this.record.catheter_suture.length > 0 && this.record.catheter_suture_other.length > 0 ">{{this.record.catheter_suture }},{{this.record.catheter_suture_other }}</span>
+          <span class="content" v-if="this.record &&this.record.catheter_suture.length > 0 && this.record.catheter_suture_other.length == 0 ">{{this.record.catheter_suture }}</span>
+          <span class="content" v-if="this.record &&this.record.catheter_suture.length == 0 && this.record.catheter_suture_other.length > 0 ">{{this.record.catheter_suture_other }}</span>
+          <span class="content" v-if="this.record && this.record.catheter_suture.length == 0 && this.record.catheter_suture_other.length == 0 "></span>
+          <span class="unit"></span>
+        </li>
+
+
+        <li v-if="isShow('尿量')">
+          <label>尿量(ml): </label>
+          <span class="content">{{ this.record.urine_volume ? this.record.urine_volume : ''}}</span>
+          <span class="unit" v-if="this.record.urine_volume">ml</span>
+        </li>
+
+
+        <li v-if="isShow('水肿')">
+          <label>水肿: </label>
+          <span class="content">{{ this.record.edema}}</span>
+          <span class="unit"></span>
+        </li>
+
       </ul>
     </div>
     <div class="note">

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

             </el-form-item>
           </el-col>
 
-                
+
           <el-col :span="8">
             <el-form-item label="针眼: " v-if="isShow('针眼')">
               <el-input v-model="assessmentBeforeDislysis.pinholing" readonly
               <el-input v-model="assessmentBeforeDislysis.skin_other"></el-input>
             </el-form-item>
           </el-col>
-   
+
+
+
+
+
+
+
+          <el-col :span="8">
+            <el-form-item label="导管缝线：" v-if="isShow('导管缝线')">
+              <el-input v-model="assessmentBeforeDislysis.catheter_suture" @focus="showInnerDialog('15')"></el-input>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="8" v-if="isShow('导管缝线(其他)')">
+            <el-form-item label="导管缝线(其他):">
+              <el-input v-model="assessmentBeforeDislysis.catheter_suture_other"></el-input>
+            </el-form-item>
+          </el-col>
+
+
+
+          <el-col :span="8" v-if="isShow('尿量')">
+            <el-form-item label="尿量(ml):">
+              <el-input v-model="assessmentBeforeDislysis.urine_volume"></el-input>
+            </el-form-item>
+          </el-col>
+
+
+
+
+          <el-col :span="8">
+            <el-form-item label="水肿：" v-if="isShow('水肿')">
+              <el-input v-model="assessmentBeforeDislysis.edema" @focus="showInnerDialog('16')"></el-input>
+            </el-form-item>
+          </el-col>
+
+
+
+
+
+
+
+
+
+
+
 
           <!-- </el-row>
 
         dialysis_interphase: [],
         symptom_before_dialysis: [],
         blood_access_noise: [],
+        catheter_suture:[],
+        edema:[],
         catheter: [],
         complication: [],
         hemorrhage: [],
           skin_other: '',
           infect_other: '',
           machine_type: '',
-          pinholing:''
+          pinholing:'',
+          catheter_suture:'',
+          catheter_suture_other:'',
+          urine_volume:'',
+          edema:'',
+
         },
 
         InnerDialogProps: {
             this.InnerDialogProps.isShowTextArea = false
 
             break
+          case '15': // 导管缝线
+            this.InnerDialogProps.values = this.catheter_suture
+            this.InnerDialogProps.titles = '导管缝线'
+            this.InnerDialogProps.type = 'catheter_suture'
+            this.InnerDialogProps.selected = this.assessmentBeforeDislysis.catheter_suture
+            this.InnerDialogProps.isShowTextArea = false
+
+            break
+          case '16': // 水肿
+            this.InnerDialogProps.values = this.edema
+            this.InnerDialogProps.titles = '水肿'
+            this.InnerDialogProps.type = 'edema'
+            this.InnerDialogProps.selected = this.assessmentBeforeDislysis.edema
+            this.InnerDialogProps.isShowTextArea = false
+
+            break
+
         }
       },
       innerDialogComfirm: function(val) {
           case 'pinholing':
             this.assessmentBeforeDislysis.pinholing = val.value.join(',')
             break
+          case 'catheter_suture':
+            this.assessmentBeforeDislysis.catheter_suture = val.value.join(',')
+            break
+          case 'edema':
+            this.assessmentBeforeDislysis.edema = val.value.join(',')
+            break
         }
       },
       innerDialogCancle: function() {
       this.internal_fistula_skin = getDataConfig('hemodialysis', 'internal_fistula_skin')
       this.puncture_method = getDataConfig('hemodialysis', 'puncture_method')
       this.machineType = getDataConfig('hemodialysis', 'machine_type')
+
+      this.catheter_suture = getDataConfig('hemodialysis', 'catheter_suture')
+      this.edema = getDataConfig('hemodialysis', 'edema')
+
       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}')

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

       <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
       <el-form :model="form" label-width="100px">
 
-        <el-form-item label="班次">
+        <el-form-item label="班次" v-if="isShowFiled('班次')">
           <el-select v-model="schedual_type" placeholder="请选择班次" @change="changeSchedualType">
             <el-option v-for="(item, index) in schedules_type" :key="index" :value="item.id"
                        :label="item.name"></el-option>
           </el-select>
         </el-form-item>
 
-        <el-form-item label="上机床位">
+        <el-form-item label="上机床位"  v-if="isShowFiled('上机床位')">
           <el-select v-model="form.bed_id" placeholder="请选择上机床位">
             <el-option v-for="(bed, index) in zone_beds" :key="index" :value="bed.id" :label="bed.number"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="上机护士">
+        <el-form-item label="上机护士"  v-if="isShowFiled('上机护士')">
           <el-select v-model="form.nurse_id" placeholder="请选择上机护士">
             <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="穿刺护士">
+        <el-form-item label="穿刺护士"  v-if="isShowFiled('穿刺护士')">
           <el-select v-model="form.puncture_nurse_id" placeholder="请选择穿刺护士">
             <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="冲管护士"  v-if="isShowFiled('冲管护士')">
+          <el-select v-model="form.washpipe_nurse" placeholder="请选择穿刺护士">
+            <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="引血(ml/min)" v-if="template_id == 6">
           <el-input type="number" v-model="form.blood_drawing" style="width:200px;"></el-input>
         </el-form-item>
 
-        <el-form-item label="上机时间 :" style="width:300px">
+        <el-form-item label="上机时间 :" style="width:300px"  v-if="isShowFiled('上机时间')">
           <el-date-picker
             type="datetime"
             format="yyyy-MM-dd HH:mm"
 <script>
   import { GetSchedualNumber, PostModifyStartDialysis, startDialysis } from '@/api/dialysis_record'
   import { parseTime } from '@/utils'
+  import store from '@/store'
 
   import request from '@/utils/request'
 
         start_time: 0,
         creator: 0,
         form: {
+          washpipe_nurse:'',
           bed_id: '',
           nurse_id: '',
           start_time: '',
       this.schedule_date = this.$route.query.date
       this.form.nurse_id = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.start_nurse
       this.form.puncture_nurse_id = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.puncture_nurse
+      this.form.washpipe_nurse = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.washpipe_nurse
+
       if (this.form.puncture_nurse_id == 0) {
         this.form.puncture_nurse_id = this.$store.getters.xt_user.user.id
       }
 
         this.form.nurse_id = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.start_nurse
         this.form.puncture_nurse_id = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.puncture_nurse
+        this.form.washpipe_nurse = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.washpipe_nurse
 
         var nowDate = new Date()
         var nowYear = nowDate.getFullYear()
     },
     computed: {},
     methods: {
+      isShowFiled(name) {
+        var filedList = store.getters.xt_user.fileds
+        for (let i = 0; i < filedList.length; i++) {
+          if (filedList[i].module == 7 && filedList[i].filed_name_cn == name && filedList[i].is_show == 1) {
+            return true
+          }
+        }
+        return false
+      },
       changeSchedualType: function(schedual_type) {
         let ParamsQuery = {}
         ParamsQuery['schedual_type'] = schedual_type
         this.loading = true
         let mode = '1'
 
-        startDialysis(this.patient_id, parseTime(this.schedule_date, '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time, this.schedual_type, mode).then(rs => {
+        startDialysis(this.patient_id, parseTime(this.schedule_date, '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time, this.schedual_type, mode,this.form.washpipe_nurse).then(rs => {
           this.loading = false
           var resp = rs.data
           if (resp.state == 1) {
         ParamsQuery['bed'] = this.form.bed_id
         ParamsQuery['start_time'] = this.form.start_time
         ParamsQuery['puncture_nurse'] = this.form.puncture_nurse_id
+        ParamsQuery['washpipe_nurse'] = this.form.washpipe_nurse
+
 
         ParamsQuery['mode'] = "2"
         if (this.dialysis_order.creator != this.$store.getters.xt_user.user.id) {

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

             </el-form-item>
           </el-col>
 
+
+          <el-col :span="8" v-if="isShows('抗凝提前停止')">
+            <el-form-item label="抗凝提前停止(h)： ">
+              <el-input
+                type="number"
+                v-model="dialysisPrescription.anticoagulant_stop_time_hour"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="isShows('抗凝提前停止')">
+            <el-form-item label="抗凝提前停止(min)： ">
+              <el-input
+                type="number"
+                v-model="dialysisPrescription.anticoagulant_stop_time_min"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
+
           <!-- </el-row>
           <el-row :gutter="20" > -->
           <!--          <el-col :span="8" v-if="isShows('实际超滤量')">-->
               </el-select>
             </el-form-item>
           </el-col>
+
+
+
+
+
         </el-row>
 
         <el-row :gutter="20">
           no_anticoagulant_zongliang: '0',
           creater: 0,
           pre_impulse:0, //预冲量
+          anticoagulant_stop_time_hour:"",
+          anticoagulant_stop_time_min:"",
         },
 
         anticoagulant: {

src/xt_pages/dialysis/details/dialysisComputer.vue

- <template>
+<template>
   <div class="plate-box">
     <h2 class="DetailsTit"><span>{{ title }}</span></h2>
-    <div class="plate " >
+    <div class="plate ">
       <ul>
-        <li>
+        <li v-if="isShow('班次')">
           <label>班次 : </label>
           <span class="content">{{ schedual_type }}</span>
         </li>
-        <li>
+        <li v-if="isShow('上机床位')">
           <label>上机床位 : </label>
           <span class="content">{{ device_number }}</span>
         </li>
-        <li>
+        <li v-if="isShow('上机护士')">
           <label>上机护士 : </label>
           <span class="content">{{ nurse }}</span>
         </li>
       </ul>
       <ul>
-           <li>
+        <li v-if="isShow('穿刺护士')">
           <label>穿刺护士 : </label>
           <span class="content">{{ puncture_nurse }}</span>
         </li>
+        <li v-if="isShow('冲管护士')">
+          <label>冲管护士 : </label>
+          <span class="content">{{ washpipe_nurse }}</span>
+        </li>
         <li>
           <label>状态 : </label>
           <span class="content">{{ stage }}</span>
         </li>
       </ul>
       <ul>
-          <li>
+        <li v-if="isShow('上机时间')">
           <label>上机时间 : </label>
           <span class="content">{{start_time}}</span>
         </li>
 </template>
 
 <script>
-  import { parseTime } from '@/utils';
+  import { parseTime } from '@/utils'
+  import store from '@/store'
 
   export default {
-  name: 'DialysisComputer',
-  data() {
+    name: 'DialysisComputer',
+    data() {
       return {
         title: '透析上机 '
       }
-},
-  props: {
+    },
+    props: {
       record: {
         type: Object
       },
       device_number_map: {
         type: Object
       }
-  },
-  computed: {
-    schedual_type:function(){
-
-      if (this.record.id == 0) {
-        return '-'
-      }
-
-      switch (this.record.schedual_type) {
-        case 1:
-          return "上午"
-          break
-        case 2:
-          return "下午"
+    },
+    computed: {
+      schedual_type: function() {
 
-          break
-        case 3:
-          return "晚上"
+        if (this.record.id == 0) {
+          return '-'
+        }
 
-          break
+        switch (this.record.schedual_type) {
+          case 1:
+            return '上午'
+            break
+          case 2:
+            return '下午'
 
-      }
+            break
+          case 3:
+            return '晚上'
 
+            break
 
+        }
 
-    },
+      },
       device_number: function() {
         if (this.record.id == 0) {
           return '-'
         }
 
+        if (this.device_number_map[this.record.bed_id].number.indexOf(this.device_number_map[this.record.bed_id].zone_name) == -1) {
 
-        if(this.device_number_map[this.record.bed_id].number.indexOf(this.device_number_map[this.record.bed_id].zone_name) == -1){
-
-          return this.device_number_map[this.record.bed_id] == null ? '' :this.device_number_map[this.record.bed_id].zone_name +"-"+ this.device_number_map[this.record.bed_id].number
+          return this.device_number_map[this.record.bed_id] == null ? '' : this.device_number_map[this.record.bed_id].zone_name + '-' + this.device_number_map[this.record.bed_id].number
 
-
-        }else{
+        } else {
 
           return this.device_number_map[this.record.bed_id].number
 
         }
 
-
       },
       nurse: function() {
         if (this.record.id == 0) {
         }
         return parseTime(this.record.start_time, '{y}年{m}月{d}日 {h}时{i}分')
 
-
-  }, puncture_nurse: function() {
+      }, puncture_nurse: function() {
         if (this.record.id == 0) {
           return '-'
         }
         return this.admin_map[this.record.puncture_nurse] == null ? '' : this.admin_map[this.record.puncture_nurse].name
+      }, washpipe_nurse: function() {
+        if (this.record.id == 0) {
+          return '-'
+        }
+        return this.admin_map[this.record.washpipe_nurse] == null ? '' : this.admin_map[this.record.washpipe_nurse].name
+      }
+    },
+    methods: {
+      isShow(name) {
+        var filedList = store.getters.xt_user.fileds
+        var arr = []
+        for (let i = 0; i < filedList.length; i++) {
+          if (
+            filedList[i].module == 7 &&
+            filedList[i].filed_name_cn == name &&
+            filedList[i].is_show == 1
+          ) {
+            return true
+          }
+        }
+        return false
       }
-  },
-  methods: {
 
+    }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>