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

src/xt_pages/hospitalStation/summary.vue

@@ -268,6 +268,7 @@
           { value: 2, label: '结算时间' }
         ],
         p_types:[
+          { value: 0, label: '全部' },
           { value: 1, label: '住院' },
           { value: 2, label: '门诊' }
         ],

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -702,7 +702,7 @@
         this.form.id_card_type = 2
         this.form.certificates = 1
 
-        if (this.$store.getters.xt_user.org_id == 10188){
+        if (this.$store.getters.xt_user.org_id == 10188  || this.$store.getters.xt_user.org_id == 10217){
           this.form.id_card_type = 1
         }