merge liucf branch

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>