查体推送合入其他推送

src/store/async-actions/fetchModules.js

@@ -183,7 +183,7 @@ export function pregetCheckbodyData(flag){     //flag=true获取到数据后立
 export function getInitData(){
   return (dispatch,getStore)=>{
     const state =  getStore();
-    const preData = [...state.checkBody.preData];
+    const preData = [...state.checkBody.preData||[]];
     if(!preData||preData.length==0){
       dispatch(pregetCheckbodyData(true));
     }

src/store/async-actions/pushMessage.js

@@ -2,7 +2,7 @@ import { get, post, json } from "@utils/ajax";
 import { BILLING_ADVICE, SET_TIPS, SET_TIPS_DETAILS ,SET_CHRONIC_TABLELIST,SET_SCALE_INFO,SET_CHRONIC_PUSHS,SHOW_TABLE_LIST} from '../types/pushMessage';
 import { SET_CLICK_DIAG } from '../types/diagnosticList';
 import {storageLocal,getEMRParams} from '@utils/tools';
-import {SET_IMPORT_CHECKBODY_LABEL} from "../types/checkBody";
+import {SET_IMPORT_CHECKBODY_LABEL,PRESET} from "../types/checkBody";
 import { Notify} from '@commonComp';
 import {pregetCheckbodyData} from '@store/async-actions/fetchModules';
 
@@ -20,10 +20,12 @@ export const billing = (mdata,boxMark) => {
   if(+state.typeConfig.typeConfig===1){
     url=api.textPush;
   }
+   const checkBody = state.checkBody.data;
+   let getCheck = boxMark==2&&!(checkBody&&checkBody.length>0&&!checkBody[0].full);
   const emrData = getEMRParams();
   const params = {
     age: emrData.age,
-    featureType: "5,6,7",
+    featureType: getCheck?"4,5,6,7":"5,6,7",
     // featureType: "22",
     diag: emrData.dis,
     lis: emrData.lis,
@@ -35,7 +37,7 @@ export const billing = (mdata,boxMark) => {
   };
   storageLocal.set('emrParam',params);      //推送数据存储，用作推送前对比是否有变，有变才推送
     json(url, params).then((data) => {
-        let {dis, lab, pacs,markedVitalIds} = data.data.data||{};
+        let {dis, lab, pacs,markedVitalIds,vital} = data.data.data||{};
         lab = lab||[];
         pacs = pacs||[];
         // console.log('推送数据', data.data.data);
@@ -66,6 +68,10 @@ export const billing = (mdata,boxMark) => {
             lab: lab||[],
             pacs: pacs||[],
         });
+        dispatch({
+          type:PRESET,
+          data:vital
+        });
         //查体高亮标签
         dispatch({
           type:SET_IMPORT_CHECKBODY_LABEL,
@@ -89,10 +95,10 @@ export const billing = (mdata,boxMark) => {
    });
 
    //调查体,现病史触发推送且查体无数据时获取查体模板
-   const checkBody = state.checkBody.data;
+   /*const checkBody = state.checkBody.data;
    if(boxMark==2&&!(checkBody&&checkBody.length>0&&!checkBody[0].full)){
      dispatch(pregetCheckbodyData());
-   }
+   }*/
  }
 };