代码合并

2 years ago · 5354d436ef
2 changed files with 2 additions and 2 deletions
--- a/src/components/360View/commonForm/deveopmentFIle.vue
+++ b/src/components/360View/commonForm/deveopmentFIle.vue
@ -357,7 +357,7 @@ export default {
            id: '1'
          }, {
            name: '否',
-            id: '1'
+            id: '2'
          }],
          value: '',
          mirrorHabit: [{
--- a/src/components/360View/medicalRecord/index.vue
+++ b/src/components/360View/medicalRecord/index.vue
@ -172,7 +172,7 @@ export default {
      const params = {
        flag: 8,
        name: this.name,
-        jsonText: JSON.stringify(data),
+        jsonText: JSON.stringify(jsonText),
        patientId: this.patientId,
        id: this.id,
        platform: this.isSearch