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

src/router/modules/hospitalStation.js

@@ -12,13 +12,13 @@ export default {
     isChild: true
   },
   children: [
-
-    {
-      path: '/hospitalStation/doctorDesk',
-      component: () => import('@/xt_pages/hospitalStation/doctorDesk'),
-      name: 'outpatientDoctorStationDoctorDesk',
-      meta: { title: 'outpatientDoctorStationDoctorDesk', noCache: true }
-    },
+    //
+    // {
+    //   path: '/hospitalStation/doctorDesk',
+    //   component: () => import('@/xt_pages/hospitalStation/doctorDesk'),
+    //   name: 'outpatientDoctorStationDoctorDesk',
+    //   meta: { title: 'outpatientDoctorStationDoctorDesk', noCache: true }
+    // },
     {
       path: '/hospitalStation/pastInquiries',
       component: () => import('@/xt_pages/hospitalStation/pastInquiries'),

src/xt_pages/dialysis/batch_print/batch_print_order_twentySeven.vue

@@ -1288,11 +1288,7 @@
                               <td width="50">
                                 <div class="under-line">
                                   &nbsp;{{
-                                    record.assessment_before_dislysis
-                                      .weight_before
-                                      ? record.assessment_before_dislysis
-                                          .weight_before
-                                      : ""
+                                    record.lastafterweight.weight_after ? record.lastafterweight.weight_after : ""
                                   }}
                                 </div>
                               </td>
@@ -1316,11 +1312,7 @@
                               <td width="50">
                                 <div class="under-line">
                                   &nbsp;{{
-                                    record.assessment_before_dislysis
-                                      .weight_before
-                                      ? record.assessment_before_dislysis
-                                          .weight_before
-                                      : ""
+                                   record.assessment_after_dislysis.weight_after ? record.assessment_after_dislysis.weight_after : ""
                                   }}
                                 </div>
                               </td>

src/xt_pages/dialysis/signPrint.vue

@@ -20,8 +20,6 @@
                             <div>药名:{{ it.advice_name }} 
                             <span v-if="it.prescribing_number>0 && org_id !=0 && org_id!=10440">
                                 {{it.prescribing_number}}{{ it.prescribing_number_unit }}
-                            
-                            
                             </span> 
                             </div>  
                             <div v-if="org_id == 10138 || org_id == 10278">
@@ -32,8 +30,8 @@
                                 规格:{{it.advice_desc }} {{ it.drug_spec_unit }}
                             </div> 
                             <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223 || org_id ==10617 || org_id ==10598) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
-                            <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{it.execution_frequency}}</div>  
-                            <div v-if="org_id!=10278">给药途径:{{it.delivery_way}}</div>  
+                            <div v-if="org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{it.execution_frequency}} &nbsp;&nbsp;<span v-if="org_id ==10740">{{it.delivery_way}}</span></div>  
+                            <div v-if="org_id!=10278 && org_id !=10740">给药途径:{{it.delivery_way}}</div>  
                             <div v-if="org_id == 0 || org_id==10223">
                                 <span>执行者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                 <span>核对者:</span>
@@ -53,8 +51,8 @@
                             
                             </div>  
                             <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223 || org_id ==10617 || org_id ==10598">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
-                            <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{its.execution_frequency}}</div>  
-                            <div>给药途径:{{its.delivery_way}}</div>  
+                            <div v-if="org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{its.execution_frequency}} &nbsp;&nbsp;<span v-if="org_id ==10740">{{its.delivery_way}}</span></div>  
+                            <div v-if="org_id !=10740">给药途径:{{its.delivery_way}}</div>  
                             <div v-if="org_id == 0 || org_id==10223">
                                 <span>执行者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                 <span>核对者:</span>

src/xt_pages/hospitalStation/costComparison.vue

@@ -57,6 +57,14 @@
             <div style="float: right;margin-bottom: 10px">
                 <el-button size="small" type="primary" @click="dialogFormVisible = true">医保对账</el-button>
                 <el-button size="small" type="primary" @click="getFormData">下载对账报表</el-button>
+
+
+              <el-button v-if="$store.getters.xt_user.org_id == 10644" size="small" type="primary" @click="getSHFormData(1)">下载本地职工对账报表</el-button>
+              <el-button v-if="$store.getters.xt_user.org_id == 10644" size="small" type="primary" @click="getSHFormData(2)">下载本地城乡对账报表</el-button>
+              <el-button v-if="$store.getters.xt_user.org_id == 10644" size="small" type="primary" @click="getSHFormData(3)">下载异地职工对账报表</el-button>
+              <el-button v-if="$store.getters.xt_user.org_id == 10644" size="small" type="primary" @click="getSHFormData(4)">下载异地城乡对账报表</el-button>
+
+
             </div>
 
 
@@ -556,7 +564,71 @@
         this.page = page;
         this.getList()
 
-      }, getFormData() {
+      }, getSHFormData(type){
+        switch (type){
+          case 1:
+            let params = {
+              'start_time': this.getTimes(this.selection[0].start_time),
+              'end_time': this.getTimes(this.selection[0].end_time),
+              'insutype': this.selection[0].insutype
+            };
+            getCheckAccountFormData(params).then(response => {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg);
+                return false
+              } else {
+                this.fromData = response.data.data.list;
+                var list = [];
+
+                for (let i = 0; i < this.fromData.length; i++) {
+                  let obj = {
+                    '结算金额': this.fromData[i].medfee_sumamt,
+                    '姓名': this.fromData[i].psn_name,
+                    '身份证': this.fromData[i].id_card_no,
+                    '个人编号': this.fromData[i].psn_no,
+                    '门诊流水号': this.fromData[i].mdtrt_id,
+                    '挂号日期': this.getTimes(this.fromData[i].settle_accounts_date),
+                    '起付线': this.fromData[i].act_pay_dedc,
+                    '统筹基金': this.fromData[i].fund_pay_sumamt,
+                    '个人支付': this.fromData[i].psn_cash_pay,
+                    '个账支付': this.fromData[i].acct_pay,
+                    '现金支付': this.fromData[i].cash_pay,
+                    '总费用': this.fromData[i].sumamt,
+                    '冲销标志': '已结算'
+                  };
+                  list.push(obj)
+                }
+                var insutype_name = '';
+                if (this.query_insutype == '310') {
+                  insutype_name = '职工基本医疗保险'
+                } else if (this.query_insutype == '390') {
+                  insutype_name = '城乡居民基本医疗保险'
+                }
+
+                import('@/vendor/Export2Excel').then(excel => {
+                  const tHeader = ['结算金额', '姓名', '身份证', '个人编号', '门诊流水号', '挂号日期', '起付线', '统筹基金', '个人支付', '个账支付', '现金支付', '总费用', '冲销标志'];
+                  const filterVal = ['结算金额', '姓名', '身份证', '个人编号', '门诊流水号', '挂号日期', '起付线', '统筹基金', '个人支付', '个账支付', '现金支付', '总费用', '冲销标志'];
+                  const data = this.formatJson(filterVal, list);
+                  excel.export_json_to_excel({
+                    header: tHeader,
+                    data,
+                    filename:this.getTimes(this.selection[0].start_time)+ '~' + this.getTimes(this.selection[0].end_time)+ insutype_name + '对账报表'
+                  })
+                })
+              }
+            })
+            break
+          case 2:
+
+            break
+          case 3:
+
+            break
+          case 4:
+
+            break
+        }
+      },getFormData() {
         if (this.selection.length == 0) {
           this.$message.error('请选择要下载的对账记录');
           return

src/xt_pages/medicalScheduling/index.vue

@@ -1021,8 +1021,6 @@ export default {
                         }
                     })
                     newDoctor.sort(this.compare('sort'))
-
-
                     let arr2 = []
 
                     arr2.push({class_name:oneStr,schedule_week:1})
@@ -1040,15 +1038,30 @@ export default {
                     arr2.push(obj)
 
                     let data = []
-
+                    let data2 = []
                     data.push(...newNurse)
                     data.push(...newDoctor)
                     data.push(obj)
                     console.log("data2o2oo2o2o2o22o",data)
-
+                    // if(this.typeValue!=0){
+                    //   console.log("医生",this.typeValue)
+                    //   for(let i in data){
+                    //     if(data[i].user_type == this.typeValue){
+                    //       data2.push(data[i])
+                    //     }
+                    //   }
+                    //   data2.push(obj)
+                    //   this.tableData = data2
+                    // }else{
+                    //   console.log("护士",this.typeValue)
+                    //   data.push(obj)
+                    //   this.tableData = data
+                    // }
+                    
+                    
                     // this.tableData = this.distinct(data)
                     this.tableData = data
-
+                   
 
                 }
             })
@@ -2018,6 +2031,8 @@ export default {
             }
         },
         tableCellStyle (row, rowIndex, column) {
+          // console.log('3333',row);
+          
             var week = (row.column.label).split('');
             var weeks = 0
             if (week.length == 13) {
@@ -2026,6 +2041,9 @@ export default {
             if (week.length == 14) {
                 weeks = week[4]+week[5]+week[6]+week[7]+week[8]+week[9]+week[10]+week[11]+week[12]
             }
+            if (week.length == 15) {
+                weeks = week[4]+week[5]+week[6]+week[7]+week[8]+week[9]+week[10]+week[11]+week[12]+week[13]
+            }
             var weekdate =  this.getTimestamp(weeks)
             if(weekdate  < this.timeNow){
             return 'background-color:#e5e5e5;'
@@ -2072,7 +2090,7 @@ export default {
 
        },
 
-     getTimestamp(time) { //把时间日期转成时间戳
+      getTimestamp(time) { //把时间日期转成时间戳
           return (new Date(time)).getTime() / 1000
        },
        exportList(){
@@ -2130,7 +2148,6 @@ export default {
          })
        },
 
-
        hoverMouse(row,column, cell, event){
         this.name=row.user_name
         this.column_lie= column.label.split('\n')[0]

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -143,7 +143,7 @@
                         type="primary">自费门诊就医上传(4205)
             </el-button>
 
-            <el-button  size="small" v-if="(org_id == 10138  && this.order.is_upload_success == 0 && this.order.order_status == 2) || (org_id == 10278  && this.order.is_upload_success == 0 && this.order.order_status == 2) || (org_id == 10028 && this.order.is_upload_diagnose == 0 && this.order.order_status == 2) || (org_id == 10610 && this.order.is_upload_diagnose == 0 && this.order.order_status == 2)  || (org_id == 9504 && this.order.is_upload_diagnose == 0 && this.order.order_status == 2)"
+            <el-button  size="small" v-if="(org_id == 10138   && this.order.order_status == 2) || (org_id == 10278  && this.order.order_status == 2) || (org_id == 10028 && this.order.order_status == 2) || (org_id == 10610 && this.order.order_status == 2)  || (org_id == 9504 && this.order.order_status == 2)"
                         @click="openZF(2)"
                         type="primary">自费上传确认(4203)
             </el-button>
@@ -3550,7 +3550,7 @@ export default {
         }
 
         if (this.hisPatientInfo.id_card_type == 1) {
-          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10510 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id !=  10318 && this.$store.getters.xt_user.org_id !=  10210 && this.$store.getters.xt_user.org_id !=  10375 &&  this.$store.getters.xt_user.org_id !=  10480 &&  this.$store.getters.xt_user.org_id !=  10387  &&  this.$store.getters.xt_user.org_id !=  10598 &&  this.$store.getters.xt_user.org_id !=  10721 &&   this.$store.getters.xt_user.org_id !=  10726) {
+          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10510 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id !=  10318 && this.$store.getters.xt_user.org_id !=  10210 && this.$store.getters.xt_user.org_id !=  10375 &&  this.$store.getters.xt_user.org_id !=  10480 &&  this.$store.getters.xt_user.org_id !=  10387  &&  this.$store.getters.xt_user.org_id !=  10598 &&  this.$store.getters.xt_user.org_id !=  10721 &&   this.$store.getters.xt_user.org_id !=  10726 &&   this.$store.getters.xt_user.org_id !=  10567 &&  this.$store.getters.xt_user.org_id !=  10697 &&   this.$store.getters.xt_user.org_id !=  10724) {
             this.pwdFormVisible = true
             this.pwd = ''
           } else {

src/xt_pages/user/Informed/Informedconsent.vue

@@ -232,7 +232,7 @@ export default {
                 // {date:'连续肾脏替代治疗(CRRT)治疗知情同意书',value:'19'},{date:'患方要求终止治疗及风险、责任承担承诺书',value:'20'},
                 // {date:'血液透析知情同意书',value:'21'}
                 {date:'死亡病例讨论记录',value:'22'},
-                // {date:'拒绝或放弃医学治疗告知书',value:'23'}
+                {date:'拒绝或放弃医学治疗告知书',value:'23'}
       ],
 
       face_show:true,