Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/fallassement.js

@@ -16,4 +16,40 @@ export function getAllNurseList(params){
       method:"post",
       data:data,
     })
+  }
+
+  export function getPatientFallsessmentList(params){
+   
+    return request({
+      url:"/api/patient/getpatientfallsessmentlist",
+      method:"Get",
+      params:params,
+    })
+  }
+
+  export function getPatientFallssessmentById(id,params){
+    
+    return request({
+      url:"/api/patient/getpatientfallssessmentById?id="+id,
+      method:"Get",
+      params:params
+    })
+  }
+
+  export function DeletePatientFallassessment(id,params){
+   
+    return request({
+      url:"/api/patient/deletepatientfallassessment?id="+id,
+      method:"get",
+      params:params
+    })
+  }
+
+  export function updatePatientFallassment(data){
+
+    return request({
+      url:"/api/patient/updatepatientfallassment",
+      method:"post",
+      data:data
+    })
   }

src/api/patient.js

@@ -1048,4 +1048,13 @@ export function getPatientMeDicalList(params){
     method:"get",
     params:params,
   })
+}
+
+export function updatePatientFallassment(params){
+  
+  return request({
+    url:"/api/patient/updatepatientfallassment",
+    method:"get",
+    params:params,
+  })
 }

src/router/modules/Dialysisanalysis.js

@@ -3,6 +3,8 @@ import Layout from '@/views/layout/Layout'
 export default {
   path: '/Dialysisanalysis',
   component: Layout,
+  // component: () => import('@/xt_pages/Dialysisanalysis/otherIndicators/index'),
+
   redirect: '/Dialysisanalysis/qualitycontrol/thyroidGland',
   name: 'Dialysisanalysis',
   alwaysShow: true,
@@ -16,10 +18,11 @@ export default {
       component: () => import('@/xt_pages/Dialysisanalysis/otherIndicators/index'),
       name: 'otherIndicators',
       meta: {
-        title: '其他指标',
+        title: '专业质控',
         noCache: true
       }
-    }, {
+    },
+    {
       path: '/Dialysisanalysis/qualitycontrol/Indicatorsdetail',
       component: () => import('@/xt_pages/Dialysisanalysis/otherIndicators/otherIndicators'),
       name: 'otherIndicators_two',
@@ -30,74 +33,82 @@ export default {
         noCache: true
       }
     },
+    // {
+    //   path: '/Dialysisanalysis/qualitycontrol/thyroidGland',
+    //   component: () => import('@/xt_pages/Dialysisanalysis/qualitycontrol/thyroidGland'),
+    //   name: 'thyroidGland',
+    //   meta: {
+    //     title: '甲状旁腺激素分析',
+    //     noCache: true
+    //   }
+    // },
+    // {
+    //   path: '/Dialysisanalysis/qualitycontrol/hemoglobin',
+    //   component: () => import('@/xt_pages/Dialysisanalysis/hemoglobin/index'),
+    //   name: 'thyroidGland',
+    //   meta: {
+    //     title: '血红蛋白',
+    //     noCache: true
+    //   }
+    // },
+    // {
+    //   path: '/Dialysisanalysis/qualitycontrol/bloodPotassium',
+    //   component: () => import('@/xt_pages/Dialysisanalysis/bloodPotassium/index'),
+    //   name: 'thyroidGland',
+    //   meta: {
+    //     title: '血钾',
+    //     noCache: true
+    //   }
+    // },
+    // {
+    //   path: '/Dialysisanalysis/qualitycontrol/albumin',
+    //   component: () => import('@/xt_pages/Dialysisanalysis/albumin/index'),
+    //   name: 'thyroidGland',
+    //   meta: {
+    //     title: '白蛋白',
+    //     noCache: true
+    //   }
+    // },
+    // {
+    //   path: '/Dialysisanalysis/qualitycontrol/bloodPhosphorus',
+    //   component: () => import('@/xt_pages/Dialysisanalysis/bloodPhosphorus/index'),
+    //   name: 'thyroidGland',
+    //   meta: {
+    //     title: '血磷',
+    //     noCache: true
+    //   }
+    // },
+    // {
+    //   path: '/Dialysisanalysis/qualitycontrol/calcium',
+    //   component: () => import('@/xt_pages/Dialysisanalysis/calcium/index'),
+    //   name: 'thyroidGland',
+    //   meta: {
+    //     title: '钙',
+    //     noCache: true
+    //   }},
     {
-      path: '/Dialysisanalysis/qualitycontrol/thyroidGland',
-      component: () => import('@/xt_pages/Dialysisanalysis/qualitycontrol/thyroidGland'),
-      name: 'thyroidGland',
-      meta: {
-        title: '甲状旁腺激素分析',
-        noCache: true
-      }
-    },
-    {
-      path: '/Dialysisanalysis/qualitycontrol/hemoglobin',
-      component: () => import('@/xt_pages/Dialysisanalysis/hemoglobin/index'),
-      name: 'thyroidGland',
-      meta: {
-        title: '血红蛋白',
-        noCache: true
-      }
-    },
-    {
-      path: '/Dialysisanalysis/qualitycontrol/bloodPotassium',
-      component: () => import('@/xt_pages/Dialysisanalysis/bloodPotassium/index'),
-      name: 'thyroidGland',
-      meta: {
-        title: '血钾',
-        noCache: true
-      }
-    },
-    {
-      path: '/Dialysisanalysis/qualitycontrol/albumin',
-      component: () => import('@/xt_pages/Dialysisanalysis/albumin/index'),
-      name: 'thyroidGland',
-      meta: {
-        title: '白蛋白',
-        noCache: true
-      }
-    },
-    {
-      path: '/Dialysisanalysis/qualitycontrol/bloodPhosphorus',
-      component: () => import('@/xt_pages/Dialysisanalysis/bloodPhosphorus/index'),
-      name: 'thyroidGland',
-      meta: {
-        title: '血磷',
-        noCache: true
-      }
-    }, {
-      path: '/Dialysisanalysis/qualitycontrol/calcium',
-      component: () => import('@/xt_pages/Dialysisanalysis/calcium/index'),
-      name: 'thyroidGland',
-      meta: {
-        title: '钙',
-        noCache: true
-      }},{
       path: '/Dialysisanalysis/qualitycontrol/platelets',
       component: () => import('@/xt_pages/Dialysisanalysis/platelets/index'),
       name: 'thyroidGland',
+      hidden: true,
+      is_menu: false,
       meta: {
         title: 'KTV/URR',
         noCache: true
       }
-    },{
+    },
+    {
       path: '/Dialysisanalysis/qualitycontrol/summary',
       component: () => import('@/xt_pages/Dialysisanalysis/summary/index'),
       name: 'index_summary',
+      hidden: true,
+      is_menu: false,
       meta: {
         title: '指标汇总',
         noCache: true
       }
-    },{
+    },
+    {
       path: '/Dialysisanalysis/qualitycontrol/print',
       component: () => import('@/xt_pages/Dialysisanalysis/print/print'),
       name: 'print',

src/xt_pages/Dialysisanalysis/otherIndicators/otherIndicatorsall.vue

@@ -78,7 +78,7 @@
         <el-table-column
           prop="name"
           align="center"
-          label="血红蛋白"
+          :label="item_name"
 
 
         >
@@ -321,6 +321,7 @@ export default {
       keyword:"",
       patientTableData:[],
       indicators:[],
+      item_name:"",
     }
   },
   mounted() {
@@ -507,12 +508,8 @@ export default {
         if (response.data.state == 1) {
           this.reference = response.data.data.reference
           this.config = response.data.data.config
-
-          for(var i = 0; i < this.indicators.length;i++){
-            if(this.indicators[i].id == this.project_type){
-              this.input = this.config.min_range + "<=" +  this.indicators[i].label + "<=" +this.config.large_range
-            }
-          }
+          this.input = this.config.min_range + "<=" +  this.reference.item_name + "<=" +this.config.large_range
+          this.item_name = this.reference.item_name
           let objone = {
             value:  response.data.data.unusual_total ,
             name: '不达标值患者',

src/xt_pages/user/courseOfDisease.vue

@@ -838,30 +838,23 @@
         this.$router.push('/patients/patients')
         return
       }
-      var now = new Date()
-      this.date = [now.getTime() - (7 * 24 * 60 * 60 * 1000), now.getTime()]
-
-      var nowDate = new Date()
-      var nowYear = nowDate.getFullYear()
-      var nowMonth = nowDate.getMonth() + 1
-      var nowDay = nowDate.getDate()
-      this.end_time =
-        nowYear +
-        '-' +
-        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
-        '-' +
-        (nowDay < 10 ? '0' + nowDay : nowDay)
-      nowDate.setMonth(nowDate.getMonth() - 1)
-      nowYear = nowDate.getFullYear() -1
-      nowMonth = nowDate.getMonth() + 1
-      nowDay = nowDate.getDate()
-      this.start_time =
-        nowYear +
-        '-' +
-        (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
-        '-' +
-        (nowDay < 10 ? '0' + nowDay : nowDay)
-
+      // var now = new Date()
+      // this.date = [now.getTime() - (7 * 24 * 60 * 60 * 1000), now.getTime()]
+
+      // var nowDate = new Date()
+      // var nowYear = nowDate.getFullYear()
+      // var nowMonth = nowDate.getMonth() + 1
+      // var nowDay = nowDate.getDate()
+      // this.end_time =nowYear +'-' +(nowMonth < 10 ? '0' + nowMonth : nowMonth) +'-' +(nowDay < 10 ? '0' + nowDay : nowDay)
+      // nowDate.setMonth(nowDate.getMonth() - 1)
+      // nowYear = nowDate.getFullYear() -1
+      // nowMonth = nowDate.getMonth() + 1
+      // nowDay = nowDate.getDate()
+      // this.start_time = nowYear +'-' +(nowMonth < 10 ? '0' + nowMonth : nowMonth) +'-' +(nowDay < 10 ? '0' + nowDay : nowDay)
+      this.start_time = moment().month(moment().month() - 1).startOf('month').format('YYYY-MM-DD');
+      console.log("start_time",this.start_time)
+      this.end_time = moment().endOf('month').format('YYYY-MM-DD');
+      console.log("end_time",this.end_time)
       this.requestCourseRecords()
 
     },

src/xt_pages/user/evaluationtool/Fallassessment.vue

@@ -533,7 +533,7 @@
         paixie:[{paixie_check:false,content:"便秘(2分)",is_status:2},{paixie_check:false,content:"腹泻(1分)",is_status:2},{paixie_check:false,content:"尿频(1分)",is_status:2}],
         zilinl:[{zilinl_check:false,content:"无(4分)",is_status:2},{zilinl_check:false,content:"部分(3分)",is_status:2}],
         xiaoguo:[{xiaoguo_check:false,content:"未发生跌倒",is_status:2},{xiaoguo_check:false,content:"发生跌倒",is_status:2},{xiaoguo_check:false,content:"发生坠床",is_status:2}],
-        touxidiedao:[{touxidiedao_check:false,content:"发生跌倒",is_status:2},{touxidiedao_check:false,content:"发生坠床"}],
+        touxidiedao:[{touxidiedao_check:false,content:"发生跌倒",is_status:2},{touxidiedao_check:false,content:"发生坠床",is_status:2}],
         centerDialogVisibleOne:false,
         centerDialogVisible:false,
         dialogVisible:false,
@@ -570,6 +570,8 @@
 
     },
     created() {
+      const id = this.$route.params && this.$route.params.id
+      this.patient_id = parseInt(id)
       this.getAllNurseList()
     },
     methods: {
@@ -591,10 +593,10 @@
         }
       },
       Historicalscore(){
-        this.$router.push({path: '/patients/tumble_history'})
+        this.$router.push({path: '/patients/tumble_history?patient_id='+this.patient_id})
       },
       saveCenterDialogVisible(){
-        var obj = {is_content_check:false,content:""}
+        var obj = {is_content_check:false,content:"",is_status:2}
         obj.content = this.content
         this.list.push(obj)
         this.centerDialogVisible =false
@@ -604,8 +606,8 @@
         this.centerDialogVisibleOne = true
       },
       saveCenterDialogVisibleOne(){
-        var obj = {is_content_check_one:false,contentOne:""}
-        obj.contentOne = this.contentOne
+        var obj = {is_content_check_one:false,content:"",is_status:2}
+        obj.content = this.contentOne
         this.listOne.push(obj)
         this.centerDialogVisibleOne= false
       },
@@ -783,6 +785,149 @@
 
          var record_date = this.record_date
          var ping_date = this.ping_date
+
+         if(this.nianlin!=null && this.nianlin.length >0){
+            for(let i=0;i<this.nianlin.length;i++){
+              if(this.nianlin[i].age_check == true){
+                 this.nianlin[i].is_status =1
+              }
+              if(this.nianlin[i].age_check == false){
+                 this.nianlin[i].is_status =2
+              }
+            }
+         }
+
+         if(this.jiwang!=null && this.jiwang.length >0){
+            for(let i=0;i<this.jiwang.length;i++){
+              if(this.jiwang[i].jiwang_check == true){
+                 this.jiwang[i].is_status =1
+              }
+              if(this.jiwang[i].jiwang_check == false){
+                 this.jiwang[i].is_status =2
+              }
+            }
+         }
+
+         if(this.yishizt!=null && this.yishizt.length >0){
+            for(let i=0;i<this.yishizt.length;i++){
+              if(this.yishizt[i].yishizt_check == true){
+                 this.yishizt[i].is_status =1
+              }
+              if(this.yishizt[i].yishizt_check == false){
+                 this.yishizt[i].is_status =2
+              }
+            }
+         }
+
+         if(this.yishizt!=null && this.yishizt.length >0){
+            for(let i=0;i<this.yishizt.length;i++){
+              if(this.yishizt[i].yishizt_check == true){
+                 this.yishizt[i].is_status =1
+              }
+              if(this.yishizt[i].yishizt_check == false){
+                 this.yishizt[i].is_status =2
+              }
+            }
+         }
+
+         if(this.ganguan!=null && this.ganguan.length >0){
+            for(let i=0;i<this.ganguan.length;i++){
+              if(this.ganguan[i].ganguan_check == true){
+                 this.ganguan[i].is_status =1
+              }
+              if(this.ganguan[i].ganguan_check == false){
+                 this.ganguan[i].is_status =2
+              }
+            }
+         }
+
+         if(this.shentizk!=null && this.shentizk.length >0){
+            for(let i=0;i<this.shentizk.length;i++){
+              if(this.shentizk[i].shentizk_check == true){
+                 this.shentizk[i].is_status =1
+              }
+              if(this.shentizk[i].shentizk_check == false){
+                 this.shentizk[i].is_status =2
+              }
+            }
+         }
+
+         if(this.syyaowu!=null && this.syyaowu.length >0){
+            for(let i=0;i<this.syyaowu.length;i++){
+              if(this.syyaowu[i].syyaowu_check == true){
+                 this.syyaowu[i].is_status =1
+              }
+              if(this.syyaowu[i].syyaowu_check == false){
+                 this.syyaowu[i].is_status =2
+              }
+            }
+         }
+
+         if(this.paixie!=null && this.paixie.length >0){
+            for(let i=0;i<this.paixie.length;i++){
+              if(this.paixie[i].paixie_check == true){
+                 this.paixie[i].is_status =1
+              }
+              if(this.paixie[i].paixie_check == false){
+                 this.paixie[i].is_status =2
+              }
+            }
+         }
+
+         if(this.zilinl!=null && this.zilinl.length >0){
+            for(let i=0;i<this.zilinl.length;i++){
+              if(this.zilinl[i].zilinl_check == true){
+                 this.zilinl[i].is_status =1
+              }
+              if(this.zilinl[i].zilinl_check == false){
+                 this.zilinl[i].is_status =2
+              }
+            }
+         }
+
+         if(this.xiaoguo!=null && this.xiaoguo.length >0){
+            for(let i=0;i<this.xiaoguo.length;i++){
+              if(this.xiaoguo[i].xiaoguo_check == true){
+                 this.xiaoguo[i].is_status =1
+              }
+              if(this.xiaoguo[i].xiaoguo_check == false){
+                 this.xiaoguo[i].is_status =2
+              }
+            }
+         }
+
+         if(this.touxidiedao!=null && this.touxidiedao.length >0){
+            for(let i=0;i<this.touxidiedao.length;i++){
+              if(this.touxidiedao[i].touxidiedao_check == true){
+                 this.touxidiedao[i].is_status =1
+              }
+              if(this.touxidiedao[i].touxidiedao_check == false){
+                 this.touxidiedao[i].is_status =2
+              }
+            }
+         }
+
+         if(this.list!=null && this.list.length >0){
+            for(let i=0;i<this.list.length;i++){
+              if(this.list[i].is_content_check == true){
+                 this.list[i].is_status =1
+              }
+              if(this.list[i].is_content_check == false){
+                 this.list[i].is_status =2
+              }
+            }
+         }
+
+         if(this.listOne!=null && this.listOne.length >0){
+            for(let i=0;i<this.listOne.length;i++){
+              if(this.listOne[i].is_content_check_one == true){
+                 this.listOne[i].is_status =1
+              }
+              if(this.listOne[i].is_content_check_one == false){
+                 this.listOne[i].is_status =2
+              }
+            }
+         }
          var params = {
           is_age:this.nianlin,//年龄
           is_jiwang:this.jiwang,//既往史
@@ -794,6 +939,8 @@
           is_zilin:this.zilinl, //自理能力
           is_xiaoguo:this.xiaoguo,//预防效果
           is_touxidiedao:this.touxidiedao,//透析跌倒
+          list:this.list,
+          listOne:this.listOne,
           record_date:record_date,
           ping_date:ping_date,
           admin_user_id:this.admin_user_id,
@@ -817,13 +964,17 @@
           is_check_seventeen:is_check_seventeen,
           is_check_eighteen:is_check_eighteen,
           is_check_nineteen:is_check_nineteen,
-          patient_id:parseInt(this.$route.query.id),
+          patient_id:this.patient_id,
           total:this.tumble_Totalpoints,
-
+          
          }
          console.log("params",params)
+        
         saveFllassessmentList(params).then(response=>{
-
+           if(response.data.state ==1){
+             var patientFallassessment = response.data.data.patientFallassessment
+             this.$message.success("保存成功!")
+           }
         })
       }
     }

src/xt_pages/user/rescueRecord.vue

@@ -198,26 +198,30 @@ export default {
       this.$router.push("/patients/patients");
       return;
     }
-    var nowDate = new Date();
-    var nowYear = nowDate.getFullYear();
-    var nowMonth = nowDate.getMonth() + 1;
-    var nowDay = nowDate.getDate();
-    this.end_time =
-      nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
-    nowDate.setMonth(nowDate.getMonth() - 1);
-    nowYear = nowDate.getFullYear()-1;
-    nowMonth = nowDate.getMonth() + 1;
-    nowDay = nowDate.getDate();
-    this.start_time =
-      nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
+    // var nowDate = new Date();
+    // var nowYear = nowDate.getFullYear();
+    // var nowMonth = nowDate.getMonth() + 1;
+    // var nowDay = nowDate.getDate();
+    // this.end_time =
+    //   nowYear +
+    //   "-" +
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+    //   "-" +
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
+    // nowDate.setMonth(nowDate.getMonth() - 1);
+    // nowYear = nowDate.getFullYear()-1;
+    // nowMonth = nowDate.getMonth() + 1;
+    // nowDay = nowDate.getDate();
+    // this.start_time =
+    //   nowYear +
+    //   "-" +
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+    //   "-" +
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
+    this.start_time = moment().month(moment().month() - 1).startOf('month').format('YYYY-MM-DD');
+    console.log("start_time",this.start_time)
+    this.end_time = moment().endOf('month').format('YYYY-MM-DD');
+    console.log("end_time",this.end_time)
 
     this.requestRescueRecords();
   },