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

src/containers/eleType.js

@@ -87,6 +87,7 @@ export function singleRadio(params){
                          boxMark={boxMark}
                          id={data.id}
                          allClick={true}
+                         isImports={isHigh}
                          show={showArr&&showArr[showInx]}
                          ikey={showInx}
                          value={data.value}

src/store/async-actions/pushMessage.js

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