Browse Source

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

csx 3 years ago
parent
commit
f36ca49779

+ 1 - 0
src/xt_pages/hospitalStation/summary.vue View File

268
           { value: 2, label: '结算时间' }
268
           { value: 2, label: '结算时间' }
269
         ],
269
         ],
270
         p_types:[
270
         p_types:[
271
+          { value: 0, label: '全部' },
271
           { value: 1, label: '住院' },
272
           { value: 1, label: '住院' },
272
           { value: 2, label: '门诊' }
273
           { value: 2, label: '门诊' }
273
         ],
274
         ],

+ 1 - 1
src/xt_pages/outpatientCharges/components/registerDialog.vue View File

702
         this.form.id_card_type = 2
702
         this.form.id_card_type = 2
703
         this.form.certificates = 1
703
         this.form.certificates = 1
704
 
704
 
705
-        if (this.$store.getters.xt_user.org_id == 10188){
705
+        if (this.$store.getters.xt_user.org_id == 10188  || this.$store.getters.xt_user.org_id == 10217){
706
           this.form.id_card_type = 1
706
           this.form.id_card_type = 1
707
         }
707
         }
708
 
708