Merge remote-tracking branch 'origin/innterfaceUpdate' into innterfaceUpdate

src/store/reducers/assistCheck.js

@@ -12,7 +12,7 @@ const initSearchList = {
   list: [], //点击的结果
   assistLabel: [], //搜索的结果
   dataString: '', //结果拼接
-  dataArr: '', //结果拼接
+  dataArr: [], //结果拼接
   assistVal: '',
 
   hospitalPac: [], //医院检索到的

src/utils/tools.js

@@ -1382,8 +1382,8 @@ function getAllString(checkedListImport,assistLabel,flg){
       "dateValue": tempArr[i].time,
       "name": "",
       "uniqueName": tempArr[i].name,
-      "desc": tempArr[i].imagingDiagnose,
-      "result": tempArr[i].imagingDiagnose,
+      "desc": tempArr[i].value,
+      "result": tempArr[i].value,
     }
     tmpArr.push(obj)
     tmpString += (tempArr[i].name + (tmpVal ? (':' + tmpVal) + ', ' : ': ') + (tempArr[i].time ? '报告日期:' + tempArr[i].time : '') + '^;')