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

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -4046,7 +4046,8 @@
           this.big_month_prescriptions[i]['month_total'] = this.getMonthTotalTwo(this.big_month_prescriptions[i].month_prescriptions[0])
         }
 
-      }, getPName(med_type, index) {
+      },
+      getPName(med_type, index) {
         var med_type = parseInt(med_type)
 
         if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {

src/xt_pages/outpatientCharges/summary.vue

@@ -84,6 +84,9 @@
                 <el-table-column align="center" width="90" prop="name" label="科室">
                     <template slot-scope="scope">{{scope.row.department_name}}</template>
                 </el-table-column>
+                <el-table-column align="center" width="90" prop="name" label="医疗类型">
+                    <template slot-scope="scope"><div>{{getMedType(scope.row.med_type)}}</div></template>
+                </el-table-column>
                 <el-table-column align="center" width="100" prop="name" label="收费日期">
                     <template slot-scope="scope">
                         {{scope.row.setl_time?scope.row.setl_time:getTimes(scope.row.settle_accounts_date)}}
@@ -241,6 +244,95 @@
       }
     },
     methods: {
+      getMedType(med_type) {
+        var med_type = parseInt(med_type)
+        if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
+          switch (med_type) {
+            case 11:
+              return '普通门诊'
+
+              break
+            case 12:
+              return '家庭通道'
+
+              break
+            case 13:
+              return '门诊大病'
+
+              break
+
+            case 14:
+              return '重疾特药'
+              break
+
+            case 15:
+              return '门诊慢病'
+
+              break
+            case 16:
+              return '门诊特检'
+
+              break
+            case 17:
+              return '健康体检'
+
+              break
+            case 18:
+              return '预防接种'
+
+              break
+            case 19:
+              return '门诊输血'
+
+              break
+            case 91:
+              return '新冠肺炎门诊'
+              break
+            case 1111:
+              return '精一' + '处方'
+              break
+            case 1112:
+              return '精二' + '处方'
+              break
+          }
+
+        } else {
+
+          switch (med_type) {
+            case 11:
+              return '普通门诊'
+
+              break
+            case 12:
+              return '门诊挂号'
+
+              break
+            case 13:
+              return '急诊'
+
+              break
+
+            case 14:
+              return '门诊特殊病'
+              break
+
+            case 15:
+              return '门诊统筹'
+
+              break
+            case 16:
+              return '门诊慢性病'
+
+              break
+            case 21:
+              return '普通住院'
+              break
+
+          }
+
+        }
+
+      },
       uploadInfo(row) {
         var that = this
         axios.get('http://127.0.0.1:9532/api/settlelist/get', {
@@ -291,6 +383,10 @@
 
       }, toRefund(row) {
 
+        console.log("~~~~~")
+        console.log(row)
+        console.log(this.$store.getters.xt_user.org_id )
+
 
 
         if (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 == 10106 || this.$store.getters.xt_user.org_id == 9990) {
@@ -335,8 +431,8 @@
           }).catch(() => {
           })
 
-        } else if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
-
+        } else if (this.$store.getters.xt_user.org_id == 0 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138) {
+            var that = this
           this.$confirm('是否退费', '退费', {
             confirmButtonText: '确 定',
             cancelButtonText: '取 消',
@@ -345,8 +441,8 @@
             let params = {
               'order_id': row.id,
               'patient_id': row.patient_id,
-              'record_time': that.getTimes(row.settle_accounts_date),
-              'admin_user_id': that.$store.getters.xt_user.user.id
+              'record_time': this.getTimes(row.settle_accounts_date),
+              'admin_user_id': this.$store.getters.xt_user.user.id
             }
             axios.get('http://127.0.0.1:9532/sz/api/refund/get', {
               params: params

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1950,12 +1950,23 @@
 
 
 
+
+
             if (info.id > 0) {
               this.doctorValue = info.doctor_id
               this.departmentValue = info.departments
             } else {
-              this.doctorValue = this.doctors[0].id
-              this.departmentValue = this.department[0].id
+              if(admin_info.id > 0 && admin_info.user_type == 2){
+                this.doctorValue = admin_info.admin_user_id
+                this.departmentValue = this.department[0].id
+
+              }else{
+
+                this.doctorValue = this.doctors[0].admin_user_id
+                this.departmentValue = this.department[0].id
+
+              }
+
 
             }
 
@@ -3247,4 +3258,4 @@
         height: 15px;
     }
 
-</style>
+</style>

src/xt_pages/outpatientRegistration/index.vue

@@ -1216,6 +1216,9 @@
                         that.form.phone = ''
                         that.form.social_type = ''
 
+                        that.form.register = 4
+                        that.form.registrationFee = 0
+                        that.form.medicalExpenses = 0
                         that.form.p_type = 14
                         that.form.sick_type = that.sick[0].id
                         that.form.diagnosis = that.diagnoses[0].id
@@ -1254,7 +1257,9 @@
                     this.form.phone = ''
                     this.form.social_type = ''
                     this.loadingone = false
-
+                    this.form.register = 4
+                    this.form.registrationFee = 0
+                    this.form.medicalExpenses = 0
                     this.form.p_type = 14
                     this.form.sick_type = this.sick[0].id
                     this.form.diagnosis = this.diagnoses[0].id