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/registerDialog9504.vue

@@ -448,7 +448,7 @@
               if (that.form.id_card_type == 1) {
                 that.form.id = patient.id
                 that.form.name = patient.name
-                that.form.sex = patient.gender
+                that.form.sex = patient.gender.toString()
                 that.form.age = patient.age
                 that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
                 that.form.phone = patient.phone

src/xt_pages/outpatientRegistration/index.vue

@@ -701,7 +701,7 @@
                 that.form.age = patient.age
                 that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
                 that.form.phone = patient.phone
-                that.form.id_card = patient.id_card_no
+                that.form.idCard = patient.id_card_no
                 that.form.medicalInsuranceCard = response.data.data.health_card_no
               } else if (that.form.id_card_type == 2) {
                 this.form.id = patient.id
@@ -710,7 +710,7 @@
                 that.form.age = patient.age
                 that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
                 that.form.phone = patient.phone
-                that.form.id_card = patient.id_card_no
+                that.form.idCard = patient.id_card_no
               }
               that.$message({ message: '读卡成功', type: 'success' })