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

src/router/modules/patient.js

       noCache: true
     }
   },
-  {//知情同意书
-    path: '/patients/patient/:id/Informedconsent',
-    component: () => import('@/xt_pages/user/Informed/Informedconsent'),
-    hidden: true,
-    is_menu: false,
-    name: 'Informedconsent',
-    meta: {
-      title: 'Informedconsent',
-      noCache: true
-    }
-  },
+  // {//知情同意书
+  //   path: '/patients/patient/:id/Informedconsent',
+  //   component: () => import('@/xt_pages/user/Informed/Informedconsent'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'Informedconsent',
+  //   meta: {
+  //     title: 'Informedconsent',
+  //     noCache: true
+  //   }
+  // },
   // {//血管通路图 pruritus_history
   //   path: '/patients/patient/:id/angiogram',
   //   component: () => import('@/xt_pages/user/angiogram'),

src/xt_pages/dialysis/details/index.vue

               height="500"
               border
               style="width: 100%">
+              <el-table-column
+                prop="date"
+                label="床号"
+                width="50"
+                >
+                <template slot-scope="scope">
+                  {{ scope.row.device_number.number }}
+                </template>
+              </el-table-column>
               <el-table-column
                 prop="date"
                 label="患者"
               height="500"
               border
               style="width: 100%">
+              <el-table-column
+                prop="date"
+                label="床号"
+                width="50"
+                >
+                <template slot-scope="scope">
+                  {{ scope.row.device_number.number }}
+                </template>
+              </el-table-column>
               <el-table-column
                 prop="date"
                 label="患者"
           patientArr.map(item => {
             newArr.push(...item.schedules)
           })
+         
+        
+          console.log("newArrwowowowowoowwowo",newArr)
           this.tableData = newArr
           this.getData()
 
           })
           newArr.sort(this.compare('created_time'))
         }
+
+        if(this.org_id ==10579 || this.org_id == 0){
+          if(newArr!=null && newArr.length>0){
+            for(let i=0;i<newArr.length;i++){
+              newArr[i].sort =0
+              newArr[i].sort =newArr[i].device_number.sort
+            }
+          }
+
+          newArr.sort(function(a, b) {
+           return a.sort - b.sort;
+          });
+        }
+       
+
         // console.log('排序',newArr)
         this.tableData = newArr
         const name = this.$route.query.patient_name
           })
           newArr.sort(this.compare('created_time'))
         }
+      
+        if(this.org_id == 0 || this.org_id == 10579){
+          if(newArr!=null && newArr.length>0){
+            for(let i=0;i<newArr.length;i++){
+              newArr[i].sort =0
+              newArr[i].sort =newArr[i].device_number.sort
+            }
+          }
+
+          newArr.sort(function(a, b) {
+           return a.sort - b.sort;
+          });
+        }
+       
         this.tableData1 = newArr
         const name = this.$route.query.patient_name
         this.tableData1.map((item, index) => {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

 
         // var objProject = {advice_name:"",start_time:"",single_dose:"",single_dose_unit:"",}
       
-        if(this.projects!=null && this.projects.length >0){
-           for(let i=0;i<this.projects.length;i++){
-             if(this.projects[i].type== 2){
-            
-              this.projects[i].project_team_name = ""
-              this.projects[i].project_team_id = 0
-              console.log("this.projects[i].project.team",this.projects[i].project.team)
-              if(this.projects[i].team!= "undefined" && this.projects[i].team.id >0){
-                this.projects[i].project_team = this.projects[i].team.project_team
-                this.projects[i].project_team_id = this.projects[i].team.id
-                this.projects[i].start_time = this.projects[i].start_time
-                this.projects[i].single_dose = this.projects[i].single_dose
-                this.projects[i].single_dose_unit = this.projects[i].unit
-                this.projects[i].execution_time = this.projects[i].execution_time
-                this.projects[i].execution_staff= this.projects[i].execution_staff 
-                this.projects[i].advice_name =  this.projects[i].team.project_team
-                this.projects[i].advice_doctor = this.projects[i].doctor
+        if(this.org_id!=0){
+            if(this.projects!=null && this.projects.length >0){
+             for(let i=0;i<this.projects.length;i++){
+              if(this.projects[i].type== 2){
+              
+                this.projects[i].project_team_name = ""
+                this.projects[i].project_team_id = 0
+                console.log("this.projects[i].project.team",this.projects[i].project.team)
+                if(this.projects[i].team!= "undefined" && this.projects[i].team.id >0){
+                  this.projects[i].project_team = this.projects[i].team.project_team
+                  this.projects[i].project_team_id = this.projects[i].team.id
+                  this.projects[i].start_time = this.projects[i].start_time
+                  this.projects[i].single_dose = this.projects[i].single_dose
+                  this.projects[i].single_dose_unit = this.projects[i].unit
+                  this.projects[i].execution_time = this.projects[i].execution_time
+                  this.projects[i].execution_staff= this.projects[i].execution_staff 
+                  this.projects[i].advice_name =  this.projects[i].team.project_team
+                  this.projects[i].advice_doctor = this.projects[i].doctor
+                
+                
+                  this.doctor_advices.push(this.projects[i])
+                  // this.doctor_advices_2.push(this.project[i])
+                }else{
+                  this.projects[i].project_team = this.projects[i].project.project_name
+                  this.projects[i].advice_name = this.projects[i].project.project_name
+                  this.projects[i].start_time = this.projects[i].start_time
+                  this.projects[i].single_dose = this.projects[i].single_dose
+                  this.projects[i].single_dose_unit = this.projects[i].unit
+                  this.projects[i].execution_time = this.projects[i].execution_time
+                  this.projects[i].execution_staff= this.projects[i].execution_staff 
+                  this.projects[i].advice_doctor = this.projects[i].doctor
+                  this.doctor_advices.push(this.projects[i])
+                  // this.doctor_advices_2.push(this.projects[i])
+                }
               
-               
-                this.doctor_advices.push(this.projects[i])
-                // this.doctor_advices_2.push(this.project[i])
-              }else{
-                this.projects[i].project_team = this.projects[i].project.project_name
-                this.projects[i].advice_name = this.projects[i].project.project_name
-                this.projects[i].start_time = this.projects[i].start_time
-                this.projects[i].single_dose = this.projects[i].single_dose
-                this.projects[i].single_dose_unit = this.projects[i].unit
-                this.projects[i].execution_time = this.projects[i].execution_time
-                this.projects[i].execution_staff= this.projects[i].execution_staff 
-                this.projects[i].advice_doctor = this.projects[i].doctor
-                this.doctor_advices.push(this.projects[i])
-                // this.doctor_advices_2.push(this.projects[i])
               }
-             
-             }
-             
-           }
+              
+            }
+          }
         }
+      
          
         }
       

src/xt_pages/user/components/PatientSidebar.vue

             },
           ]
         },
-        // {
-        //   name: '5',
-        //   label: '评估工具',
-        //   children: [
-        //     {
-        //       name: '5-1',
-        //       label: '跌倒评估'
-        //     },
-        //     {
-        //       name: '5-2',
-        //       label: '小儿跌倒风险评估'
-        //     },
-        //     {
-        //       name: '5-3',
-        //       label: '压疮风险评估'
-        //     },
-        //     {
-        //       name: '5-4',
-        //       label: 'OH压疮评估'
-        //     },
-        //     {
-        //       name: '5-5',
-        //       label: '日常生活能力评估'
-        //     },
-        //     {
-        //       name: '5-6',
-        //       label: '导管脱落风险评估'
-        //     },
-        //     {
-        //       name: '5-7',
-        //       label: 'RASS及疼痛评估'
-        //     },
-        //     {
-        //       name: '5-8',
-        //       label: '营养状况评估'
-        //     },
-        //     {
-        //       name: '5-9',
-        //       label: '约束告知单'
-        //     },
-        //     {
-        //       name: '5-10',
-        //       label: '心理评估'
-        //     },
-        //     {
-        //       name: '5-11',
-        //       label: '瘙痒评估'
-        //     },
-        //     {
-        //       name: '5-12',
-        //       label: '血液透析患者评估'
-        //     },
-        //     {
-        //       name: '5-13',
-        //       label: 'Glasgow昏迷评分量表'
-        //     },
-        //     {
-        //       name: '5-14',
-        //       label: '肌力评估表'
-        //     },
-        //   ]
-        // },
+        {
+          name: '5',
+          label: '评估工具',
+          children: [
+            {
+              name: '5-1',
+              label: '跌倒评估'
+            },
+            {
+              name: '5-2',
+              label: '小儿跌倒风险评估'
+            },
+            {
+              name: '5-3',
+              label: '压疮风险评估'
+            },
+            {
+              name: '5-4',
+              label: 'OH压疮评估'
+            },
+            {
+              name: '5-5',
+              label: '日常生活能力评估'
+            },
+            {
+              name: '5-6',
+              label: '导管脱落风险评估'
+            },
+            {
+              name: '5-7',
+              label: 'RASS及疼痛评估'
+            },
+            {
+              name: '5-8',
+              label: '营养状况评估'
+            },
+            {
+              name: '5-9',
+              label: '约束告知单'
+            },
+            {
+              name: '5-10',
+              label: '心理评估'
+            },
+            {
+              name: '5-11',
+              label: '瘙痒评估'
+            },
+            {
+              name: '5-12',
+              label: '血液透析患者评估'
+            },
+            {
+              name: '5-13',
+              label: 'Glasgow昏迷评分量表'
+            },
+            {
+              name: '5-14',
+              label: '肌力评估表'
+            },
+          ]
+        },
         {
           name: '6',
           label: '文书管理',