Merge branch 'master' of http://git.shengws.com/csx/Pad_New

src/api/patient/patient.js

@@ -947,3 +947,12 @@ export function getOrgs (params) {
     params: params
   })
 }
+
+export function getNewPatientId (id, params) {
+  console.log('id------', id)
+  return request({
+    url: '/m/api/patient/getnewpatientid?id=' + id,
+    method: 'get',
+    params: params
+  })
+}

src/pages/doctorAdvice/components/RescueRecord.vue

@@ -102,27 +102,27 @@ import {
   getPatientDetail,
   getRescueRecord,
   DeleteRescueRecord
-} from "@/api/patient/patient";
-import { uParseTime } from "@/utils/tools";
-import Vue from "vue";
-import { Dialog } from "vant";
-const moment = require("moment");
+} from '@/api/patient/patient'
+import { uParseTime } from '@/utils/tools'
+import Vue from 'vue'
+import { Dialog } from 'vant'
+const moment = require('moment')
 export default {
   props: {
     active: Number
   },
-  data() {
+  data () {
     return {
       newShow: false,
       startShow: false,
       endShow: false,
-      startTime: "请选择",
-      endTime: "请选择",
-      endTimes: "",
+      startTime: '请选择',
+      endTime: '请选择',
+      endTimes: '',
       minDate: new Date(1970, 0, 1),
       maxDate: new Date(2025, 10, 1),
       currentDate: new Date(),
-      actions: [{ name: "查看全部" }, { name: "全部删除" }],
+      actions: [{ name: '查看全部' }, { name: '全部删除' }],
       showOne: true,
       showTwo: false,
       limit: 10,
@@ -135,81 +135,81 @@ export default {
       list: [],
       id: 0,
       index: 0
-    };
+    }
   },
   methods: {
-    onCancel() {
-      this.typeShow = false;
+    onCancel () {
+      this.typeShow = false
     },
-    onConfirm(value) {
-      this.type = value;
-      this.typeShow = false;
+    onConfirm (value) {
+      this.type = value
+      this.typeShow = false
     },
-    getstartTime(value) {
-      this.page = 1;
-      let year = value.getFullYear();
-      let month = value.getMonth() + 1;
-      let day = value.getDate();
+    getstartTime (value) {
+      this.page = 1
+      let year = value.getFullYear()
+      let month = value.getMonth() + 1
+      let day = value.getDate()
       if (month >= 1 && month <= 9) {
-        month = `0${month}`;
+        month = `0${month}`
       }
       if (day >= 1 && day <= 9) {
-        day = `0${day}`;
+        day = `0${day}`
       }
 
-      this.startTime = `${year}-${month}-${day}`;
-      this.rescueRecords = [];
+      this.startTime = `${year}-${month}-${day}`
+      this.rescueRecords = []
       this.getRescueRecord(
         this.patient_id,
         this.limit,
         this.page,
         this.startTime,
         this.endTime
-      );
-      this.startShow = false;
+      )
+      this.startShow = false
     },
-    getstartTime2(value) {
-      this.page = 1;
-      let year = value.getFullYear();
-      let month = value.getMonth() + 1;
-      let day = value.getDate();
+    getstartTime2 (value) {
+      this.page = 1
+      let year = value.getFullYear()
+      let month = value.getMonth() + 1
+      let day = value.getDate()
       if (month >= 1 && month <= 9) {
-        month = `0${month}`;
+        month = `0${month}`
       }
       if (day >= 1 && day <= 9) {
-        day = `0${day}`;
+        day = `0${day}`
       }
 
-      this.endTime = `${year}-${month}-${day}`;
-      this.rescueRecords = [];
+      this.endTime = `${year}-${month}-${day}`
+      this.rescueRecords = []
       this.getRescueRecord(
         this.patient_id,
         this.limit,
         this.page,
         this.startTime,
         this.endTime
-      );
-      this.endShow = false;
+      )
+      this.endShow = false
     },
-    getPatientDetail(patientid) {
+    getPatientDetail (patientid) {
       getPatientDetail(patientid).then(response => {
         if (response.data.state === 1) {
-          var patientDetail = response.data.data.patientDetail;
+          var patientDetail = response.data.data.patientDetail
           if (patientDetail.blood_patients == 0) {
-            this.rescueRecords = [];
-            this.showOne = false;
-            this.showTwo = true;
+            this.rescueRecords = []
+            this.showOne = false
+            this.showTwo = true
           }
           if (patientDetail.blood_patients == 1) {
-            this.showOne = true;
-            this.showTwo = false;
+            this.showOne = true
+            this.showTwo = false
           }
           // console.log("病人详情", patientDetail);
-          this.patientName = patientDetail.name;
+          this.patientName = patientDetail.name
         }
-      });
+      })
     },
-    getRescueRecord(id) {
+    getRescueRecord (id) {
       getRescueRecord(
         id,
         this.limit,
@@ -218,20 +218,20 @@ export default {
         this.endTime
       ).then(response => {
         if (response.data.state === 1) {
-          var rescuerecord = response.data.data.rescuerecord;
+          var rescuerecord = response.data.data.rescuerecord
           // console.log("抢救记录", rescuerecord);
-          let arr = this.rescueRecords;
-          arr.push(...rescuerecord);
-          this.rescueRecords = arr;
-          var total = response.data.data.total;
+          let arr = this.rescueRecords
+          arr.push(...rescuerecord)
+          this.rescueRecords = arr
+          var total = response.data.data.total
           // console.log("总计", total);
-          this.loading = false;
+          this.loading = false
         }
-      });
+      })
     },
-    onLoad() {
+    onLoad () {
       setTimeout(() => {
-        this.page++;
+        this.page++
         // console.log(this.page)
         if (this.page <= Math.ceil(this.total / 10)) {
           this.getRescueRecord(
@@ -240,73 +240,73 @@ export default {
             this.endTimes,
             this.limit,
             this.page
-          );
+          )
         } else {
-          this.loading = false;
-          this.finished = true;
+          this.loading = false
+          this.finished = true
         }
-      }, 1000);
+      }, 1000)
     },
-    getTime(time) {
+    getTime (time) {
       // return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
-      return uParseTime(time, "{y}-{m}-{d}");
+      return uParseTime(time, '{y}-{m}-{d}')
     },
-    toRescueRecord(id) {
-      var patientid = this.$route.query.patientid;
+    toRescueRecord (id) {
+      var patientid = this.$route.query.patientid
       this.$router.push(
-        "/rescuerecord?id=" +
+        '/rescuerecord?id=' +
           id +
-          "&patientid=" +
+          '&patientid=' +
           patientid +
-          "&active=" +
+          '&active=' +
           this.active
-      );
+      )
     },
-    toDeleteRescueRecord(id, index) {
-      this.id = id;
-      this.index = index;
-      this.newShow = true;
+    toDeleteRescueRecord (id, index) {
+      this.id = id
+      this.index = index
+      this.newShow = true
     },
-    Delete(value) {
-      if (value.name == "查看全部") {
-        var patientid = this.$route.query.patientid;
+    Delete (value) {
+      if (value.name == '查看全部') {
+        var patientid = this.$route.query.patientid
         this.$router.push(
-          "/rescuerecord?id=" +
+          '/rescuerecord?id=' +
             this.id +
-            "&patientid=" +
+            '&patientid=' +
             patientid +
-            "&active=" +
+            '&active=' +
             this.active
-        );
+        )
       }
-      if (value.name == "全部删除") {
-        this.DeleteRescueRecord(this.id, this.index);
+      if (value.name == '全部删除') {
+        this.DeleteRescueRecord(this.id, this.index)
       }
     },
-    DeleteRescueRecord(id, index) {
+    DeleteRescueRecord (id, index) {
       Dialog.confirm({
-        title: "删除提示!",
-        message: "确认删除该条信息吗?,删除后将无法恢复!"
+        title: '删除提示!',
+        message: '确认删除该条信息吗?,删除后将无法恢复!'
       }).then(() => {
         DeleteRescueRecord(id).then(response => {
           if (response.data.state === 1) {
-            var msg = response.data.data.msg;
-            console.log("msg", msg);
-            this.rescueRecords.splice(index, 1);
-            this.newShow = false;
+            var msg = response.data.data.msg
+            console.log('msg', msg)
+            this.rescueRecords.splice(index, 1)
+            this.newShow = false
           }
-        });
-      });
+        })
+      })
     }
   },
-  created() {
-    var patientid = this.$route.query.patientid;
-    console.log("病人id能否获取", patientid);
-    this.patient_id = patientid;
-    this.getPatientDetail(patientid);
-    this.getRescueRecord(patientid);
+  created () {
+    var patientid = this.$route.query.patientid
+    // console.log("病人id能否获取", patientid);
+    this.patient_id = patientid
+    this.getPatientDetail(patientid)
+    this.getRescueRecord(patientid)
   }
-};
+}
 </script>
 
 <style lang="scss" scoped>

src/pages/main/PatientBox.vue

@@ -69,174 +69,174 @@
 </template>
 
 <script>
-import { parseTime } from "@/utils";
-import { jsGetAge } from "@/utils/tools";
-import { setDialysisOrWaitSelectedConfig } from "@/utils/data_config";
+import { parseTime } from '@/utils'
+import { jsGetAge } from '@/utils/tools'
+import { setDialysisOrWaitSelectedConfig } from '@/utils/data_config'
 export default {
-  name: "PatientBox",
+  name: 'PatientBox',
   props: {
     patients: Array
   },
-  data() {
-    return {};
+  data () {
+    return {}
   },
   methods: {
-    getUnReadNum: function(schedual) {
+    getUnReadNum: function (schedual) {
       if (schedual.doctor_advice != null) {
-        let doctorAdvice = [];
+        let doctorAdvice = []
         for (let i = 0; i < schedual.doctor_advice.length; i++) {
           if (schedual.doctor_advice[i].execution_state == 2) {
-            doctorAdvice.push(schedual.doctor_advice[i]);
+            doctorAdvice.push(schedual.doctor_advice[i])
           }
         }
-        const sorted = this.groupBy(doctorAdvice, function(item) {
-          return [item.groupno];
-        });
-        return sorted.length;
+        const sorted = this.groupBy(doctorAdvice, function (item) {
+          return [item.groupno]
+        })
+        return sorted.length
       }
     },
-    getStatus: function(schedual) {
-      var isShowDot = false;
+    getStatus: function (schedual) {
+      var isShowDot = false
       if (schedual.doctor_advice != null) {
         for (let i = 0; i < schedual.doctor_advice.length; i++) {
           if (schedual.doctor_advice[i].execution_state == 2) {
-            isShowDot = true;
+            isShowDot = true
           }
         }
-        return isShowDot;
+        return isShowDot
       } else {
-        return false;
+        return false
       }
     },
-    stateColor: function(schedual) {
-      var state = this.computeState(schedual);
+    stateColor: function (schedual) {
+      var state = this.computeState(schedual)
       if (state == 1) {
-        return "blue";
+        return 'blue'
       } else if (state == 2) {
-        return "gray";
+        return 'gray'
       } else if (state == 3) {
-        return "red";
+        return 'red'
       } else if (state == 5) {
-        return "green1";
+        return 'green1'
       } else if (state == 6) {
-        return "green2";
+        return 'green2'
       } else {
-        return "blue";
+        return 'blue'
       }
     },
-    functionColor: function(schedual) {
-      var state = this.computeState(schedual);
+    functionColor: function (schedual) {
+      var state = this.computeState(schedual)
       if (state == 1 || state == 3) {
-        return "blue";
+        return 'blue'
       } else if (state == 2) {
-        return "gray";
+        return 'gray'
       } else {
-        return "blue";
+        return 'blue'
       }
     },
-    borderColor: function(schedual) {
-      var yc = this.isAbnormal(schedual);
+    borderColor: function (schedual) {
+      var yc = this.isAbnormal(schedual)
       if (yc == true) {
-        return "red";
+        return 'red'
       } else {
-        return "gray";
+        return 'gray'
       }
     },
-    stateText: function(schedual) {
-      var state = this.computeState(schedual);
+    stateText: function (schedual) {
+      var state = this.computeState(schedual)
       if (state == 1) {
-        return "已上机";
+        return '已上机'
       } else if (state == 2) {
-        return "已下机";
+        return '已下机'
       } else if (state == 3) {
-        return "监测中";
+        return '监测中'
       } else if (state == 5) {
-        return "待称重";
+        return '待称重'
       } else if (state == 6) {
-        return "待开处方";
+        return '待开处方'
       } else {
         // return schedual.patient.gender == 1 ? "男" : "女"
-        return "未上机";
+        return '未上机'
       }
     },
-    computeState: function(schedual) {
+    computeState: function (schedual) {
       if (
         schedual.assessment_before_dislysis == null ||
         schedual.assessment_before_dislysis.weight_before == 0
       ) {
         // 未签到称重
-        return 5;
+        return 5
       }
       if (schedual.prescription == null || schedual.prescription.creater == 0) {
         // 未确认处方
-        return 6;
+        return 6
       }
 
       if (schedual.dialysis_order == null) {
         // 未上机
-        return 4;
+        return 4
       } else if (schedual.dialysis_order.stage == 2) {
         // 已下机
-        return 2;
+        return 2
       } else if (
         schedual.dialysis_order.stage == 1 &&
         schedual.monitoring_records != null &&
         schedual.monitoring_records.length > 1
       ) {
         // 监测中
-        return 3;
+        return 3
       } else {
-        return 1;
+        return 1
       }
     },
 
-    orderState: function(schedual) {
+    orderState: function (schedual) {
       if (schedual.dialysis_order == null) {
         // 未上机
-        return 4;
+        return 4
       } else if (schedual.dialysis_order.stage == 2) {
         // 已下机
-        return 2;
+        return 2
       } else if (
         schedual.dialysis_order.stage == 1 &&
         schedual.monitoring_records != null &&
         schedual.monitoring_records.length > 1
       ) {
         // 监测中
-        return 3;
+        return 3
       } else {
-        return 1;
+        return 1
       }
     },
-    isAbnormal: function(schedual) {
-      return false; // schedual.yc;
+    isAbnormal: function (schedual) {
+      return false // schedual.yc;
     },
-    timeTypeText: function(schedual) {
+    timeTypeText: function (schedual) {
       if (schedual.schedule_type == 1) {
-        return "上午";
+        return '上午'
       } else if (schedual.schedule_type == 2) {
-        return "下午";
+        return '下午'
       } else {
-        return "晚上";
+        return '晚上'
       }
     },
-    genderText: function(schedual) {
+    genderText: function (schedual) {
       if (schedual.patient.gender == 0) {
-        return "未知";
+        return '未知'
       } else if (schedual.patient.gender == 1) {
-        return "男";
+        return '男'
       } else {
-        return "女";
+        return '女'
       }
     },
-    age: function(schedual) {
+    age: function (schedual) {
       if (schedual.patient.birthday != 0) {
         return jsGetAge(
-          parseTime(schedual.patient.birthday, "{y}-{m}-{d}"),
-          "-"
-        );
+          parseTime(schedual.patient.birthday, '{y}-{m}-{d}'),
+          '-'
+        )
       } else {
-        return "";
+        return ''
       }
 
       // var now = new Date();
@@ -246,37 +246,38 @@ export default {
       // // console.log(birthdayYear)
       // return nowYear - birthdayYear;
     },
-    groupBy(array, f) {
-      const groups = {};
-      array.forEach(function(o) {
-        const group = JSON.stringify(f(o));
-        groups[group] = groups[group] || [];
-        groups[group].push(o);
-      });
-      return Object.keys(groups).map(function(group) {
-        return groups[group];
-      });
+    groupBy (array, f) {
+      const groups = {}
+      array.forEach(function (o) {
+        const group = JSON.stringify(f(o))
+        groups[group] = groups[group] || []
+        groups[group].push(o)
+      })
+      return Object.keys(groups).map(function (group) {
+        return groups[group]
+      })
     },
-    detailAction: function(schedual) {
+    detailAction: function (schedual) {
       if (schedual.dialysis_order != null) {
-        setDialysisOrWaitSelectedConfig(1);
+        setDialysisOrWaitSelectedConfig(1)
       } else {
-        setDialysisOrWaitSelectedConfig(0);
+        setDialysisOrWaitSelectedConfig(0)
       }
 
-      var patient_id = schedual.patient_id;
-      var date = schedual.schedule_date;
+      var patient_id = schedual.patient_id
+      var date = schedual.schedule_date
       this.$router.push({
-        path: "/details",
+        path: '/details',
         query: {
           patient_id: patient_id,
           date: date,
           patient_name: schedual.patient.name
         }
-      });
+      })
     }
   }
-};
+
+}
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>

src/pages/main/dialysis/LongTable.vue

@@ -951,6 +951,7 @@
 
 <script>
 import {
+  getNewPatientId,
   GetLongDialysisRecord,
   getPatientDetail,
   DeleteLongDialysis
@@ -1010,7 +1011,8 @@ export default {
       showOne: true,
       showTwo: false,
       id: 0,
-      index: 0
+      index: 0,
+      newpatientid:0,
     };
   },
   methods: {
@@ -1036,7 +1038,7 @@ export default {
       this.startTime = `${year}-${month}-${day}`;
       this.dialysisrecord = [];
       this.GetLongDialysisRecord(
-        this.patient_id,
+        this.newpatientid,
         this.limit,
         this.page,
         this.startTime,
@@ -1059,7 +1061,7 @@ export default {
       this.endTime = `${year}-${month}-${day}`;
       this.dialysisrecord = [];
       this.GetLongDialysisRecord(
-        this.patient_id,
+        this.newpatientid,
         this.limit,
         this.page,
         this.startTime,
@@ -1161,7 +1163,7 @@ export default {
           let arr = this.dialysisrecord;
           arr.push(...dialysis);
           this.dialysisrecord = arr;
-          // console.log("长期透析处方", dialysis);
+           console.log("长期透析处方", dialysis);
           var total = response.data.data.total;
           // console.log("total", total);
           this.loading = false;
@@ -1173,7 +1175,7 @@ export default {
         this.page++;
         if (this.page <= Math.ceil(this.total / 10)) {
           this.GetLongDialysisRecord(
-            this.patient_id,
+            this.newpatientid,
             this.limit,
             this.page,
             this.startTime,
@@ -1203,8 +1205,8 @@ export default {
         }
       }
     },
-    getPatientDetail(patientid) {
-      getPatientDetail(patientid).then(response => {
+    getPatientDetail() {
+      getPatientDetail(this.newpatientid).then(response => {
         if (response.data.state === 1) {
           var patientDetail = response.data.data.patientDetail;
           if (patientDetail.blood_patients == 0) {
@@ -1221,12 +1223,11 @@ export default {
       });
     },
     toLongDialysisDetail(id) {
-      var patientid = this.$route.query.patientid;
       this.$router.push(
         "/alllongdialysis?id=" +
           id +
           "&patientid=" +
-          patientid +
+          this.newpatientid +
           "&active=" +
           this.active
       );
@@ -1238,12 +1239,11 @@ export default {
     },
     toDelete(value) {
       if (value.name == "查看全部") {
-        var patientid = this.$route.query.patientid;
         this.$router.push(
           "/alllongdialysis?id=" +
             this.id +
             "&patientid=" +
-            patientid +
+            newpatientid +
             "&active=" +
             this.active
         );
@@ -1265,14 +1265,23 @@ export default {
           }
         });
       });
+    },
+    getNewPatientId(id){
+      getNewPatientId(id).then(response=>{
+         if(response.data.state == 1){
+          var patient =  response.data.data.patient
+          this.newpatientid = patient.id
+           console.log("newpatientid",this.newpatientid)
+           this.GetLongDialysisRecord(this.newpatientid);
+           this.getPatientDetail(this.newpatientid);
+         }
+      })
     }
   },
   created() {
-    var patientid = this.$route.query.patientid;
-    this.patient_id = patientid;
-
-    this.GetLongDialysisRecord(patientid);
-    this.getPatientDetail(patientid);
+    var patient_id = this.$route.query.patient_id
+    console.log("病人ID",patient_id)
+    this.getNewPatientId(patient_id)
     this.blood_access_option = this.$store.getters.blood_access;
 
     this.anticoagulantsSet = this.$store.getters.anticoagulants_set;
@@ -1397,7 +1406,7 @@ export default {
     transform: translate3d(0, 0, 0);
     top: initial;
   }
-  
+
 }
 ::-webkit-scrollbar {
   width: 0;
@@ -1436,22 +1445,6 @@ export default {
 }
 </style>
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 // <style style="stylesheet/scss" lang="scss" scoped>
 // .textarea {
 //   width: 100%;

src/pages/main/dialysis/RecordTable.vue

@@ -20,7 +20,6 @@
             </div>
           </li>
 
-
           <el-popover placement="bottom" trigger="click">
             <li slot="reference">
               透析模式：{{ modeNameOther(mode_id) }}
@@ -652,7 +651,7 @@
 </script>
 
 <script>
-import { getPatientDetail, getDialysisRecord } from "@/api/patient/patient";
+import { getNewPatientId,getPatientDetail, getDialysisRecord } from "@/api/patient/patient";
 import { uParseTime } from "@/utils/tools";
 import Vue from "vue";
 import { Dialog } from "vant";
@@ -843,6 +842,7 @@ export default {
       ).then(response => {
         if (response.data.state === 1) {
           var dialysisrecord = response.data.data.dialysisrecord;
+          console.log("透析记录",dialysisrecord)
           let arr = this.dialysisRecord;
           arr.push(...dialysisrecord);
           this.dialysisRecord = arr;
@@ -910,20 +910,28 @@ export default {
           }
         });
       });
+    },
+    getNewPatientId(id){
+      getNewPatientId(id).then(response=>{
+         if(response.data.state === 1){
+          var patient =  response.data.data.patient
+          console.log("透析记录",patient)
+           this.patient_id = patient.id;
+           this.getDialysisRecord(patient.id);
+           this.getPatientDetail(patient.id);
+
+         }
+      })
     }
   },
   created() {
-    var patientid = this.$route.query.patientid;
-    this.getPatientDetail(patientid);
-    this.getDialysisRecord(patientid);
-    this.patient_id = patientid;
+    var patientid = this.$route.query.patient_id;
+    console.log("并嗯ID",patientid)
+    this.getNewPatientId(patientid)
   }
 };
 </script>
 
-
-
-
 <style lang="scss" scoped>
 .newDialysisRecord {
   height: 100%;
@@ -1072,8 +1080,6 @@ export default {
 }
 </style>
 
-
-
 <style style="stylesheet/scss" lang="scss" scoped>
 // .choice {
 //   border-bottom: 1px #e5e5e5 solid;

src/pages/main/dialysis/RescueRecord.vue

@@ -102,27 +102,27 @@ import {
   getPatientDetail,
   getRescueRecord,
   DeleteRescueRecord
-} from "@/api/patient/patient";
-import { uParseTime } from "@/utils/tools";
-import Vue from "vue";
-import { Dialog } from "vant";
-const moment = require("moment");
+} from '@/api/patient/patient'
+import { uParseTime } from '@/utils/tools'
+import Vue from 'vue'
+import { Dialog } from 'vant'
+const moment = require('moment')
 export default {
   props: {
     active: Number
   },
-  data() {
+  data () {
     return {
       newShow: false,
       startShow: false,
       endShow: false,
-      startTime: "请选择",
-      endTime: "请选择",
-      endTimes: "",
+      startTime: '请选择',
+      endTime: '请选择',
+      endTimes: '',
       minDate: new Date(1970, 0, 1),
       maxDate: new Date(2025, 10, 1),
       currentDate: new Date(),
-      actions: [{ name: "查看全部" }, { name: "全部删除" }],
+      actions: [{ name: '查看全部' }, { name: '全部删除' }],
       showOne: true,
       showTwo: false,
       limit: 10,
@@ -135,81 +135,81 @@ export default {
       list: [],
       id: 0,
       index: 0
-    };
+    }
   },
   methods: {
-    onCancel() {
-      this.typeShow = false;
+    onCancel () {
+      this.typeShow = false
     },
-    onConfirm(value) {
-      this.type = value;
-      this.typeShow = false;
+    onConfirm (value) {
+      this.type = value
+      this.typeShow = false
     },
-    getstartTime(value) {
-      this.page = 1;
-      let year = value.getFullYear();
-      let month = value.getMonth() + 1;
-      let day = value.getDate();
+    getstartTime (value) {
+      this.page = 1
+      let year = value.getFullYear()
+      let month = value.getMonth() + 1
+      let day = value.getDate()
       if (month >= 1 && month <= 9) {
-        month = `0${month}`;
+        month = `0${month}`
       }
       if (day >= 1 && day <= 9) {
-        day = `0${day}`;
+        day = `0${day}`
       }
 
-      this.startTime = `${year}-${month}-${day}`;
-      this.rescueRecords = [];
+      this.startTime = `${year}-${month}-${day}`
+      this.rescueRecords = []
       this.getRescueRecord(
         this.patient_id,
         this.limit,
         this.page,
         this.startTime,
         this.endTime
-      );
-      this.startShow = false;
+      )
+      this.startShow = false
     },
-    getstartTime2(value) {
-      this.page = 1;
-      let year = value.getFullYear();
-      let month = value.getMonth() + 1;
-      let day = value.getDate();
+    getstartTime2 (value) {
+      this.page = 1
+      let year = value.getFullYear()
+      let month = value.getMonth() + 1
+      let day = value.getDate()
       if (month >= 1 && month <= 9) {
-        month = `0${month}`;
+        month = `0${month}`
       }
       if (day >= 1 && day <= 9) {
-        day = `0${day}`;
+        day = `0${day}`
       }
 
-      this.endTime = `${year}-${month}-${day}`;
-      this.rescueRecords = [];
+      this.endTime = `${year}-${month}-${day}`
+      this.rescueRecords = []
       this.getRescueRecord(
         this.patient_id,
         this.limit,
         this.page,
         this.startTime,
         this.endTime
-      );
-      this.endShow = false;
+      )
+      this.endShow = false
     },
-    getPatientDetail(patientid) {
+    getPatientDetail (patientid) {
       getPatientDetail(patientid).then(response => {
         if (response.data.state === 1) {
-          var patientDetail = response.data.data.patientDetail;
+          var patientDetail = response.data.data.patientDetail
           if (patientDetail.blood_patients == 0) {
-            this.rescueRecords = [];
-            this.showOne = false;
-            this.showTwo = true;
+            this.rescueRecords = []
+            this.showOne = false
+            this.showTwo = true
           }
           if (patientDetail.blood_patients == 1) {
-            this.showOne = true;
-            this.showTwo = false;
+            this.showOne = true
+            this.showTwo = false
           }
           // console.log("病人详情", patientDetail);
-          this.patientName = patientDetail.name;
+          this.patientName = patientDetail.name
         }
-      });
+      })
     },
-    getRescueRecord(id) {
+    getRescueRecord (id) {
       getRescueRecord(
         id,
         this.limit,
@@ -218,20 +218,20 @@ export default {
         this.endTime
       ).then(response => {
         if (response.data.state === 1) {
-          var rescuerecord = response.data.data.rescuerecord;
+          var rescuerecord = response.data.data.rescuerecord
           // console.log("抢救记录", rescuerecord);
-          let arr = this.rescueRecords;
-          arr.push(...rescuerecord);
-          this.rescueRecords = arr;
-          var total = response.data.data.total;
+          let arr = this.rescueRecords
+          arr.push(...rescuerecord)
+          this.rescueRecords = arr
+          var total = response.data.data.total
           // console.log("总计", total);
-          this.loading = false;
+          this.loading = false
         }
-      });
+      })
     },
-    onLoad() {
+    onLoad () {
       setTimeout(() => {
-        this.page++;
+        this.page++
         // console.log(this.page)
         if (this.page <= Math.ceil(this.total / 10)) {
           this.getRescueRecord(
@@ -240,73 +240,73 @@ export default {
             this.endTimes,
             this.limit,
             this.page
-          );
+          )
         } else {
-          this.loading = false;
-          this.finished = true;
+          this.loading = false
+          this.finished = true
         }
-      }, 1000);
+      }, 1000)
     },
-    getTime(time) {
+    getTime (time) {
       // return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
-      return uParseTime(time, "{y}-{m}-{d}");
+      return uParseTime(time, '{y}-{m}-{d}')
     },
-    toRescueRecord(id) {
-      var patientid = this.$route.query.patientid;
+    toRescueRecord (id) {
+      var patientid = this.$route.query.patientid
       this.$router.push(
-        "/rescuerecord?id=" +
+        '/rescuerecord?id=' +
           id +
-          "&patientid=" +
+          '&patientid=' +
           patientid +
-          "&active=" +
+          '&active=' +
           this.active
-      );
+      )
     },
-    toDeleteRescueRecord(id, index) {
-      this.id = id;
-      this.index = index;
-      this.newShow = true;
+    toDeleteRescueRecord (id, index) {
+      this.id = id
+      this.index = index
+      this.newShow = true
     },
-    Delete(value) {
-      if (value.name == "查看全部") {
-        var patientid = this.$route.query.patientid;
+    Delete (value) {
+      if (value.name == '查看全部') {
+        var patientid = this.$route.query.patientid
         this.$router.push(
-          "/rescuerecord?id=" +
+          '/rescuerecord?id=' +
             this.id +
-            "&patientid=" +
+            '&patientid=' +
             patientid +
-            "&active=" +
+            '&active=' +
             this.active
-        );
+        )
       }
-      if (value.name == "全部删除") {
-        this.DeleteRescueRecord(this.id, this.index);
+      if (value.name == '全部删除') {
+        this.DeleteRescueRecord(this.id, this.index)
       }
     },
-    DeleteRescueRecord(id, index) {
+    DeleteRescueRecord (id, index) {
       Dialog.confirm({
-        title: "删除提示!",
-        message: "确认删除该条信息吗?,删除后将无法恢复!"
+        title: '删除提示!',
+        message: '确认删除该条信息吗?,删除后将无法恢复!'
       }).then(() => {
         DeleteRescueRecord(id).then(response => {
           if (response.data.state === 1) {
-            var msg = response.data.data.msg;
-            console.log("msg", msg);
-            this.rescueRecords.splice(index, 1);
-            this.newShow = false;
+            var msg = response.data.data.msg
+            console.log('msg', msg)
+            this.rescueRecords.splice(index, 1)
+            this.newShow = false
           }
-        });
-      });
+        })
+      })
     }
   },
-  created() {
-    var patientid = this.$route.query.patientid;
-    console.log("病人id能否获取", patientid);
-    this.patient_id = patientid;
-    this.getPatientDetail(patientid);
-    this.getRescueRecord(patientid);
+  created () {
+    var patientid = this.$route.query.patientid
+    // console.log("病人id能否获取", patientid);
+    this.patient_id = patientid
+    this.getPatientDetail(patientid)
+    this.getRescueRecord(patientid)
   }
-};
+}
 </script>
 
 <style lang="scss" scoped>
@@ -417,7 +417,7 @@ export default {
     transform: translate3d(0, 0, 0);
     top: initial;
   }
-  
+
 }
 ::-webkit-scrollbar {
   width: 0;

src/pages/main/today/acceptsAssessment.vue

@@ -232,13 +232,13 @@ export default {
         return ''
       } else {
         var obj = this.record.precaution
-        console.log('obj--', obj)
+        // console.log('obj--', obj)
         if (obj == null) {
           return ''
         }
         if (obj != null) {
           var arr = obj.split(',')
-          console.log('arr----', arr)
+          // console.log('arr----', arr)
           var arrtwo = []
           for (let i = 0; i < arr.length; i++) {
             for (let j = 0; j < this.precautions.length; j++) {