Ver código fonte

回退原功能

zhouna 5 anos atrás
pai
commit
bd47a4316a

+ 2 - 2
src/components/DiagnosticItem/index.jsx

@@ -71,9 +71,9 @@ class DiagnosticItem extends Component{
         const {item, isChronicMag,mode,EMRScrollCont,type,addDiagnostic, clearInput, hideSearch} = this.props;
         item.type = diagType;
 
-         /*if(item.type == 2&&mode=='0') {      //文本模式不走慢病。6.0慢病取消
+         if(item.type == 2&&mode=='0') {      //文本模式不走慢病。6.0慢病取消
              isChronicMag(item);
-         }*/
+         }
          addDiagnostic&&addDiagnostic(item);
          clearInput&&clearInput();
          hideSearch&&hideSearch();

+ 3 - 3
src/components/MainSuit/index.jsx

@@ -232,14 +232,14 @@ class MainSuit extends Component{
         if(res.data.code==0){
           const result = res.data.data;
           // 慢病
-          /*if(result && result[0].chronicLabel==1){
+          if(result && result[0].chronicLabel==1){
             let flg = this.ifClear();
             if(!flg){
               saveChronic && saveChronic(result[0]);
             }
-          }else{*/
+          }else{
             getSymptomFeature && getSymptomFeature(result);
-          //}
+          }
         }
       })
     }

+ 4 - 9
src/store/async-actions/pushMessage.js

@@ -20,14 +20,9 @@ import store from '@store';
 import {SET_MR_INFO} from "../types/print";
 
 
-export const billing = () => {
+export const embedPush = () => {      //内嵌页面推送时推送
   return (dispatch, getState) =>{
     //const state = getState();
-    /*const {hospitalCode,sex,patientAge} = state.patInfo.message;
-    const checkBody = state.checkBody.data;
-    let diagMain = state.diagnosticList.diagnosticList.length>0&&state.diagnosticList.diagnosticList[0];
-    //mdata为主诉无标签直接输入时的内容,symptom参数传主诉+现病史文本
-    const mainData =  mdata?(emrData.current + mdata):(emrData.current + emrData.main);*/
     //console.log(state)
     const param = getEMRParams();
     /*const param={
@@ -119,7 +114,7 @@ export const billing = () => {
 };
 
 //获取右侧推送信息
-/*export const billing = (mdata,boxMark) => {
+export const billing = (mdata,boxMark) => {
  return (dispatch, getState) =>{
   const state = getState();
    const checkBody = state.checkBody.data;
@@ -211,7 +206,7 @@ export const billing = () => {
      console.log(e)
    });
  }
-};*/
+};
 
 //获取提示信息(静态信息) 
 export const getConceptDetail = (item,noTips,noDetails,noNotify) => {
@@ -250,7 +245,7 @@ export const getConceptDetail = (item,noTips,noDetails,noNotify) => {
                           flag:true
                         });
                     }
-                    //document.getElementById("tipsMsg").scrollIntoView(true)
+                    document.getElementById("tipsMsg").scrollIntoView(true)
                     //点击i同时打开详情弹窗 点击诊断名称不打开弹窗
                     if(!noDetails) {
                       dispatch({