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

src/components/Emergency/index.less

@@ -6,7 +6,7 @@
   // width: 1060px;
   width: 1024px;
   // height: 700px;
-  height: 84%;
+  height: 80%;
   position: fixed;
   top:20px; //搜索结果展示-6-26
   left:50%;

src/components/MedicalInfo/index.jsx

@@ -27,7 +27,7 @@ class MedicalInfo extends Component {
           return <li key={item.conceptId}
                      title='点击查看详情'
                      onClick={() => getAllConceptDetail({name: item.name, type: item.type, uname: item.uniqueName})}>
-            <span>{item.name} {showDtl?"("+item.retrievalName+")":""}</span>
+            <span>{item.name}</span>
             <i>( {item.libTypeName} )</i>
             {item.retrievalName&&!showDtl?<p>• {item.retrievalName}</p>:''}
             {/*<button>查看</button>*/}