Merge remote-tracking branch 'origin/dev/new1'

src/common/components/EditableSpan/index.less

@@ -5,7 +5,6 @@
   word-break: break-word;
   min-width: 10px;
   // line-height: 2;
-  height: 16px;
   line-height: 16px;
   vertical-align: middle;
   text-align: left;

src/containers/CheckBody.js

@@ -3,7 +3,8 @@ import CheckBody from '@components/CheckBody';
 import {getModule,getInitData} from '@store/async-actions/fetchModules.js';
 import {HIDE,RESET,SETDROPSHOW,ISREAD,SEARCH_DROP_LOCATION,MODI_LOADING} from '@store/types/homePage.js';
 import {SELECTSEARCHDATA} from "@store/types/checkBody";
-import {filterDataArr} from '@utils/tools.js';
+import {billing} from '@store/async-actions/pushMessage';
+import {didPushParamChange,filterDataArr} from '@utils/tools.js';
 
 function mapStateToProps(state){ 
   const {homePage,mainSuit,checkBody} = state;
@@ -46,10 +47,14 @@ function mapDispatchToProps(dispatch){
             span,
             isReplace:false,
             searchInEnd
-          })
+          });
           dispatch({
             type:ISREAD
-          })
+          });
+          //调右侧推送
+          if(didPushParamChange()) {
+            dispatch(billing());
+          }
         }
       });
     },

src/containers/CurrentIll.js

@@ -123,10 +123,19 @@ function mapDispatchToProps(dispatch) {
                       span,
                       isReplace:false,
                       conceptId
-                  })
+                  });
                   dispatch({
                     type:ISREAD
-                  })
+                  });
+                  /*
+                  * 选中后推送的入参可能变了，如输入心率搜索出心率不齐，
+                  * 500ms内心率不齐标签未选中，系统会推送入参心率，
+                  * 此时推送结果可能影响查体高亮结果且并不准确，
+                  * 所以选中后要重新推送
+                  * */
+                  if(didPushParamChange()){     //操作后内容有变化才推送
+                    dispatch(billing());
+                  }
                 }
             });
           //右侧推送

src/containers/OtherHistory.js

@@ -60,6 +60,10 @@ function mapDispatchToProps(dispatch,store){
           dispatch({
             type:ISREAD
           });
+          //调右侧推送
+          if(didPushParamChange()) {
+            dispatch(billing());
+          }
         }
       });
     },