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

@@ -1096,6 +1096,7 @@
                   that.$refs.register9504.hide()
                   return false
                 } else {
+                  that.loadingone = false
                   if (response.data.data.failed_code == -10) {
                     that.$confirm(response.data.data.msg, '医保错误信息', {
                       confirmButtonText: '确 定',

src/xt_pages/outpatientRegistration/index.vue

@@ -1145,9 +1145,10 @@
                     that.form.social_type = ''
                     that.loadingone = false
 
-                    that.form.settlementValue = ''
                     that.form.medicalInsuranceCard = ''
 
+                    that.form.medicalCare = 11
+                    that.form.settlementValue = 1
                     that.form.certificates = 2
                     that.form.id_card_type = 1
                     that.form.p_type = 14