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

config/dev.env.js

@@ -7,8 +7,8 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
-  // BASE_API: '"http://localhost:9531"',
+  // BASE_API: '"http://api.xt.test.sgjyun.com"',
+  BASE_API: '"http://localhost:9529"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

config/index.js

@@ -29,8 +29,8 @@ module.exports = {
 
     // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
-    host: 'xt.test.sgjyun.com',
-   // host: 'localhost',
+    // host: 'xt.test.sgjyun.com',
+   host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/xt_pages/outpatientCharges/newStatementPrint.vue

@@ -154,10 +154,7 @@
 
       },
       getInfo(order_id) {
-        if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990 ) {
-
           var that = this;
-
           axios.get('http://127.0.0.1:9532/api/settle/query', {
             params: {
               order_id: order_id,
@@ -175,8 +172,6 @@
                 that.info = response.data.data.info;
                 that.p_admin = response.data.data.printor_admin;
                 that.charge_admin = response.data.data.charge_admin;
-
-
                 that.info['p_admin'] =  that.p_admin;
                 that.info['charge_admin'] =  that.charge_admin;
 
@@ -233,7 +228,6 @@
             .catch(function (error) {
 
             });
-        }
       }
 
     },

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -133,7 +133,7 @@
                                                             </el-button>
                                                             <el-button
                                                                     v-if="items.curPrescriptions.order.order_status == 1 && items.curPrescriptions.order.is_pre == 1 && hisPatientInfo.balance_accounts_type != 2"
-                                                                    size="small" @click="open(11)" type="primary"
+                                                                    size="small" @click="open(11,items.med_type,items.prescriptions[0].order,items.prescriptions)" type="primary"
                                                             >撤销明细
                                                             </el-button>
                                                             <!--<div>{{ items.curPrescriptions.order.order_status}}</div>-->
@@ -159,7 +159,7 @@
 
 
                                                 <span>医疗费总额：<span style="color:red;">{{ items.curPrescriptions.order.medfee_sumamt ?  items.curPrescriptions.order.medfee_sumamt:getTotalFour(items.prescriptions)?getTotalFour(items.prescriptions):'' }}元</span></span>
-                                                <span>基金支付金额：<span style="color:red;">{{ items.curPrescriptions.order.fund_pay_sumamt?items.curPrescriptions.order.fund_pay_sumamt:''}}元</span></span>
+                                                <span>基金支付金额：<span style="color:red;">{{ items.curPrescriptions.order.hifp_pay?items.curPrescriptions.order.hifp_pay:''}}元</span></span>
                                                 <span>个人账户支付金额：<span style="color:red;">{{ items.curPrescriptions.order.acct_pay?items.curPrescriptions.order.acct_pay:''}}元</span></span>
                                                 <span v-if="hisPatientInfo.balance_accounts_type != 2">个人支付金额：<span
                                                         style="color:red;">{{ items.curPrescriptions.order.psn_cash_pay?items.curPrescriptions.order.psn_cash_pay:''}}元</span></span>
@@ -323,7 +323,7 @@
                                                   style="color:red;">{{ items.month_total }}元</span></span>
 
                                                 <span>医疗费总额：<span style="color:red;">{{ items.curMonthPrescriptions.order.medfee_sumamt ?  items.curMonthPrescriptions.order.medfee_sumamt:getTotalFour(items.month_prescriptions)?getTotalFour(items.month_prescriptions):'' }}元</span></span>
-                                                <span>基金支付金额：<span style="color:red;">{{ items.curMonthPrescriptions.order.fund_pay_sumamt?items.curMonthPrescriptions.order.fund_pay_sumamt:''}}元</span></span>
+                                                <span>基金支付金额：<span style="color:red;">{{ items.curMonthPrescriptions.order.hifp_pay?items.curMonthPrescriptions.order.hifp_pay:''}}元</span></span>
                                                 <span>个人账户支付金额：<span style="color:red;">{{ items.curMonthPrescriptions.order.acct_pay?items.curMonthPrescriptions.order.acct_pay:''}}元</span></span>
                                                 <!--<span>个人支付金额：<span style="color:red;">{{ items.curMonthPrescriptions.order.psn_cash_pay?items.curMonthPrescriptions.order.psn_cash_pay:''}}元</span></span>-->
 
@@ -2202,8 +2202,8 @@
         } else if (index == 11) {
           var that = this
           let params = {
-            'order_id': this.order.id,
-            'number': this.order.number,
+            'order_id': order.id,
+            'number': order.number,
             'patient_id': this.patientInfo.id,
             'record_time': this.record_date,
             'org_id': this.$store.getters.xt_user.org_id,
@@ -2687,7 +2687,7 @@
             this.current_index = 0
 
             this.$refs.tab.setCurrentRow(this.patientTableData[0])
-            this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order_number, this.patientTableData[0].his_patient_id, this.patientTableData[0].order_id)
+            // this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order_number, this.patientTableData[0].his_patient_id, this.patientTableData[0].order_id)
 
           }
 

src/xt_pages/outpatientCharges/settlementPrint.vue

@@ -162,7 +162,6 @@ export default {
 
     },
     getInfo(order_id) {
-      if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 ||  this.$store.getters.xt_user.org_id == 10106  ||  this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9990 || this.$store.getters.xt_user.org_id == 0) {
 
         var that = this;
 
@@ -237,7 +236,6 @@ export default {
           .catch(function (error) {
 
           });
-      }
     }
   },
   created() {

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -402,12 +402,12 @@
             scope.row.prescribing_number = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)
           }else{
             console.log(12)
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1)) * (scope.row.day ? scope.row.day : 1) / scope.row.drug.min_number) 
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1)) * (scope.row.day ? scope.row.day : 1) / scope.row.drug.min_number)
           }
         }else{
           if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
             console.log(123)
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose) 
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose)
           }else{
             console.log(1234)
             scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose / scope.row.drug.min_number)
@@ -427,7 +427,7 @@
           }
           // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
         }
-        
+
       },
       getPrescribingNumberUnit(scope){
 
@@ -436,11 +436,11 @@
         //   if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
         //     scope.row.prescribing_number = scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day
         //   }else{
-        //     scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency)) * scope.row.day / scope.row.drug.min_number) 
+        //     scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency)) * scope.row.day / scope.row.drug.min_number)
         //   }
         // }else{
         //   if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
-        //     scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose) 
+        //     scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose)
         //   }else{
         //     scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose / scope.row.drug.min_number)
         //   }
@@ -482,7 +482,7 @@
         if(this.prescription.project[scope.$index].total == 0){
           this.prescription.project[scope.$index].total = 1
         }
-        
+
       },
       getNum(execution_frequency){
         let arr = [
@@ -527,7 +527,7 @@
     watch:{
       "prescription.advices":{
         handler(newVal,oldVal){
-          
+
         },
         deep:true
       },

src/xt_pages/workforce/components/tableWeeks.vue

@@ -457,8 +457,14 @@
           }
         }
 
+
         return ''
 
+      },getAnticoagulantName(id) {
+
+        return this.$store.getters.anticoagulants_confit[id] != undefined ? this.$store.getters.anticoagulants_confit[id].name: ""
+
+
       },
       getModeDesc(list) {
         let modes = []
@@ -638,10 +644,7 @@
           modes.push(obj)
 
         }
-        let dialysate_formulation_options = getDataConfig(
-          'hemodialysis',
-          'dialysate_formulation'
-        )
+
         modes = this.uniqueDialysisFormulation(modes)
         for (let i = 0; i < list.length; i++) {
           for (let c = 0; c < modes.length; c++) {
@@ -758,9 +761,35 @@
       }
       ,
       getAnticoagulantDesc(list) {
+        let modes = []
+        for (let b = 0; b < list.length; b++) {
+          let obj = {
+            id: list[b].dialysissolution.anticoagulant,
+            name: this.getAnticoagulantName(list[b].dialysissolution.anticoagulant),
+            count: 0
 
-      }
-      ,
+          }
+          modes.push(obj)
+
+        }
+        modes = this.uniqueAnticoagulant(modes)
+        for (let i = 0; i < list.length; i++) {
+          for (let c = 0; c < modes.length; c++) {
+            if (modes[c].id == list[i].dialysissolution.anticoagulant) {
+              modes[c].count = modes[c].count + 1
+            }
+          }
+        }
+        let desc = ''
+        for (let b = 0; b < modes.length; b++) {
+          if (desc.length == 0) {
+            desc = modes[b].name + ': ' + modes[b].count + '次'
+          } else {
+            desc = desc + ' \n\r ' + modes[b].name + ': ' + modes[b].count + '次'
+          }
+        }
+        return desc
+      },
       getEPODesc(list) {
         let EPO = []
         for (let b = 0; b < list.length; b++) {
@@ -870,6 +899,10 @@
         const res = new Map()
         return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1))
       }
+      , uniqueAnticoagulant(arr) {
+        const res = new Map()
+        return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1))
+      }
       ,
 
       getScheduleList() {

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //       store.dispatch('VerifyConfigList', []).then(() => {
-  //         next()
-  //       })
-  //     }
-  //     if (store.getters.permission_routers === undefined) {
-  //       store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //         next()
-  //       })
-  //     } else {
-  //       next()
-  //     }
-  //   return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+        store.dispatch('VerifyConfigList', []).then(() => {
+          next()
+        })
+      }
+      if (store.getters.permission_routers === undefined) {
+        store.dispatch('xt_GenerateRoutes', []).then(() => {
+          next()
+        })
+      } else {
+        next()
+      }
+    return
   // 线上注释
 
   NProgress.start()