Squashed commit of the following:

commit 090590e5c4c906b1f2822d582215aadf949c494f
Author: liucf <liucf@zjlantone.com>
Date:   Wed Jun 26 16:31:59 2019 +0800

    merge liucf branch

commit 179dd3ff46b54a119f52fef8b96ad51c1c04f961
Merge: 90a2ba45 14d736f4
Author: liucf <liucf@zjlantone.com>
Date:   Wed Jun 26 15:26:35 2019 +0800

    Merge branch 'optimize' of http://192.168.2.236:10080/zhouna/newICSS into optimize

commit 90a2ba45181e94813779b8c3068956269d631e45
Author: liucf <liucf@zjlantone.com>
Date:   Wed Jun 26 15:26:24 2019 +0800

    全科病历全选修改

commit 14d736f460dad19d17995e09a9d03f5e173ea045
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed Jun 26 14:56:14 2019 +0800

    查体高亮bug修改

src/components/Emergency/HisList/index.jsx

@@ -31,6 +31,10 @@ class HisList extends Component {
     this.setState({startTime:date});
     const {handleFilter} = this.props;
     const {endTime} = this.state;
+    this.setState({
+      all:false,
+      select:[]
+    })
     const obj = {
       startDate:date,
       endDate:endTime,
@@ -42,6 +46,10 @@ class HisList extends Component {
     this.setState({endTime:date});
     const {handleFilter} = this.props;
     const {startTime} = this.state;
+    this.setState({
+      all:false,
+      select:[]
+    })
     const obj = {
       startDate:startTime,
       endDate:date,
@@ -51,8 +59,12 @@ class HisList extends Component {
   }
   handleFilter(flag){
     const {handleFilter} = this.props;
+    const {hasSecond} = this.state;
+    if(flag == hasSecond){return}
     this.setState({
-      hasSecond:flag
+      hasSecond:flag,
+      all:false,
+      select:[]
     })
     const obj = {
       flag:flag

src/components/Emergency/index.jsx

@@ -115,8 +115,9 @@ class EmergencyHis extends Component{
 
   componentWillUnmount(){
     // 组件销毁时 清除病历数据，因为每点开一次都会去请求
-    const {clearHisRecord} = this.props;
+    const {clearHisRecord,handleChangeValue} = this.props;
     clearHisRecord&&clearHisRecord();
+    handleChangeValue(''); //清除搜索结果
   }
 
   render(){

src/components/Emergency/index.less

@@ -6,9 +6,10 @@
   width: 1060px;
   height: 700px;
   position: fixed;
-  top: 50%;
+  top:55px; //搜索结果展示-6-26
+  // top: 50%;
   left:50%;
-  margin-top: -350px;
+  // margin-top: -350px;
   margin-left: -530px;
   z-index: 2002;
   background: #fff;
@@ -115,6 +116,7 @@
     bottom: -105px;
     right: 115px;
     background:#fff;
+    overflow-y: auto;
     li{
       height: 34px;
       line-height: 34px;

src/components/PreviewBody/index.jsx

@@ -78,7 +78,6 @@ class PreviewBody extends Component {
     const { show, preInfo, dataJson, dataStr, baseObj, flg ,showAssessBtn,showHistoryCases} = this.props;
     const other_yjs = dataStr.other?filterOtherDataArr(JSON.parse(dataStr.other),dataJson.other):'';
     const noData = JSON.stringify(preInfo) == '{}';
-    const isChronic = (dataJson.diagChronicMagItem&&dataJson.diagChronicMagItem.name)||(dataJson.mainChronicDesease&&dataJson.mainChronicDesease.name);
     return <div className={style['content']} style={{ width: flg ? '700' : '820' }}>
       <div className={style['contents']} id="content" style={{ margin: "0 auto", maxWidth: "620px" }}>
         <Information baseObj={baseObj} preInfo={preInfo}></Information>

src/containers/eleType.js

@@ -20,7 +20,7 @@ import Multiple from '@containers/Multiple';
 //单选类型
 export function singleRadio(params){
   const data = params.item;
-  const {i,hideTag,boxMark,showArr,selecteds,boxTop,boxLeft,importLabel} = params;
+  const {i,hideTag,boxMark,showArr,selecteds,importLabel} = params;
   let isHigh=importLabel&&importLabel.includes(data.id);
   const showInx = boxMark+i+'0';    //单括号多标签的情况下需要识别同一个标签内多个下拉组件的显示状态
   switch (+data.controlType){

src/store/async-actions/fetchModules.js

@@ -6,11 +6,11 @@ import {getEMRParams,didPushParamChange,inspectAndAssist,fullfillText,checkFullf
 import {Notify} from '@commonComp';
 import {billing} from '@store/async-actions/pushMessage';
 import {SETOTHERHISTORY,ISREAD} from "../types/homePage";
-import {SAVE_TABLE_RESULT,SET_CHRONIC_PUSHS} from "../types/pushMessage";
 import config from "@config/index";
 import {CURRENT_CHRONIC} from '@store/types/currentIll';
 import {MODI_LOADING} from '@store/types/homePage.js';
 import {GET_ALL_HIS,FILTER_ALL_HIS} from '@store/types/emergencyHis.js';
+import {SET_IMPORT_CHECKBODY_LABEL} from "../types/checkBody";
 
 const api={
   // getSpreadModule:'/questionInfo/getByIds',
@@ -159,7 +159,14 @@ export function pregetCheckbodyData(flag){     //flag=true获取到数据后立
     };
     json(api.getBigPush,param).then((res)=>{
       if(+res.data.code === 0){
-        const data = res.data.data&&res.data.data.moduleVital;
+        const obj = res.data.data;
+        const data = obj&&obj.moduleVital;
+        const vitalIds = obj&&obj.vitalIds;
+        //查体高亮标签
+        dispatch({
+          type:SET_IMPORT_CHECKBODY_LABEL,
+          labels:vitalIds
+        });
         dispatch({
           type:PRESET,
           data:data