Merge branch 'release' into 'feature/ljq'

xiugaiziduan

See merge request !296

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

@@ -750,7 +750,7 @@
         </el-form-item>
         <el-form-item label="诊断疾病(医生填)">
           <el-input
-            v-model="formData.diagnoseDisease"
+            v-model="formData.diseaseName"
             placeholder="请输入确诊疾病名称"
             :disabled="formData.status == 4 || editorType == 2"
             class="set-width"
@@ -1327,6 +1327,7 @@ export default {
         diagnoseStage: '',
         determineFlag: '',
         diagnoseDisease: '',
+        diseaseName:'',
         illnessDetail: '',
         illnessImageUrls: [],
         diagnoseAdvice: '',