急诊添加诊断判断入口

src/store/async-actions/pushMessage.js

@@ -21,6 +21,7 @@ export const billing = (mdata,boxMark) => {
   const state = getState();
   let url = api.push;
    const checkBody = state.checkBody.data;
+   let diagMain = state.diagnosticList.diagnosticList.length>0&&state.diagnosticList.diagnosticList[0]
    let getCheck = boxMark==2&&!(checkBody&&checkBody.length>0&&!checkBody[0].full);
   const emrData = getEMRParams();
   const params = {
@@ -56,7 +57,16 @@ export const billing = (mdata,boxMark) => {
             vigilant = dis&&dis['警惕'];
             determine = dis&&dis['确诊']; //确诊
             likely = dis&&dis['鉴别诊断'];
-        if(dis&&dis['急诊']&&dis['急诊'].length>0){
+        //急诊显示规则，主诊断有急诊优先显示，没有则显示推送的，推送也没有就不显示
+        if(dis&&dis['页面急诊']&&(dis['页面急诊'].length>0)&&(diagMain&&dis['页面急诊'][0].conceptId == diagMain.conceptId)){
+          setPushEmergency=dis['页面急诊'][0]
+          let name = dis['页面急诊'][0].name || ''
+          for(let i = 0;i < dataLis.length;i++){
+            if(name == dataLis[i].emergencyillname){
+              setPushEmergencyIdx=i
+            }
+          }
+        }else if(dis&&dis['急诊']&&dis['急诊'].length>0){
           setPushEmergency=dis['急诊'][0]
           let name = dis['急诊'][0].name || ''
           for(let i = 0;i < dataLis.length;i++){

src/utils/tools.js

@@ -284,7 +284,7 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
           likely:[],
           lab: [],
           pacs:[],
-          setPushEmergency:[],
+          setPushEmergency:{},
           setPushEmergencyIdx:''
         });
         storageLocal.remove('emrParam');