Merge branch 'optimize-ll' into optimize

src/modules/HomePage/index.jsx

@@ -9,15 +9,16 @@ import {HIDEDROP,SETMINSCREEN,SETSYSTEMCONFIG} from '@store/types/homePage.js';
 import style from './index.less';
 import {getInitModules,getChronic,getSystemConfig} from '@store/async-actions/homePage.js';
 import { getUrlArgObject,parseNameVal } from "@utils/tools";
+import dataLis from '@components/EmergencyProcedure/emergency';
 import $ from 'jquery';
-import data from '@components/EmergencyProcedure/emergency';
 import loading from '@common/images/loading.gif';
 class HomePage extends Component {
     constructor() {
         super();
         this.state={
             timer:null,
-            dataEmergency:{}
+            dataEmergency:{},
+            idx:''
         }
         this.setDataIdx = this.setDataIdx.bind(this)
     }
@@ -53,13 +54,13 @@ class HomePage extends Component {
       })
     }
     render() {
-        const {flag,setPushEmergencyData,sysConfig} = this.props;
+        const {flag,setPushEmergencyIdx,sysConfig} = this.props;
         return <div className={style['home-page']} onClick={this.props.hideAllDrop}>
             <BannerContainer />
             {/* <InfoTitle /> */}
             <BodyContainer></BodyContainer>
             {
-              (JSON.stringify(setPushEmergencyData) != '{}')&&(sysConfig.emergency_show==1)?<EmergencyProcedure data={setPushEmergencyData} idx={setPushEmergencyData.idx} setDataIdx={this.setDataIdx}></EmergencyProcedure>:null
+              (setPushEmergencyIdx+'')&&(sysConfig.emergency_show==1)?<EmergencyProcedure data={dataLis[this.state.idx]||dataLis[setPushEmergencyIdx]} idx={this.state.idx||setPushEmergencyIdx} setDataIdx={this.setDataIdx}></EmergencyProcedure>:null
             }
             <div className={style['mask']} style={{display:flag?"block":"none"}}>
                 <img src={loading} className={style['load']}/>
@@ -71,7 +72,7 @@ class HomePage extends Component {
 const mapStateToProps = function (state) {
   return {
     flag:state.homePage.loadingFlag,
-    setPushEmergencyData: state.pushMessage.setPushEmergencyData || {},  
+    setPushEmergencyIdx: state.pushMessage.setPushEmergencyIdx || '',  
     sysConfig:state.homePage.sysConfig
   }
 };

src/store/actions/pushMessage.js

@@ -32,7 +32,7 @@ export const setAdvice=(state,action)=>{
   res.assay = action.lab;
 	res.check = action.pacs;
   res.setPushEmergency = action.setPushEmergency;
-  res.setPushEmergencyData=action.setPushEmergencyData
+  res.setPushEmergencyIdx=action.setPushEmergencyIdx
   return res;
 };
 

src/store/async-actions/pushMessage.js

@@ -48,7 +48,7 @@ export const billing = (mdata,boxMark) => {
             possible = [],  //可能诊断
             determine=[], //确诊
             setPushEmergency={}, //急诊
-            setPushEmergencyData={},//急诊对应本地数据
+            setPushEmergencyIdx='',//急诊对应本地数据
             likely=[];//鉴别诊断
             doubt = dis&&dis['疑似诊断'],
             possible = dis&&dis['可能诊断'];
@@ -60,7 +60,7 @@ export const billing = (mdata,boxMark) => {
           let name = dis['急诊'][0].name || ''
           for(let i = 0;i < dataLis.length;i++){
             if(name == dataLis[i].emergencyillname){
-              setPushEmergencyData=dataLis[i]
+              setPushEmergencyIdx=i
             }
           }
         }
@@ -89,7 +89,7 @@ export const billing = (mdata,boxMark) => {
             lab: lab||[],
             pacs: pacs||[],
             setPushEmergency: setPushEmergency||[],
-            setPushEmergencyData:setPushEmergencyData
+            setPushEmergencyIdx:setPushEmergencyIdx
         });
         dispatch({
           type:PRESET,

src/store/reducers/pushMessage.js

@@ -23,7 +23,8 @@ const initState = {
   formulaResult:{},
   scaleInfo:{},
   showHide:{},
-  setPushEmergency:{}
+  setPushEmergency:{},
+  setPushEmergencyIdx:''
 };
 export default function(state = initState, action) {
   let res = Object.assign({},state);