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

src/components/EmergencyProcedure/index.jsx

@@ -40,8 +40,8 @@ class EmergencyProcedure extends React.Component {
     const domNode = document.getElementById('root');
     return ReactDom.createPortal(<div className={styles.emergencyProdureWrap}>
       <div id="emergencyWrap" className={styles.emergencyWrap}>
-        <span id="emergency" className={`${styles.emergency}`} onClick={()=>this.slideToggle(0)}>急</span>
         <span id="emergencys" onClick={()=>this.slideToggle(1)} className={styles.emergency}>急</span>
+        <span id="emergency" className={`${styles.emergency}`} onClick={()=>this.slideToggle(0)}>急</span>
         <div id="emergencyName" className={styles.emergencyName} onClick={()=>this.handleShow(true)}>{data.emergencyname}</div>
         <i onClick={()=>this.slideToggle(0)} id="emergencyPic"><img src={right} alt=""/></i>
       </div>

src/components/MedicalInfo/index.jsx

@@ -21,15 +21,13 @@ class MedicalInfo extends Component {
     }
     getSearchList() {
         const { getAllConceptDetail,searchResult } = this.props;
-        let showDtl = false;
         return searchResult && searchResult.map((item) => {
-          showDtl = item.type=='51'
           return <li key={item.conceptId}
                      title='点击查看详情'
-                     onClick={() => getAllConceptDetail({name: item.name, type: item.type, uname: item.uniqueName})}>
+                     onClick={() => getAllConceptDetail({name: item.name, type: item.type, uname: item.uniqueName,position:0})}>
             <span>{item.name}</span>
             <i>( {item.libTypeName} )</i>
-            {item.retrievalName&&!showDtl?<p>• {item.retrievalName}</p>:''}
+            {item.retrievalName?<p>• {item.retrievalName}</p>:''}
             {/*<button>查看</button>*/}
           </li>;
             });