常用标签获取，页面检索参数修改

src/components/AddAssistCheck/index.jsx

@@ -107,13 +107,13 @@ class AddAssistCheck extends React.Component {
         list && list.map((item, idx) => {
           return <li key={item.id}
             className={styles.searchLi}
-            title={item.name}
+            title={(item.name == item.retrievalName || !item.retrievalName) ? null : '(' + item.retrievalName + ')'}
             onClick={() => {
               handleSign(item.questionId, idx,'search');
               this.setState({ show: false })
             }}
           >
-            {item.name}{item.name == item.retrievalName ? null : '(' + item.retrievalName + ')'}
+            {item.name}{(item.name == item.retrievalName || !item.retrievalName) ? null : '(' + item.retrievalName + ')'}
           </li>
         })
       }
@@ -144,7 +144,7 @@ class AddAssistCheck extends React.Component {
     return <ul className={styles.labelWrap} id="datePick">
       {
         assistLabel.map((item, idx) => {
-          return (<li key={item.questionId} className={styles.assistLists}>
+          return (<li key={item.questionId} className={`${styles.assistLists} ${styles.clearfix}`}>
             <span className={styles.assistName} style={{ width: winWidth < 1200 ? '120px' : 'auto' }}>
               <span className={styles.tagSpan}>
                 {item.name}：

src/components/AddAssistCheck/index.less

@@ -140,4 +140,14 @@
     display: block;
     cursor: pointer;
   }
+}
+.clearfix {
+  zoom: 1;
+}
+.clearfix:after {
+  content: "";
+  display: block;
+  height: 0;
+  clear: both;
+  visibility: hidden;
 }

src/components/AddInspect/index.jsx

@@ -253,13 +253,13 @@ class Inspect extends React.Component {
         list && list.map((item, idx) => {
           return <li key={idx}
             className={styles.searchLi}
-            title={item.name == item.retrievalName ? item.name : item.name + '(' + item.retrievalName + ')'}
+            title={(item.name == item.retrievalName || !item.retrievalName) ? item.name : item.name + '(' + item.retrievalName + ')'}
             onClick={() => {
               handleSign(item.questionId, idx,'search');
               this.setState({ show: false })
             }}
           >
-            {item.name}{item.name == item.retrievalName ? null : '(' + item.retrievalName + ')'}
+            {item.name}{(item.name == item.retrievalName || !item.retrievalName) ? null : '(' + item.retrievalName + ')'}
           </li>
         })
       }

src/store/async-actions/homePage.js

@@ -132,7 +132,7 @@ export const getCommonList = (val)=>{
     const patientInfo = state.patInfo.message;
     const params = {
       "age":patientInfo.patientAge ,   //年龄
-      "deptId": patientInfo.hospitalDeptId,       //科室id
+      "deptName": patientInfo.hospitalDeptName, //科室名称
       "sexType": patientInfo.sex,        //性别
       "type": val
     }

src/utils/config.js

@@ -1,7 +1,7 @@
 // const host='http://192.168.3.1:5050';//赵
 // const host='http://192.168.3.100:5050';//王峰
-const host='http://192.168.2.241:5050';//后端接口访问地址
-// const host='http://192.168.2.236:5050';//后端接口访问地址
+// const host='http://192.168.2.241:5050';//后端接口访问地址
+const host='http://192.168.2.236:5050';//后端接口访问地址
 // const host='http://192.168.3.11:5050';//王宇
 //const host='http://192.168.2.164:8080';
 // const host='http://192.168.3.117:5050'; //周铁刚

src/utils/tools.js

@@ -635,14 +635,11 @@ function windowRemoveEventHandler(type,func,dom){
       win.detachEvent('on'+type,func);
     }
 }
-
-
 //禁止回车事件
 function handleEnter(event){
     event = event?event:window.event;
     if(event.keyCode==13){return false;}
 }
-
 //获取病例输入的内容
 function getEMRParams(){
   const state = store.getState();
@@ -788,7 +785,6 @@ function dragBox(domWrap,domDrag,dragMove){
   // $(move).mousemove(handleMove)
   windowEventHandler('mousemove',handleMove,document)
   windowEventHandler('mouseup',()=>{
-    console.log(123)
     // if(isMove){ //有move就设置位置没有移动就不处理
     //   console.log(dragX)
     //   wrap.style.left = dragX + 'px'
@@ -799,7 +795,6 @@ function dragBox(domWrap,domDrag,dragMove){
   },dragMove)
 
   function handleMove(event){      //移动的
-    console.log(99)
     let dragDes = document.getElementById('treatDescBox');//展開区域
     let page = getPageCoordinate(event,'0');
     let maxDragX = 0,dragDesWidth = 0;