Merge branch 'byll6.0' into newVersion6.0

src/store/async-actions/diagnosticSearch.js

@@ -41,13 +41,15 @@ export const getSearchList = (val,flag) => {
                 const data = res.data.data;let curDate=[];
 
                 let arr = data.diseaseNames||[];
-                    for (var key in arr) {
-                        let obj = {}
-                        obj['name'] = arr[key];
-                        obj['uniqueName'] = arr[key];
-                        obj['conceptId'] = '';
-                        curDate.push(obj)
-                    }
+                for(let i = 0;i < arr.length;i++){
+                    let tmp = arr[i]
+                    let obj = {}
+                    obj['name'] = tmp.name;
+                    obj['uniqueName'] = tmp.name;
+                    obj['conceptId'] = '';
+                    obj['icd10Code'] = tmp.icd10Code;
+                    curDate.push(obj)
+                }
                 if(flag){ 
                     dispatch({
                         type: GET_SEARCH,