Merge remote-tracking branch 'origin/termLink0615' into masterCdss

src/components/AddInspect/index.less

@@ -112,7 +112,7 @@
     white-space: nowrap;
     border: 1px solid transparent;
     cursor: pointer;
-    background-color: #f5f5f5;
+    // background-color: #f5f5f5;
 }
 
 .searchLi:hover {

src/components/AddNewInspect/index.less

@@ -113,7 +113,7 @@
     white-space: nowrap;
     border: 1px solid transparent;
     cursor: pointer;
-    background-color: #f5f5f5;
+    // background-color: #f5f5f5;
 }
 
 .searchLi:hover {

src/store/async-actions/assistCheck.js

@@ -1,39 +1,39 @@
 import axios from '@utils/ajax';
 import store from '@store';
 import { searchList } from '../actions/assistCheck';
-import {  Notify } from '@commonComp';
+import { Notify } from '@commonComp';
 import { formatFormParmas } from '@utils/tools';
 
 export const getSearchList = (val) => {
-    if(val.trim() == ''){
+    if (val.trim() == '') {
         const data = [];
-        return (dispatch) => dispatch(searchList(data,''));
+        return (dispatch) => dispatch(searchList(data, ''));
     }
     let baseList = store.getState();
     let sex = baseList.patInfo.message.patientSex;
     return (dispatch) => {
-        axios.json('/demo/retrieval/index',{
-            "age": formatFormParmas('patientAge',baseList.patInfo.patInfoData),
+        axios.json('/demo/retrieval/index', {
+            "age": formatFormParmas('patientAge', baseList.patInfo.patInfoData),
             "inputStr": val.trim(),
-            "sex": formatFormParmas('patientSex',baseList.patInfo.patInfoData),
+            "sex": formatFormParmas('patientSex', baseList.patInfo.patInfoData),
             "type": '3',
-            "hospitalId":baseList.homePage.curHos.hosId
+            "hospitalId": baseList.homePage.curHos.hosId
         })
-        .then((res)=>{
-            if(res.data.code==0){
-                const data = res.data.data;let curDate=[];
-                let arr = data.pacsNames||[];
+            .then((res) => {
+                if (res.data.code == 0) {
+                    const data = res.data.data; let curDate = [];
+                    let arr = data.nameList || [];
                     for (var key in arr) {
                         let obj = {}
-                        obj['uniqueName'] = arr[key];
-                        obj['detailName'] = arr[key];
-                        obj['name'] = arr[key];
+                        obj['uniqueName'] = arr[key].name;
+                        obj['detailName'] = arr[key].name;
+                        obj['name'] = arr[key].name;
                         curDate.push(obj)
                     }
-                dispatch(searchList(curDate,val.trim()));
-            }else{
-                Notify.error(res.data.msg)
-            }
-        })
+                    dispatch(searchList(curDate, val.trim()));
+                } else {
+                    Notify.error(res.data.msg)
+                }
+            })
     }
 };

src/store/async-actions/diagnosticSearch.js

@@ -45,7 +45,7 @@ export const getSearchList = (val,flag) => {
             if(res.data.code==0){
                 const data = res.data.data;let curDate=[];
 
-                let arr = data[showTcm?'tcmdiseaseNames':(showSym?'tcmsyndromeNames':'diseaseNames')]||[];
+                let arr = data[showTcm ? 'nameList' : (showSym ? 'nameList' :'nameList')]||[];
                 for(let i = 0;i < arr.length;i++){
                     let tmp = arr[i]
                     let obj = {}

src/store/async-actions/inspect.js

@@ -30,14 +30,16 @@ export const getSearchList = (val) => {
                         curDate[i]['flg'] = 0;
                     }
                 }else{
-                    let arr = data.lisNames||[],tmp=[];
+                    console.log(data)
+                    let arr = data.nameList||[],tmp=[];
                     for (var key in arr) {
                         let obj = {}
-                        obj['uniqueName'] = arr[key];
-                        obj['detailName'] = arr[key];
+                        console.log(arr[key])
+                        obj['uniqueName'] = arr[key].name;
+                        obj['detailName'] = arr[key].name;
                         obj['value'] = '';
                         obj['otherValue']='';
-                        obj['name'] = arr[key];
+                        obj['name'] = arr[key].name;
                         obj['flg'] = 1;
                         tmp.push(obj)
                     }

src/store/async-actions/newAdvice.js

@@ -24,13 +24,13 @@ export const getSearchList = (val) => {
             if(res.data.code==0){
                 const data = res.data.data;let curDate=[];
                 //药：阿替乐尔；手术：髂动脉造影
-                let arr = type==5?(data.drugNames||[]):type==6?(data.operationNames||[]):(data.transfusionNames||[]),tmp=[];
+                let arr = data.nameList || [],tmp=[];
                 for(let i = 0;i < arr.length;i++){
                     let obj = {}
                     if(type==8){
-                        obj['uniqueName'] = arr[i];
-                        obj['name'] = arr[i];
-                        obj['detailName'] = arr[i];
+                        obj['uniqueName'] = arr[i].name;
+                        obj['name'] = arr[i].name;
+                        obj['detailName'] = arr[i].name;
                         obj['flg'] = type;
                     }else{
                         obj['uniqueName'] = arr[i].name;

src/utils/config.js

@@ -17,8 +17,8 @@ const imageUrlPrefix = 'http://192.168.2.241:82';
 function geturl(){
     if(window.location.href.indexOf('localhost')>-1){
         return {
-            gourl:'http://localhost:8081/cdss.html',
-            // gourl:'http://192.168.2.241:5654/cdss.html',
+            gourl:'http://localhost:8082/cdss.html',
+            // gourl:'http://192.168.2.236:5654/cdss.html',
             imgurl:host.replace('6060','22')
         }
     }else if(window.location.href.indexOf('192.168.2.236')>-1){