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/components/registerDialog.vue

@@ -637,6 +637,9 @@
         this.form.id_card_type = 2
         this.form.certificates = 1
 
+        if (this.$store.getters.xt_user.org_id == 10188){
+          this.form.id_card_type = 1
+        }
 
         if (departments.length > 0) {
           this.form.department = departments[0].id

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -2123,7 +2123,7 @@ export default {
         }
 
         if (this.hisPatientInfo.id_card_type == 1) {
-          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106) {
+          if (this.hisPatientInfo.balance_accounts_type != 2 && 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.pwdFormVisible = true
             this.pwd = ''
           } else {