Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/router/modules/patient.js

@@ -326,160 +326,160 @@ export default {
     }
   },
   
-  {//评估工具/跌倒评估
-    path: '/patients/patient/:id/Fallassessment',
-    component: () => import('@/xt_pages/user/evaluationtool/Fallassessment'),
-    hidden: true,
-    is_menu: false,
-    name: 'Fallassessment',
-    meta: {
-      title: 'firstDiseasePrint',
-      noCache: true
-    }
-  },
-  {//小儿跌倒风险评估
-    path: '/patients/patient/:id/pediatricFallAssessment',
-    component: () => import('@/xt_pages/user/evaluationtool/pediatricFallAssessment'),
-    hidden: true,
-    is_menu: false,
-    name: 'pediatricFallAssessment',
-    meta: {
-      title: 'pediatricFallAssessment',
-      noCache: true
-    }
-  },
-  {//压疮风险评估
-    path: '/patients/patient/:id/pressuresore',
-    component: () => import('@/xt_pages/user/evaluationtool/pressuresore'),
-    hidden: true,
-    is_menu: false,
-    name: 'pressuresore',
-    meta: {
-      title: 'pressuresore',
-      noCache: true
-    }
-  },
-  {//oh压疮评估
-    path: '/patients/patient/:id/OHpressuresore',
-    component: () => import('@/xt_pages/user/evaluationtool/OHpressuresore'),
-    hidden: true,
-    is_menu: false,
-    name: 'OHpressuresore',
-    meta: {
-      title: 'OHpressuresore',
-      noCache: true
-    }
-  },
-  {//日常生活能力评估
-    path: '/patients/patient/:id/dailyLife',
-    component: () => import('@/xt_pages/user/evaluationtool/dailyLife'),
-    hidden: true,
-    is_menu: false,
-    name: 'dailyLife',
-    meta: {
-      title: 'dailyLife',
-      noCache: true
-    }
-  },
-  {//导管脱落风险评估
-    path: '/patients/patient/:id/Cathetershedding',
-    component: () => import('@/xt_pages/user/evaluationtool/Cathetershedding'),
-    hidden: true,
-    is_menu: false,
-    name: 'Cathetershedding',
-    meta: {
-      title: 'Cathetershedding',
-      noCache: true
-    }
-  },
-  {//RASS及疼痛评估
-    path: '/patients/patient/:id/RassAssessment',
-    component: () => import('@/xt_pages/user/evaluationtool/RassAssessment'),
-    hidden: true,
-    is_menu: false,
-    name: 'RassAssessment',
-    meta: {
-      title: 'RassAssessment',
-      noCache: true
-    }
-  },
-  {//营养状况评估
-    path: '/patients/patient/:id/nourishmentAssessment',
-    component: () => import('@/xt_pages/user/evaluationtool/nourishmentAssessment'),
-    hidden: true,
-    is_menu: false,
-    name: 'nourishmentAssessment',
-    meta: {
-      title: 'nourishmentAssessment',
-      noCache: true
-    }
-  },
-  {//约束告知单
-    path: '/patients/patient/:id/Constraintnotification',
-    component: () => import('@/xt_pages/user/evaluationtool/Constraintnotification'),
-    hidden: true,
-    is_menu: false,
-    name: 'Constraintnotification',
-    meta: {
-      title: 'Constraintnotification',
-      noCache: true
-    }
-  },
-  {//心理评估
-    path: '/patients/patient/:id/mindAssessment',
-    component: () => import('@/xt_pages/user/evaluationtool/mindAssessment'),
-    hidden: true,
-    is_menu: false,
-    name: 'mindAssessment',
-    meta: {
-      title: 'mindAssessment',
-      noCache: true
-    }
-  },
-  {//瘙痒评估
-    path: '/patients/patient/:id/pruritusAssessment',
-    component: () => import('@/xt_pages/user/evaluationtool/pruritusAssessment'),
-    hidden: true,
-    is_menu: false,
-    name: 'pruritusAssessment',
-    meta: {
-      title: 'pruritusAssessment',
-      noCache: true
-    }
-  },
-  {//血液透析患者评估
-    path: '/patients/patient/:id/hemodialysis',
-    component: () => import('@/xt_pages/user/evaluationtool/hemodialysis'),
-    hidden: true,
-    is_menu: false,
-    name: 'hemodialysis',
-    meta: {
-      title: 'hemodialysis',
-      noCache: true
-    }
-  },
-  {//Glasgow昏迷评分量表
-    path: '/patients/patient/:id/Glasgow',
-    component: () => import('@/xt_pages/user/evaluationtool/Glasgow'),
-    hidden: true,
-    is_menu: false,
-    name: 'Glasgow',
-    meta: {
-      title: 'Glasgow',
-      noCache: true
-    }
-  },
-  {//肌力评估表
-    path: '/patients/patient/:id/Muscleforce',
-    component: () => import('@/xt_pages/user/evaluationtool/Muscleforce'),
-    hidden: true,
-    is_menu: false,
-    name: 'Muscleforce',
-    meta: {
-      title: 'Muscleforce',
-      noCache: true
-    }
-  },
+  // {//评估工具/跌倒评估
+  //   path: '/patients/patient/:id/Fallassessment',
+  //   component: () => import('@/xt_pages/user/evaluationtool/Fallassessment'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'Fallassessment',
+  //   meta: {
+  //     title: 'firstDiseasePrint',
+  //     noCache: true
+  //   }
+  // },
+  // {//小儿跌倒风险评估
+  //   path: '/patients/patient/:id/pediatricFallAssessment',
+  //   component: () => import('@/xt_pages/user/evaluationtool/pediatricFallAssessment'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'pediatricFallAssessment',
+  //   meta: {
+  //     title: 'pediatricFallAssessment',
+  //     noCache: true
+  //   }
+  // },
+  // {//压疮风险评估
+  //   path: '/patients/patient/:id/pressuresore',
+  //   component: () => import('@/xt_pages/user/evaluationtool/pressuresore'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'pressuresore',
+  //   meta: {
+  //     title: 'pressuresore',
+  //     noCache: true
+  //   }
+  // },
+  // {//oh压疮评估
+  //   path: '/patients/patient/:id/OHpressuresore',
+  //   component: () => import('@/xt_pages/user/evaluationtool/OHpressuresore'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'OHpressuresore',
+  //   meta: {
+  //     title: 'OHpressuresore',
+  //     noCache: true
+  //   }
+  // },
+  // {//日常生活能力评估
+  //   path: '/patients/patient/:id/dailyLife',
+  //   component: () => import('@/xt_pages/user/evaluationtool/dailyLife'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'dailyLife',
+  //   meta: {
+  //     title: 'dailyLife',
+  //     noCache: true
+  //   }
+  // },
+  // {//导管脱落风险评估
+  //   path: '/patients/patient/:id/Cathetershedding',
+  //   component: () => import('@/xt_pages/user/evaluationtool/Cathetershedding'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'Cathetershedding',
+  //   meta: {
+  //     title: 'Cathetershedding',
+  //     noCache: true
+  //   }
+  // },
+  // {//RASS及疼痛评估
+  //   path: '/patients/patient/:id/RassAssessment',
+  //   component: () => import('@/xt_pages/user/evaluationtool/RassAssessment'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'RassAssessment',
+  //   meta: {
+  //     title: 'RassAssessment',
+  //     noCache: true
+  //   }
+  // },
+  // {//营养状况评估
+  //   path: '/patients/patient/:id/nourishmentAssessment',
+  //   component: () => import('@/xt_pages/user/evaluationtool/nourishmentAssessment'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'nourishmentAssessment',
+  //   meta: {
+  //     title: 'nourishmentAssessment',
+  //     noCache: true
+  //   }
+  // },
+  // {//约束告知单
+  //   path: '/patients/patient/:id/Constraintnotification',
+  //   component: () => import('@/xt_pages/user/evaluationtool/Constraintnotification'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'Constraintnotification',
+  //   meta: {
+  //     title: 'Constraintnotification',
+  //     noCache: true
+  //   }
+  // },
+  // {//心理评估
+  //   path: '/patients/patient/:id/mindAssessment',
+  //   component: () => import('@/xt_pages/user/evaluationtool/mindAssessment'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'mindAssessment',
+  //   meta: {
+  //     title: 'mindAssessment',
+  //     noCache: true
+  //   }
+  // },
+  // {//瘙痒评估
+  //   path: '/patients/patient/:id/pruritusAssessment',
+  //   component: () => import('@/xt_pages/user/evaluationtool/pruritusAssessment'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'pruritusAssessment',
+  //   meta: {
+  //     title: 'pruritusAssessment',
+  //     noCache: true
+  //   }
+  // },
+  // {//血液透析患者评估
+  //   path: '/patients/patient/:id/hemodialysis',
+  //   component: () => import('@/xt_pages/user/evaluationtool/hemodialysis'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'hemodialysis',
+  //   meta: {
+  //     title: 'hemodialysis',
+  //     noCache: true
+  //   }
+  // },
+  // {//Glasgow昏迷评分量表
+  //   path: '/patients/patient/:id/Glasgow',
+  //   component: () => import('@/xt_pages/user/evaluationtool/Glasgow'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'Glasgow',
+  //   meta: {
+  //     title: 'Glasgow',
+  //     noCache: true
+  //   }
+  // },
+  // {//肌力评估表
+  //   path: '/patients/patient/:id/Muscleforce',
+  //   component: () => import('@/xt_pages/user/evaluationtool/Muscleforce'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'Muscleforce',
+  //   meta: {
+  //     title: 'Muscleforce',
+  //     noCache: true
+  //   }
+  // },
   // {//血管通路图
   //   path: '/patients/patient/:id/angiogram',
   //   component: () => import('@/xt_pages/user/angiogram'),

src/xt_pages/outpatientCharges/statementTemplate/printeEleven.vue

@@ -64,8 +64,8 @@
           <td width="6.1%">数量</td>
           <td width="8.1%">单价</td>
           <td width="8.1%">金额</td>
-          <td width="10.1%">医保标识</td>
-          <td width="10.1%">自付金额</td>
+          <!-- <td width="10.1%">医保标识</td> -->
+          <td width="10.1%">个人自付</td>
 
         </tr>
         <!-- width="72.6%"  16.82%  16.1-->
@@ -73,7 +73,7 @@
           <td colspan="9" style="line-height: 30px;">
             <div v-for="item in info.new_list">
               <div style="display: flex;border-bottom: 1px solid black;font-size: 16px;font-weight: bolder;">
-                <div style="width: 72.6%;">{{item.med_chrgitm_name}}</div>
+                <div style="width: 67.6%;">{{item.med_chrgitm_name}}</div>
                 <div style="width: 8.1%;text-align: center;">小计</div>
                 <div style="width: 8.1%;text-align: center;">{{item.total}}</div>
               </div>
@@ -86,8 +86,8 @@
                 <div style="width: 6.7%;padding: 5px;text-align: center;">{{subItem.count}}</div>
                 <div style="width: 8.1%;padding: 5px;text-align: center;">{{subItem.price}}</div>
                 <div style="width: 8.1%;padding: 5px;text-align: center;">{{subItem.total_price}}</div>
-                <div style="width: 10.1%;padding: 5px;"></div>
-                <div style="width: 8.1%;padding: 5px;text-align: center;">{{subItem.psn_pay}}</div>
+                <!-- <div style="width: 10.1%;padding: 5px;"></div> -->
+                <div style="width: 10.1%;padding: 5px;text-align: center;">{{subItem.psn_pay}}</div>
               </div>
             </div>
           </td>

src/xt_pages/user/components/PatientSidebar.vue

@@ -335,44 +335,44 @@ export default {
       // else if(name == '1-12'){
       //   this.$router.push({path:'/patients/patient/'+this.id+'/angiogram'})
       // } 
-      else if (name == '5-1') {
-        this.$router.push({
-          path: '/patients/patient/'+ this.id +'/Fallassessment'
-        })
-      } else if (name == '5-2') {
-        this.$router.push({
-          path: '/patients/patient/' + this.id + '/pediatricFallAssessment'
-        })
-      } else if (name == '5-3') {
-        this.$router.push({
-          path: '/patients/patient/' + this.id + '/pressuresore'
-        })
-      } else if (name == '5-4') {
-        this.$router.push({
-          path: '/patients/patient/' + this.id + '/OHpressuresore'
-        })
-      } else if (name == '5-5'){
-        this.$router.push({path:'/patients/patient/'+this.id+'/dailyLife'})
-      } else if (name == '5-6'){
-        this.$router.push({path:'/patients/patient/'+this.id+'/Cathetershedding'})
-      } else if (name == '5-7'){
-        this.$router.push({path:'/patients/patient/'+this.id+'/RassAssessment'})
-      } else if(name == '5-8'){
-        this.$router.push({path:'/patients/patient/'+this.id+'/nourishmentAssessment'})
-      } else if(name == '5-9'){
-        this.$router.push({path:'/patients/patient/'+this.id+'/Constraintnotification'})
-      } else if(name == '5-10'){
-        this.$router.push({ path: '/patients/patient/' + this.id+'/mindAssessment'})
-      } else if(name == '5-11'){
-        this.$router.push({path:'/patients/patient/' + this.id+'/pruritusAssessment'})
+      // else if (name == '5-1') {
+      //   this.$router.push({
+      //     path: '/patients/patient/'+ this.id +'/Fallassessment'
+      //   })
+      // } else if (name == '5-2') {
+      //   this.$router.push({
+      //     path: '/patients/patient/' + this.id + '/pediatricFallAssessment'
+      //   })
+      // } else if (name == '5-3') {
+      //   this.$router.push({
+      //     path: '/patients/patient/' + this.id + '/pressuresore'
+      //   })
+      // } else if (name == '5-4') {
+      //   this.$router.push({
+      //     path: '/patients/patient/' + this.id + '/OHpressuresore'
+      //   })
+      // } else if (name == '5-5'){
+      //   this.$router.push({path:'/patients/patient/'+this.id+'/dailyLife'})
+      // } else if (name == '5-6'){
+      //   this.$router.push({path:'/patients/patient/'+this.id+'/Cathetershedding'})
+      // } else if (name == '5-7'){
+      //   this.$router.push({path:'/patients/patient/'+this.id+'/RassAssessment'})
+      // } else if(name == '5-8'){
+      //   this.$router.push({path:'/patients/patient/'+this.id+'/nourishmentAssessment'})
+      // } else if(name == '5-9'){
+      //   this.$router.push({path:'/patients/patient/'+this.id+'/Constraintnotification'})
+      // } else if(name == '5-10'){
+      //   this.$router.push({ path: '/patients/patient/' + this.id+'/mindAssessment'})
+      // } else if(name == '5-11'){
+      //   this.$router.push({path:'/patients/patient/' + this.id+'/pruritusAssessment'})
 
-      } else if(name == '5-12'){
-        this.$router.push({path:'/patients/patient/' + this.id+'/hemodialysis'})
-      } else if(name == '5-13'){
-        this.$router.push({path:'/patients/patient/' + this.id+'/Glasgow'})
-      } else if(name == '5-14'){
-        this.$router.push({path:'/patients/patient/' + this.id+'/Muscleforce'})
-      }
+      // } else if(name == '5-12'){
+      //   this.$router.push({path:'/patients/patient/' + this.id+'/hemodialysis'})
+      // } else if(name == '5-13'){
+      //   this.$router.push({path:'/patients/patient/' + this.id+'/Glasgow'})
+      // } else if(name == '5-14'){
+      //   this.$router.push({path:'/patients/patient/' + this.id+'/Muscleforce'})
+      // }
      
     },
     changePatient(value) {