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

src/store/async-actions/fetchModules.js

@@ -158,7 +158,7 @@ export function pregetCheckbodyData(flag){     //flag=true获取到数据后立
     };
     json(api.getBigPush,param).then((res)=>{
       if(+res.data.code === 0){
-        const data = res.data.data&&res.data.data.vital;
+        const data = res.data.data&&res.data.data.moduleVital;
         dispatch({
           type:PRESET,
           data:data

src/store/async-actions/pushMessage.js

@@ -41,7 +41,7 @@ export const billing = (mdata,boxMark) => {
    delete savePm.featureType;
   storageLocal.set('emrParam',savePm);      //推送数据存储，用作推送前对比是否有变，有变才推送
     json(url, params).then((data) => {
-        let {dis, lab, pacs,markedVitalIds,vital} = data.data.data||{};
+        let {dis, lab, pacs,markedVitalIds,moduleVital} = data.data.data||{};
         lab = lab||[];
         pacs = pacs||[];
         // console.log('推送数据', data.data.data);
@@ -74,7 +74,7 @@ export const billing = (mdata,boxMark) => {
         });
         dispatch({
           type:PRESET,
-          data:vital
+          data:moduleVital
         });
         //查体高亮标签
         dispatch({