Merge branch 'dev-20210517' into 'release'

Dev 20210517

See merge request !12

src/views/IM/diagnosis-admin/diagnosis-editor.vue

@@ -357,6 +357,7 @@ export default {
                 otherFollowStatus: '',
                 otherFollow: '',
                 remark: '',
+                maritalStatus: 2,
                 createType: 1  ////创建方式1.系统创建 2.手动创建
             },
             tyleList: TYPE_LIST,
@@ -466,6 +467,9 @@ export default {
                         this.oldDiagnoseAdvice = this.formData.diagnoseAdvice
                         this.formData.diagnoseAdvice = ''
                     }
+                    if (!this.formData.sex) {
+                      this.formData.sex = 1;
+                    }
                 } else {
                     this.$message.info('请稍后重试')
                 }