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

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -1469,10 +1469,10 @@ export default {
 
          var is_arr = this.hasDuplicates(arr)
 
-         if(is_arr == true){
-           this.$message.error("药品追溯码已经存在,不能重复扫码!")
-           arr.splice(i_index,1)
-         }
+        //  if(is_arr == true){
+        //    this.$message.error("药品追溯码已经存在,不能重复扫码!")
+        //    arr.splice(i_index,1)
+        //  }
 
          console.log("is_arr-=--------------",is_arr)
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1195,14 +1195,13 @@ export default {
         { value: 14, label: '门诊特殊病' },
         { value: '992102', label: '单病种(992102)' },
         { value: '140104', label: '城乡门诊特殊病(140104)' },
+        { value: '1104', label: '省外异地门诊慢特病'},
         { value: '9922', label: '家庭通道' },
         { value: '1111', label: '精一' },
         { value: '1112', label: '精二' },
-        { value: '1112', label: '精二' },
         { value: '999999', label: '自费' },
         { value: '118801', label: '118801' },
 
-
       ], register10721: [
         { value: 11, label: '普通门诊' },
         { value: 14, label: '门诊慢特病(14)' },
@@ -3550,7 +3549,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 &&   this.$store.getters.xt_user.org_id !=  10567 &&  this.$store.getters.xt_user.org_id !=  10697 &&   this.$store.getters.xt_user.org_id !=  10724) {
+          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.$store.getters.xt_user.org_id !=  10571) {
             this.pwdFormVisible = true
             this.pwd = ''
           } else {