Merge remote-tracking branch 'origin/version6.0' into version6.0

# Conflicts:
#	src/utils/config.js

src/components/EmergencyProcedure/index.jsx

@@ -29,24 +29,31 @@ class EmergencyProcedure extends React.Component {
     }
   }
   handleShow(type){
+    const newinConf = {
+      width: '600',   //窗口的文档显示区的宽度。以像素计。
+      height: '826',  //窗口文档显示区的高度。以像素计。
+      left: '0',  //窗口的 x 坐标。以像素计。
+      top: '0',    //窗口的 y 坐标。以像素计。
+      openMode: "_blank"  //每次都是新窗口打开为_blank,打开同一窗口填写任意字符串
+    }
+    
+    const newWindowLocation = `width=${newinConf.width}, height=${newinConf.height}, left=${newinConf.left}, top=${newinConf.top} scrollbars=yes`
+    window.open('http://localhost:8082/emergency.html?disName='+'气胸', newinConf.openMode, newWindowLocation)
     this.setState({
       show:type
     })
     !type&&this.slideToggle(0)
   }
   render(){
-    const {data,setDataIdx,idx,windowHeight,hideAllDrop} = this.props;
+    const {emergencyname} = this.props;
     const domNode = document.getElementById('root');
-    return ReactDom.createPortal(<div className={styles.emergencyProdureWrap} onClick={hideAllDrop}>
+    return ReactDom.createPortal(<div className={styles.emergencyProdureWrap}>
       <div id="emergencyWrap" className={styles.emergencyWrap}>
         <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>
+        <div id="emergencyName" className={styles.emergencyName} onClick={()=>this.handleShow(true)}>{emergencyname}救治流程</div>
         <i onClick={()=>this.slideToggle(0)} id="emergencyPic"><img src={right} alt=""/></i>
       </div>
-      {
-        <EmergencyModal windowHeight={windowHeight} idx={idx} handleShow={()=>this.handleShow()} setDataIdx={setDataIdx} show={this.state.show} data={data}></EmergencyModal>
-      }
     </div>,domNode)
   }
 }

src/components/PushContainer/index.jsx

@@ -7,6 +7,7 @@ import { connect } from "react-redux";
 import store from '@store';
 import { billing } from '@store/async-actions/pushMessage';
 import TemplateContainer from '@components/TemplateContainer';
+import EmergencyProcedure from '@components/EmergencyProcedure';
 import TemplateItems from '@components/TemplateItems';
 import { pushAllDataList, getWindowInnerHeight, didPushParamChange,windowEventHandler } from '@utils/tools';
 import CopyRightContainer from "@containers/CopyRightContainer";
@@ -715,6 +716,7 @@ class PushContainer extends Component {
         }
       </ConfirmModal>
       {+activeId!==0?<CopyRightContainer />:''}
+      {/* <EmergencyProcedure emergencyname={'气胸'} ></EmergencyProcedure> */}
     </div>
   }
 }

src/store/async-actions/pushMessage.js

@@ -69,6 +69,7 @@ export const billing = (mdata,boxMark) => {
             determine = dis&&dis['确诊']; //确诊
             likely = dis&&dis['鉴别诊断'];
         //急诊显示规则，主诊断有急诊优先显示，没有则显示推送的，推送也没有就不显示
+        console.log(dis)
         if(dis&&dis['页面急诊']&&(dis['页面急诊'].length>0)&&(diagMain&&dis['页面急诊'][0].conceptId == diagMain.conceptId)){
           setPushEmergency=dis['页面急诊'][0]
           let name = dis['页面急诊'][0].name || ''