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

src/api/fallassement.js

@@ -115,3 +115,31 @@ export function getAllNurseList(params){
       data:data,
     })
   }
+
+
+  export function getPatientBedlist(params){
+
+    return request({
+      url:"/api/patient/getpatientbedlist",
+      method:"get",
+      params:params,
+    })
+  }
+
+  export function getPatientBedById(id,params){
+
+    return request({
+      url:"/api/patient/getpatientbedbyid?id="+id,
+      method:"get",
+      params:params,
+    })
+  }
+
+  export function updateBedPatientList(data){
+
+    return request({
+      url:"/api/patient/updatebedpatientlist",
+      method:"post",
+      data:data
+    })
+  }

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -3806,15 +3806,15 @@ export default {
                     obj.single_dose = 1
                   }
                   // 针对灵山圣康
-                  if (this.org_id == 0 || this.org_id == 10375) {
-                    if (this.prescriptions[i] != null) {
-                      if (this.prescriptions[i].project.length >= 5) {
-                        this.$message.error('添加条数已经大于5条,添加失败!')
-                        return false
-                      }
-
-                    }
-                  }
+                  // if (this.org_id == 0 || this.org_id == 10375) {
+                  //   if (this.prescriptions[i] != null) {
+                  //     if (this.prescriptions[i].project.length >= 5) {
+                  //       this.$message.error('添加条数已经大于5条,添加失败!')
+                  //       return false
+                  //     }
+
+                  //   }
+                  // }
                   this.prescriptions[i].project.push(obj)
                 }
                 this.curStatus = 2
@@ -3932,6 +3932,7 @@ export default {
                 }
                 // 针对灵山圣康
                 if (this.org_id == 0 || this.org_id == 10375) {
+             
                   if (this.prescriptions[i] != null) {
                     console.log('禅古this.prescriptions[i].advices.length', this.prescriptions[i].advices.length)
                     if (this.prescriptions[i].advices.length >= 5) {
@@ -3989,15 +3990,17 @@ export default {
                   obj.single_dose = 1
                 }
                 // 针对灵山圣康
-                if (this.org_id == 0 || this.org_id == 10375) {
-                  if (this.prescriptions[i] != null) {
-                    if (this.prescriptions[i].project.length >= 5) {
-                      this.$message.error('添加条数已经大于5条,添加失败!')
-                      return false
-                    }
+                // if (this.org_id == 0 || this.org_id == 10375) {
+                  
+                //   if (this.prescriptions[i] != null) {
+                    
+                //     if (this.prescriptions[i].project.length >= 5) {
+                //       this.$message.error('添加条数已经大于5条,添加失败!')
+                //       return false
+                //     }
 
-                  }
-                }
+                //   }
+                // }
                 this.prescriptions[i].project.push(obj)
               }
               this.curStatus = 2

src/xt_pages/user/Informed/Informedconsent.vue

@@ -679,7 +679,7 @@ export default {
           this.show14=false,
           this.show15=true,
           this.show16=false
-          this.getPatientCriticalList()
+          // this.getPatientCriticalList()
         }
         if(row.value==16){
           this.filter_show=false
@@ -698,7 +698,7 @@ export default {
           this.show14=false,
           this.show15=false,
           this.show16=true
-          this.getPatientCriticalOneList()
+          // this.getPatientCriticalOneList()
         }
     },
    

src/xt_pages/user/evaluationtool/OHpressuresore.vue

@@ -278,7 +278,7 @@
 import PatientSidebar from '../components/PatientSidebar.vue'
 import print from 'print-js'
 import { uParseTime } from '@/utils/tools'
-import {getAllNurseList,savePatientHpressuresore} from '@/api/fallassement'
+import {getAllNurseList,savePatientHpressuresore,getPatientBedlist,getPedPatientFallAssessmentById,deletePedPatientFallassment,updateBedPatientList} from '@/api/fallassement'
 export default {
   components:{
     PatientSidebar
@@ -322,6 +322,10 @@ export default {
       dayintime:this.getTime(new Date()),//打印
       // oh_pinggr:[],
       nurseList:[],
+      limit:10,
+      page:1,
+      total:0,
+      id:0,
     }
   },
   methods:{
@@ -420,41 +424,32 @@ export default {
         this.add_show=true
         this.zsgy_open=1
         this.cancel_num=1
+        const data = {}
+        var list =[]
+        data['patient_id'] =  this.patientID
+        data['tiwei'] = this.tiwei_num
+        data['bingli'] = this.bingli_num
+        data['edema'] = this.edema_num
+        data['guanjie'] = this.gaunjie_num
+        data['oh_huli'] = this.oh_huli
+        data['record_date'] = this.oh_date
+        data['oh_appraiser'] = this.oh_appraiser
+        data['total'] = this.Totalpoints
+        list.push(data)
         var params={
-          patientID:this.patientID,
-          tiwei:this.tiwei_num,
-          bingli:this.bingli_num,
-          edema:this.edema_num,
-          guanjie:this.gaunjie_num,
-          oh_huli:this.oh_huli,
-          oh_date:this.oh_date,
-          oh_appraiser:this.oh_appraiser,
-          Totalpoints:this.Totalpoints
+          patient_id:this.patientID,
+          record_date:this.oh_date,
+          is_type:2,
+          list:list,
         }
-        console.log('params-----',params);
-      // savePatientHpressuresore(params).then(response=>{
+     
+      // console.log("data",data)
+      savePatientHpressuresore(params).then(response=>{
+         if(response.data.state ==1){
 
-      // })
-        // const arr={
-        //   id:'002',
-        //   date:this.oh_date,
-        //   mark:this.Totalpoints,
-        //   evaluate:this.oh_appraiser
-        // }
-        // console.log('rrrrr',arr,params);
-        // this.history_OH.push(arr)
-        // const lenOH= this.history_OH
-        // var nameoh=''
-        // for(let i=0;i<lenOH.length;i++){
-        //   lenOH[i].mark= this.Totalpoints
-        //   for(let y=0;y<this.oh_pinggr.length;y++){
-        //     if(this.oh_appraiser==this.oh_pinggr[y].id){
-        //       nameoh=this.oh_pinggr[y].label
-        //     }
-        //   }
-        //   lenOH[i].evaluate= nameoh
-        // }
-        // return this.cancel_num
+         }
+      })
+        // console.log('params-----',params);
       }
     },
     //编辑
@@ -463,10 +458,19 @@ export default {
       this.zsgy_open=0
       this.baocun_open=1
       this.cancel_num=1
+      getPedPatientFallAssessmentById(this.id).then(response=>{
+        if(response.data.state ==1){
+
+        }
+      })
     },
     // 选择需要删除的记录
     dele_click(row, column, event){
       this.dele_id=row.id
+      //row.id 为 选中当前行的id
+      deletePedPatientFallassment(row.id).then(response=>{
+
+      })
     },
     //删除
     dele_OH(){
@@ -556,14 +560,59 @@ export default {
           this.nurseList =nurseList
         }
     })
-  },
+   },
+   getlist(){
+      var params = {
+        patient_id:this.patientID,
+        limit:this.limit,
+        page:this.page,
+      }
+    getPatientBedlist(params).then(response=>{
+       if(response.data.state ==1){
+         var list = response.data.data.list
+         var total = response.data.data.total
+       }
+    })
+   },
+   updateBedPatientList(){
+    const data = {}
+    var list =[]
+    data['patient_id'] =  this.patientID
+    data['tiwei'] = this.tiwei_num
+    data['bingli'] = this.bingli_num
+    data['edema'] = this.edema_num
+    data['guanjie'] = this.gaunjie_num
+    data['oh_huli'] = this.oh_huli
+    data['record_date'] = this.oh_date
+    data['oh_appraiser'] = this.oh_appraiser
+    data['total'] = this.Totalpoints
+    list.push(data)
+    var params={
+      patient_id:this.patientID,
+      record_date:this.oh_date,
+      is_type:2,
+      list:list,
+      id:this.id,//选中当前行的id
+    }
+    updateBedPatientList(params).then(response=>{
+      if(response.data.state ==1){
+        var pedFallssessment =  response.data.data.pedFallssessment
+        this.$message.success("保存成功")
+      }
+    })
+   }
+
   },
   computed:{
     Totalpoints(){
       return this.gaunjie_num*1 + this.edema_num*1 + this.bingli_num*1 + this.tiwei_num*1
     }
   },
- 
+ created(){
+  const id = this.$route.params && this.$route.params.id
+  this.patientID = parseInt(id)
+  this.getlist()
+ }
 }
 </script>
 <style lang="scss" scoped>