Merge branch 'ChronicMag2' into test

src/components/icss/DiagnosisList.vue

@@ -117,12 +117,28 @@ export default {
         }
     },
     created() {
-      this.getDataList()
+      // this.getDataList()
+      this.getDropList().then(() => {
+            this.getDataList()
+        })
     },
     methods: {
         getValue(val) {
             console.log('changeVal', val, this.filter.tagAdscription)
         },
+        getDropList() {
+            return api.getDropList().then((res) =>{
+                // console.log('dropList', res)
+                if(res.data.code === '0') {
+                    this.Adscriptions = res.data.data[7];
+                    this.tagTypes =  res.data.data[2];
+                    for (var i = 0; i < this.tagTypes.length; i++) {
+                        this.tagTypesList.push(this.tagTypes[i].val)
+                    }
+                }
+                 
+            })
+        },
         getDataList() {
             const param = this.getFilterItems();
             api.getTagList(param).then((res) => {