更新

src/xt_pages/device/group_main.vue

                 this.groups.push(newGroup);
                 this.cancelModifyGroup();
               } else {
-                this.$message.error(resp.msg);
+                this.$message.error("分组名称已存在!");
               }
             });
           } else {
                 }
                 this.cancelModifyGroup();
               } else {
-                this.$message.error(resp.msg);
+                this.$message.error("分组名称已存在!");
               }
             });
           }

src/xt_pages/device/number_main.vue

                 this.device_numbers.push(newNumber);
                 this.cancelModifyDeviceNumber();
               } else {
-                this.$message.error(resp.msg);
+                this.$message.error("床位号/机号已存在!");
               }
             });
           } else {
                 }
                 this.cancelModifyDeviceNumber();
               } else {
-                this.$message.error(resp.msg);
+                this.$message.error("床位号/机号已存在!");
               }
             });
           }

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

         v-show="showAdvicePanel"
         ref="advices_list"
         :row-class-name="tableRowClassName"
-        :span-method="mergeSpan"
+        :span-method="objectSpanMethod"
         @row-click="cellMouseEnter"
         :cell-class-name="adviceNameShow"
         :modal-append-to-body="false"
           min-width="26px"
         >
           <template slot-scope="scope">
-            <span v-if="isShowStartTime(scope.$index, scope.row)">{{
-              getXuserName(scope.row.advice_doctor)
-            }}</span>
+            <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
           </template>
         </el-table-column>
         <el-table-column
           min-width="35px"
         >
           <template slot-scope="scope">
-            <span v-if="isShowStartTime(scope.$index, scope.row)">{{
+            <span>{{
               scope.row.start_time | parseTime("{y}-{m}-{d} {h}:{i}")
             }}</span>
           </template>
           </template>
         </el-table-column>
 
-        <!--<el-table-column prop="advice_name" min-width="50px" label="医嘱内容" align="center"-->
-        <!--v-else>-->
-        <!--<template slot-scope="scope">-->
-        <!--<span v-if="scope.row.parent_id == 0 " class="el-dropdown-link">{{getAdviceContent(scope.row,1)}}</span>-->
-        <!--<span v-if="scope.row.parent_id > 0 "-->
-        <!--class="el-dropdown-link">&emsp;{{getAdviceContent(scope.row,2)}}</span>-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-
         <el-table-column
           prop="execution_time"
           align="center"
           min-width="30px"
           label="执行时间"
+          sortable
         >
           <template slot-scope="scope">
             <span v-if="scope.row.execution_time != 0">{{
             this.showAdviceForm = false;
             this.showAdvicePanel = true;
             var advice = response.data.data.advice;
+            // console.log("advice-------", advice);
             this.doctor_advices[this.currentIndex].drug_spec = advice.drug_spec;
             this.doctor_advices[this.currentIndex].drug_spec_unit =
               advice.drug_spec_unit;
         });
     },
     execAdvice() {
-      if (this.currentRow == null) {
-        this.$message.error("请先选择要执行的医嘱！");
+      if (this.is_has_exce == false) {
+        this.$message.error("你没有执行医嘱的权限");
         return false;
       }
 
-      if (
-        this.currentRow.stop_state == 1 ||
-        this.currentRow.execution_state == 1
-      ) {
-        this.$message.error("所选医嘱已停止或执行");
-        return false;
-      }
+      // if (this.currentAdvices.length <= 0) {
+      //   return;
+      //  }
+      if (this.current_select_object == 1) {
+        var isExecution = true;
+        var adviceArr = this.advice_groups[this.current_group_index].advices;
+        for (let i = 0; i < adviceArr.length; i++) {
+          if (
+            adviceArr[i].execution_state == 2 &&
+            adviceArr[i].is_selected == 1
+          ) {
+            isExecution = false;
+          }
+        }
+        console.log("a");
+        if (isExecution) {
+          this.$message.error("所选医嘱已停止或执行");
+          return false;
+        }
+        console.log("b");
+        for (let i = 0; i < adviceArr.length; i++) {
+          if (
+            adviceArr[i].is_selected == 1 &&
+            adviceArr[i].checker > 0 &&
+            adviceArr[i].checker == this.$store.getters.user.admin.id
+          ) {
+            this.$message.error("核对医嘱与执行不能是同一人");
+            return false;
+          }
+        }
+        var currentAdviceIdArr = [];
+        for (let i = 0; i < adviceArr.length; i++) {
+          if (adviceArr[i].is_selected == 1) {
+            currentAdviceIdArr.push(adviceArr[i].id);
+          }
+        }
+        console.log("c");
+        this.currentAdviceIdsStr = currentAdviceIdArr.join(",");
+        this.nowExecTime = new Date(adviceArr[0].start_time * 1000);
+      } else {
+        if (!(this.current_group_index >= 0 && this.current_advice_index < 0)) {
+          return;
+        }
+        var isExecution = true;
+        var group_top_advice = this.advice_groups[this.current_group_index]
+          .advices[0];
 
-      if (
-        this.currentRow.checker > 0 &&
-        this.currentRow.checker == this.$store.getters.xt_user.user.id
-      ) {
-        this.$message.error("核对与执行不能是同一人");
-        return false;
-      }
+        var adviceArr = this.advice_groups[this.current_group_index].advices;
+        for (let i = 0; i < adviceArr.length; i++) {
+          if (
+            adviceArr[i].is_selected == 1 &&
+            adviceArr[i].execution_state == 2
+          ) {
+            isExecution = false;
+          }
+        }
+        if (isExecution) {
+          this.$message.error("所选医嘱已停止或执行");
+          return false;
+        }
 
-      this.execTimeDialogVisible = true;
-      this.deleLoading = true;
+        for (let i = 0; i < adviceArr.length; i++) {
+          if (
+            adviceArr[i].is_selected == 1 &&
+            adviceArr[i].checker > 0 &&
+            adviceArr[i].checker == this.$store.getters.user.admin.id
+          ) {
+            this.$message.error("核对与执行不能是同一人");
+            return false;
+          }
+        }
+
+        this.nowExecTime = new Date(group_top_advice.start_time * 1000);
+      }
+      this.$refs.exec_time.open();
+      // if (this.currentRow == null) {
+      //   this.$message.error("请先选择要执行的医嘱！");
+      //   return false;
+      // }
+      //
+      // if (
+      //   this.currentRow.stop_state == 1 ||
+      //   this.currentRow.execution_state == 1
+      // ) {
+      //   this.$message.error("所选医嘱已停止或执行");
+      //   return false;
+      // }
+      //
+      // if (
+      //   this.currentRow.checker > 0 &&
+      //   this.currentRow.checker == this.$store.getters.xt_user.user.id
+      // ) {
+      //   this.$message.error("核对与执行不能是同一人");
+      //   return false;
+      // }
+      //
+      // this.execTimeDialogVisible = true;
+      // this.deleLoading = true;
     },
 
     DeleteGroupAdvice(groupno) {
             this.is_has_del_other = res.data.data.is_has_del_other;
           }
         });
+    },
+    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (rowIndex % 2 === 0) {
+        if (columnIndex === 0) {
+          return [1, 2];
+        } else if (columnIndex === 1) {
+          return [0, 0];
+        }
+      }
+    },
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex === 0) {
+        if (rowIndex % 2 === 0) {
+          return {
+            rowspan: 2,
+            colspan: 1
+          };
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0
+          };
+        }
+      }
+
+      if (columnIndex === 1) {
+        if (rowIndex % 2 === 0) {
+          return {
+            rowspan: 2,
+            colspan: 1
+          };
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0
+          };
+        }
+      }
     }
   },
   created() {
     this.getAdviceConfig();
     this.unitsOption = getDataConfig("hemodialysis", "units");
     this.template_id = this.$store.getters.xt_user.template_info.template_id;
+    console.log("医嘱----", this.doctor_advices);
   },
   components: {
     AddGroupAdvice,

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

     >
       <div v-show="edit == false">
         <div class="txsj">
-          <el-button round :disabled="!is_has_create" @click="newRecordAction">新增监测</el-button>
-          <el-button round :disabled="!is_has_modify && !is_has_modify_other" @click="modifyRecordAction">修改监测</el-button>
-          <el-button round :disabled="!is_has_del && !is_has_del_other" @click="deleteRecordAction">删除监测</el-button>
+          <el-button round :disabled="!is_has_create" @click="newRecordAction"
+            >新增监测</el-button
+          >
+          <el-button
+            round
+            :disabled="!is_has_modify && !is_has_modify_other"
+            @click="modifyRecordAction"
+            >修改监测</el-button
+          >
+          <el-button
+            round
+            :disabled="!is_has_del && !is_has_del_other"
+            @click="deleteRecordAction"
+            >删除监测</el-button
+          >
         </div>
         <el-table
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
             align="center"
             label="超滤量(ml)"
             width="110"
-            v-if="isShow('超滤量') && (template_id == 6 || template_id == 10 || template_id == 11)"
+            v-if="
+              isShow('超滤量') &&
+                (template_id == 6 || template_id == 10 || template_id == 11)
+            "
           >
             <template slot-scope="scope">
               {{
             align="center"
             label="超滤量(L)"
             width="110"
-            v-if="isShow('超滤量') && template_id != 6 &&  template_id != 10 && template_id != 11"
+            v-if="
+              isShow('超滤量') &&
+                template_id != 6 &&
+                template_id != 10 &&
+                template_id != 11
+            "
           >
             <template slot-scope="scope">
               {{
             align="center"
             label="置换率(ml/min)"
             width="120"
-            v-if="isShow('置换率') && (template_id == 6  || template_id == 10 || template_id == 11)"
+            v-if="
+              isShow('置换率') &&
+                (template_id == 6 || template_id == 10 || template_id == 11)
+            "
           >
             <template slot-scope="scope">
               {{ scope.row.replacement_rate ? scope.row.replacement_rate : "" }}
             align="center"
             label="置换率(L/h)"
             width="120"
-            v-if="isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11"
+            v-if="
+              isShow('置换率') &&
+                template_id != 6 &&
+                template_id != 10 &&
+                template_id != 11
+            "
           >
             <template slot-scope="scope">
               {{ scope.row.replacement_rate ? scope.row.replacement_rate : "" }}
             align="center"
             label="置换量(ml)"
             width="100"
-            v-if="isShow('置换量') && (template_id == 6 || template_id == 10 || template_id == 11)"
+            v-if="
+              isShow('置换量') &&
+                (template_id == 6 || template_id == 10 || template_id == 11)
+            "
           >
             <template slot-scope="scope">
               {{
             align="center"
             label="置换量(L)"
             width="100"
-            v-if="isShow('置换量') && template_id != 6 && template_id != 10 && template_id != 11"
+            v-if="
+              isShow('置换量') &&
+                template_id != 6 &&
+                template_id != 10 &&
+                template_id != 11
+            "
           >
             <template slot-scope="scope">
               {{
-              scope.row.displacement_quantity
-              ? scope.row.displacement_quantity
-              : ""
+                scope.row.displacement_quantity
+                  ? scope.row.displacement_quantity
+                  : ""
               }}
             </template>
           </el-table-column>
             align="center"
             label="SpO₂(%)"
             width="100"
-            v-if="isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11"
+            v-if="
+              isShow('SpO₂') &&
+                template_id != 6 &&
+                template_id != 10 &&
+                template_id != 11
+            "
           >
             <template slot-scope="scope">
               {{
             </template>
           </el-table-column>
 
-
           <el-table-column
             prop="displacement_flow_quantity"
             align="center"
               <el-button
                 size="mini"
                 type="primary"
-                @click="venousPressureChange(1)"
+                @click="venousPressureChangeOne"
                 >转换</el-button
               >
             </el-form-item>
               <el-button
                 size="mini"
                 type="primary"
-                @click="venousPressureChange(3)"
+                @click="venousPressureChangeThree"
                 >转换</el-button
               >
             </el-form-item>
               <el-button
                 size="mini"
                 type="primary"
-                @click="venousPressureChange(2)"
+                @click="venousPressureChangeTwo"
                 >转换</el-button
               >
             </el-form-item>
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShow('超滤量') &&(template_id != 6 || template_id != 10 || template_id != 11)">
+          <el-col
+            :span="8"
+            v-if="
+              isShow('超滤量') &&
+                (template_id != 6 || template_id != 10 || template_id != 11)
+            "
+          >
             <el-form-item label="超滤量(ml)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShow('超滤量') && template_id != 6 && template_id != 10 && template_id != 11">
+          <el-col
+            :span="8"
+            v-if="
+              isShow('超滤量') &&
+                template_id != 6 &&
+                template_id != 10 &&
+                template_id != 11
+            "
+          >
             <el-form-item label="超滤量(L)：">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
 
-
           <el-col :span="8" v-if="isShow('肝素用量余量')">
             <el-form-item label="肝素用量余量(ml):">
               <el-input v-model="form.heparin"></el-input>
 } from "@/api/dialysis_record";
 import store from "@/store";
 
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 export default {
   name: "MonitorDialog",
   data() {
     return {
-      is_has_create:true,
-      is_has_modify:true,
-      is_has_modify_other:true,
-      is_has_del:true,
-      is_has_del_other:true,
+      is_has_create: true,
+      is_has_modify: true,
+      is_has_modify_other: true,
+      is_has_del: true,
+      is_has_del_other: true,
       visible: false,
       edit: false,
       current_row_class: "current-box-class",
-      creator:0,
+      creator: 0,
       patient_id: 0,
       schedule_date: 0,
       template_id: 0,
         displacement_quantity: "", // 置换量
         conductivity: "", // 电导度
         displacement_flow_quantity: "", // 置换液流量
-        heparin:"", //肝素用量余量
+        heparin: "", //肝素用量余量
         ktv: "", // KT/V
         symptom: "", // 病情变化
         dispose: "", // 处理
       dispose_selecteds: [],
       dispose_options: getDataConfig("hemodialysis", "deals"),
       result_selecteds: [],
-      result_options: getDataConfig("hemodialysis", "results")
+      result_options: getDataConfig("hemodialysis", "results"),
+      valueOne: 0,
+      valueTwo: 0,
+      valueThree: 0
     };
   },
   props: {
         );
       }
     },
+    venousPressureChangeOne() {
+      if (this.valueOne == 0) {
+        this.form.venous_pressure = Math.ceil(
+          Math.round(this.form.venous_pressure * 7.5)
+        );
+        this.valueOne = 1;
+        return false;
+      }
+      if (this.valueOne == 1) {
+        this.form.venous_pressure = Math.ceil(
+          Math.round(this.form.venous_pressure / 7.5)
+        );
+        this.valueOne = 0;
+        return false;
+      }
+    },
+    venousPressureChangeThree() {
+      if (this.valueThree == 0) {
+        this.form.arterial_pressure = Math.ceil(
+          Math.round(this.form.arterial_pressure * 7.5)
+        );
+        this.valueThree = 1;
+        return false;
+      }
+      if (this.valueThree == 1) {
+        this.form.arterial_pressure = Math.ceil(
+          Math.round(this.form.arterial_pressure / 7.5)
+        );
+        this.valueThree = 0;
+        return false;
+      }
+    },
+
+    venousPressureChangeTwo() {
+      if (this.valueTwo == 0) {
+        this.form.transmembrane_pressure = Math.ceil(
+          Math.round(this.form.transmembrane_pressure * 7.5)
+        );
+        this.valueTwo = 1;
+        return false;
+      }
+      if (this.valueTwo == 1) {
+        this.form.transmembrane_pressure = Math.ceil(
+          Math.round(this.form.transmembrane_pressure / 7.5)
+        );
+        this.valueTwo = 0;
+        return false;
+      }
+    },
+
     isShow(name) {
       var filedList = store.getters.xt_user.fileds;
       for (let i = 0; i < filedList.length; i++) {
       this.cancelEditAction();
     },
     show() {
-      this.getPermission()
+      this.getPermission();
       this.visible = true;
     },
     hide() {
         this.form.replacement_rate = resp.monitor.replacement_rate
           ? resp.monitor.replacement_rate
           : "";
-        this.form.heparin = resp.monitor.heparin
-          ? resp.monitor.heparin
-          : "";
+        this.form.heparin = resp.monitor.heparin ? resp.monitor.heparin : "";
         this.form.displacement_quantity = ""; // this.last_monitor_record.displacement_quantity;
         this.form.conductivity = "";
         this.form.displacement_flow_quantity = "";
         this.$message.error("请选择一条监测记录");
         return;
       }
-      this.creator = this.table_current_row.creator
-      console.log( this.table_current_row)
-      console.log( this.table_current_row.creator)
-      console.log(this.creator)
+      this.creator = this.table_current_row.creator;
+      console.log(this.table_current_row);
+      console.log(this.table_current_row.creator);
+      console.log(this.creator);
       this.setEditMonitor(this.table_current_row);
       this.$refs.table.setCurrentRow(null);
       this.edit = true;
           ? monitor.displacement_flow_quantity
           : "";
 
-        this.form.heparin = monitor.heparin
-          ? monitor.heparin
-          : "";
-
-
+        this.form.heparin = monitor.heparin ? monitor.heparin : "";
 
         this.form.ktv = monitor.ktv;
         this.form.symptom = monitor.symptom;
           ? 0
           : parseFloat(this.form.displacement_flow_quantity);
 
-
       this.form.heparin =
         parseFloat(this.form.heparin) == NaN
           ? 0
         parseFloat(this.form.ktv) == NaN ? 0 : parseFloat(this.form.ktv);
       this.form.monitoring_date = parseInt(this.form.monitoring_date);
 
-
-      let mode = "1"
-       if(this.form.id > 0){
-         mode = "2"
-         if(this.creator > 0 && this.creator!= this.$store.getters.xt_user.user.id){
-          mode = "3"
-         }
+      let mode = "1";
+      if (this.form.id > 0) {
+        mode = "2";
+        if (
+          this.creator > 0 &&
+          this.creator != this.$store.getters.xt_user.user.id
+        ) {
+          mode = "3";
+        }
       }
-      editMonitor(this.patient_id, this.schedule_date, this.form,mode).then(rs => {
-        var resp = rs.data;
-        if (resp.state == 1) {
-          var monitor = resp.data.monitor;
-          if (this.isAdd) {
-            this.monitors.unshift(monitor);
-            this.monitors.sort((a, b) => b.operate_time - a.operate_time);
-            this.monitors.reverse();
-          } else {
-            for (let index = 0; index < this.monitors.length; index++) {
-              const m = this.monitors[index];
-              if (m.id == monitor.id) {
-                for (const key in monitor) {
-                  m[key] = monitor[key];
+      editMonitor(this.patient_id, this.schedule_date, this.form, mode).then(
+        rs => {
+          var resp = rs.data;
+          if (resp.state == 1) {
+            var monitor = resp.data.monitor;
+            if (this.isAdd) {
+              this.monitors.unshift(monitor);
+              this.monitors.sort((a, b) => b.operate_time - a.operate_time);
+              this.monitors.reverse();
+            } else {
+              for (let index = 0; index < this.monitors.length; index++) {
+                const m = this.monitors[index];
+                if (m.id == monitor.id) {
+                  for (const key in monitor) {
+                    m[key] = monitor[key];
+                  }
+                  break;
                 }
-                break;
               }
             }
+            this.reset();
+          } else {
+            this.form.systolic_bp =
+              parseFloat(this.form.systolic_bp) == NaN
+                ? 0
+                : parseFloat(this.form.systolic_bp);
+            this.form.diastolic_bp =
+              parseFloat(this.form.diastolic_bp) == NaN
+                ? 0
+                : parseFloat(this.form.diastolic_bp);
+            this.form.temperature =
+              parseFloat(this.form.temperature) == NaN
+                ? 0
+                : parseFloat(this.form.temperature);
+            this.form.pulse_frequency =
+              parseFloat(this.form.pulse_frequency) == NaN
+                ? 0
+                : parseFloat(this.form.pulse_frequency);
+            this.form.breathing_rated =
+              parseFloat(this.form.breathing_rated) == NaN
+                ? 0
+                : parseFloat(this.form.breathing_rated);
+            this.form.blood_flow_volume =
+              parseFloat(this.form.blood_flow_volume) == NaN
+                ? 0
+                : parseFloat(this.form.blood_flow_volume);
+            this.form.venous_pressure =
+              parseFloat(this.form.venous_pressure) == NaN
+                ? 0
+                : parseFloat(this.form.venous_pressure);
+            this.form.transmembrane_pressure =
+              parseFloat(this.form.transmembrane_pressure) == NaN
+                ? 0
+                : parseFloat(this.form.transmembrane_pressure);
+            this.form.ultrafiltration_volume =
+              parseFloat(this.form.ultrafiltration_volume) == NaN
+                ? 0
+                : parseFloat(this.form.ultrafiltration_volume);
+            this.form.ultrafiltration_rate =
+              parseFloat(this.form.ultrafiltration_rate) == NaN
+                ? 0
+                : parseFloat(this.form.ultrafiltration_rate);
+            this.form.arterial_pressure =
+              parseFloat(this.form.arterial_pressure) == NaN
+                ? 0
+                : parseFloat(this.form.arterial_pressure);
+            this.form.sodium_concentration =
+              parseFloat(this.form.sodium_concentration) == NaN
+                ? 0
+                : parseFloat(this.form.sodium_concentration);
+            this.form.dialysate_temperature =
+              parseFloat(this.form.dialysate_temperature) == NaN
+                ? 0
+                : parseFloat(this.form.dialysate_temperature);
+            this.form.replacement_rate =
+              parseFloat(this.form.replacement_rate) == NaN
+                ? 0
+                : parseFloat(this.form.replacement_rate);
+            this.form.displacement_quantity =
+              parseFloat(this.form.displacement_quantity) == NaN
+                ? 0
+                : parseFloat(this.form.displacement_quantity);
+            this.form.conductivity =
+              parseFloat(this.form.conductivity) == NaN
+                ? 0
+                : parseFloat(this.form.conductivity);
+            this.form.displacement_flow_quantity =
+              parseFloat(this.form.displacement_flow_quantity) == NaN
+                ? 0
+                : parseFloat(this.form.displacement_flow_quantity);
+
+            this.form.heparin =
+              parseFloat(this.form.heparin) == NaN
+                ? 0
+                : parseFloat(this.form.heparin);
+
+            this.form.ktv =
+              parseFloat(this.form.ktv) == NaN ? 0 : parseFloat(this.form.ktv);
+
+            this.$message.error(resp.msg);
           }
-          this.reset();
-        } else {
-          this.form.systolic_bp =
-            parseFloat(this.form.systolic_bp) == NaN
-              ? 0
-              : parseFloat(this.form.systolic_bp);
-          this.form.diastolic_bp =
-            parseFloat(this.form.diastolic_bp) == NaN
-              ? 0
-              : parseFloat(this.form.diastolic_bp);
-          this.form.temperature =
-            parseFloat(this.form.temperature) == NaN
-              ? 0
-              : parseFloat(this.form.temperature);
-          this.form.pulse_frequency =
-            parseFloat(this.form.pulse_frequency) == NaN
-              ? 0
-              : parseFloat(this.form.pulse_frequency);
-          this.form.breathing_rated =
-            parseFloat(this.form.breathing_rated) == NaN
-              ? 0
-              : parseFloat(this.form.breathing_rated);
-          this.form.blood_flow_volume =
-            parseFloat(this.form.blood_flow_volume) == NaN
-              ? 0
-              : parseFloat(this.form.blood_flow_volume);
-          this.form.venous_pressure =
-            parseFloat(this.form.venous_pressure) == NaN
-              ? 0
-              : parseFloat(this.form.venous_pressure);
-          this.form.transmembrane_pressure =
-            parseFloat(this.form.transmembrane_pressure) == NaN
-              ? 0
-              : parseFloat(this.form.transmembrane_pressure);
-          this.form.ultrafiltration_volume =
-            parseFloat(this.form.ultrafiltration_volume) == NaN
-              ? 0
-              : parseFloat(this.form.ultrafiltration_volume);
-          this.form.ultrafiltration_rate =
-            parseFloat(this.form.ultrafiltration_rate) == NaN
-              ? 0
-              : parseFloat(this.form.ultrafiltration_rate);
-          this.form.arterial_pressure =
-            parseFloat(this.form.arterial_pressure) == NaN
-              ? 0
-              : parseFloat(this.form.arterial_pressure);
-          this.form.sodium_concentration =
-            parseFloat(this.form.sodium_concentration) == NaN
-              ? 0
-              : parseFloat(this.form.sodium_concentration);
-          this.form.dialysate_temperature =
-            parseFloat(this.form.dialysate_temperature) == NaN
-              ? 0
-              : parseFloat(this.form.dialysate_temperature);
-          this.form.replacement_rate =
-            parseFloat(this.form.replacement_rate) == NaN
-              ? 0
-              : parseFloat(this.form.replacement_rate);
-          this.form.displacement_quantity =
-            parseFloat(this.form.displacement_quantity) == NaN
-              ? 0
-              : parseFloat(this.form.displacement_quantity);
-          this.form.conductivity =
-            parseFloat(this.form.conductivity) == NaN
-              ? 0
-              : parseFloat(this.form.conductivity);
-          this.form.displacement_flow_quantity =
-            parseFloat(this.form.displacement_flow_quantity) == NaN
-              ? 0
-              : parseFloat(this.form.displacement_flow_quantity);
-
-          this.form.heparin =
-            parseFloat(this.form.heparin) == NaN
-              ? 0
-              : parseFloat(this.form.heparin);
-
-          this.form.ktv =
-            parseFloat(this.form.ktv) == NaN ? 0 : parseFloat(this.form.ktv);
-
-
-          this.$message.error(resp.msg);
         }
-      });
+      );
     },
 
     symptomTextareaBlur: function() {
         type: "warning"
       })
         .then(() => {
-          let mode = "4"
-          if(this.table_current_row.creator > 0 && this.table_current_row.creator != this.$store.getters.xt_user.user.id){
-            mode = "5"
+          let mode = "4";
+          if (
+            this.table_current_row.creator > 0 &&
+            this.table_current_row.creator !=
+              this.$store.getters.xt_user.user.id
+          ) {
+            mode = "5";
           }
 
           const params = {
             patient_id: this.patient_id,
             record_id: this.table_current_row.id,
             mode: mode
-
           };
 
           postDelMonitorInfo(params).then(response => {
                 }
               }
               this.$message.success("删除成功");
-
             }
           });
         })
         .catch(() => {});
     },
     getPermission() {
-        request.get("/api/func_per/get", {
+      request
+        .get("/api/func_per/get", {
           params: {
             create_url: "/api/dislysis/monitor/edit?mode=1",
             modify_url: "/api/dislysis/monitor/edit?mode=2",
             del_other_url: "/api/dialysis/monitor/del?mode=5",
             module: 7
           }
-        }).then(res => {
-          console.log(res)
+        })
+        .then(res => {
+          console.log(res);
           if (res.data.state == 0) {
-            this.hasPermission = false
+            this.hasPermission = false;
           } else if (res.data.state == 1) {
-            this.is_has_create = res.data.data.is_has_create
-            this.is_has_exce = res.data.data.is_has_exce
-            this.is_has_check = res.data.data.is_has_check
-            this.is_has_modify = res.data.data.is_has_modify
-            this.is_has_modify_other = res.data.data.is_has_modify_other
-            this.is_has_modify_exce = res.data.data.is_has_modify_exce
-            this.is_has_del = res.data.data.is_has_del
-            this.is_has_del_other = res.data.data.is_has_del_other
+            this.is_has_create = res.data.data.is_has_create;
+            this.is_has_exce = res.data.data.is_has_exce;
+            this.is_has_check = res.data.data.is_has_check;
+            this.is_has_modify = res.data.data.is_has_modify;
+            this.is_has_modify_other = res.data.data.is_has_modify_other;
+            this.is_has_modify_exce = res.data.data.is_has_modify_exce;
+            this.is_has_del = res.data.data.is_has_del;
+            this.is_has_del_other = res.data.data.is_has_del_other;
           }
-        })
-      }
+        });
+    }
   }
 };
 </script>
 .el-table__body-wrapper::-webkit-scrollbar {
   height: 20px;
 }
-.dialog_box .current-box-class .current-row{
+.dialog_box .current-box-class .current-row {
   background: #87ceff;
 }
 .dialog_box tr:hover > td {

src/xt_pages/user/components/PatientSidebar.vue

         >姓名：{{ currentPatient.name }}    性别：{{
           tranSex(currentPatient.gender)
         }}
-           年龄：{{ tranAge(currentPatient.birthday) }}   
-        透析号：{{ currentPatient.dialysis_no }}
+           年龄：{{ getAge(currentPatient) }}    透析号：{{
+          currentPatient.dialysis_no
+        }}
       </span>
     </div>
   </div>
             for (let index = 0; index < len; index++) {
               if (this.patientsList[index].id == this.id) {
                 this.currentPatient = this.patientsList[index];
-
+                //console.log("curr", this.currentPatient);
                 this.selectID = this.patientsList[index].id;
                 this.$emit("tran-patient", this.currentPatient);
                 break;
     },
     handleSelect(val) {
       this.$router.push("/patients/patient/" + val.id);
+    },
+    getAge: function(val) {
+      var thisLen = val.id_card_no.length;
+      var birth = "";
+      if (thisLen == 15) {
+        birth = "19" + val.id_card_no.substr(6, 6);
+      } else {
+        birth = val.id_card_no.substr(6, 8);
+      }
+      var birthtwo =
+        birth.substr(0, 4) +
+        "-" +
+        birth.substr(4, 2) +
+        "-" +
+        birth.substr(6, 2);
+
+      var age = jsGetAge(birthtwo, "-");
+      return age;
     }
   },
   created() {

src/xt_pages/user/doctorAdvice.vue

           align="center"
         >
           <template slot-scope="scope">
-            <span v-if="isShowStartTime(scope.$index, scope.row)">{{
+            <span>{{
               scope.row.start_time | parseTime("{y}-{m}-{d} {h}:{i}")
             }}</span>
-            <span v-else></span>
           </template>
         </el-table-column>
 
         </el-table-column>
       </el-table>
 
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;float: right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+
       <el-dialog
         title="新增医嘱"
         :visible.sync="groupFormVisible"
         limit: 10,
         page: 1
       },
+      total: 0,
       addLoading: false,
       lstableData: [],
       cqtableData: [],
           this.doctorAdvice = arr;
           var total = response.data.data.total;
           console.log("total", total);
-
+          this.total = total;
           this.operators = response.data.data.operators;
           if (this.operators.length > 0) {
             var operatorsLen = this.operators.length;
         this.$message.error("该病人未排班,不能开临时医嘱!");
         this.groupFormVisible = false;
       }
+    },
+    handleCurrentChange(page) {
+      this.listQuery.page = page;
+      this.getList();
+    },
+    handleSizeChange(limit) {
+      this.listQuery.limit = limit;
+      this.getList();
     }
   },
   watch: {

src/xt_pages/user/patients.vue

             <span v-else>未知</span>
           </template>
         </el-table-column>
-        <el-table-column
-          label="透析次数"
-          min-width="94"
-          align="center"
-        >
-          <template slot-scope="scope" >
-            <span>{{getCount(scope.row)}}</span>
+        <el-table-column label="透析次数" min-width="94" align="center">
+          <template slot-scope="scope">
+            <span>{{ getCount(scope.row) }}</span>
           </template>
         </el-table-column>
         <!-- <el-table-column min-width="150" label="二维码" align="center">
   },
 
   methods: {
-    getCount(row){
-      console.log(row)
-      return row.total_dialysis + row.user_sys_before_count
+    getCount(row) {
+      console.log(row);
+      return row.total_dialysis + row.user_sys_before_count;
     },
     EditLapseto() {
       if (this.lapsetoForm.lapseto_time == "") {
       var dialysisno = this.dialysis_no;
 
       // Base64位加密
-      var aid = this.Base64.encode(id);
-      var aname = this.Base64.encode(name);
-      var agender = this.Base64.encode(gender);
-      var aidcardno = this.Base64.encode(idcardno);
-      var aphone = this.Base64.encode(phone);
-      var ahealthcareno = this.Base64.encode(healthcareno);
-      var adialysisno = this.Base64.encode(dialysisno);
+      // var aid = this.Base64.encode(id);
+      // var aname = this.Base64.encode(name);
+      //  var agender = this.Base64.encode(gender);
+      //  var aidcardno = this.Base64.encode(idcardno);
+      // var aphone = this.Base64.encode(phone);
+      // var ahealthcareno = this.Base64.encode(healthcareno);
+      // var adialysisno = this.Base64.encode(dialysisno);
       // 调用生成二维码的方法
       this.$options.methods.qrcode(
-        aid,
-        aname,
-        agender,
-        aidcardno,
-        aphone,
-        ahealthcareno,
-        adialysisno
+        id,
+        name,
+        gender,
+        idcardno,
+        phone,
+        healthcareno,
+        dialysisno
       );
     },
     qrcode(id, name, gender, idcardno, phone, healthcareno, dialysisno) {