定位中医tab8104

src/components/Diagnosis/index.jsx

@@ -63,7 +63,7 @@ class Diagnosis extends Component {
         if (this.props.showSym) {
             this.props.setHighter(48)
         } else {
-            this.props.getBilling({mode: 10});
+            this.props.getBilling({isTcm:true});
             setPosition(e, "#searchOption", this.props.setHighter)
         }
     }
@@ -74,7 +74,7 @@ class Diagnosis extends Component {
         if (this.props.show) {
             this.props.setHighter(48)
         } else {
-            this.props.getBilling({mode: 10});
+            this.props.getBilling({});
             setPosition(e, "#searchOption", this.props.setHighter)
         }
     }
@@ -85,7 +85,7 @@ class Diagnosis extends Component {
         if (this.props.showTcm) {
             this.props.setHighter(48)
         } else {
-            this.props.getBilling({mode: 10});
+            this.props.getBilling({isTcm: true});
             setPosition(e, "#searchOption", this.props.setHighter)
         }
     }

src/components/DiagnosticItem/index.jsx

@@ -93,7 +93,7 @@ class DiagnosticItem extends Component{
                EMRScrollCont.scrollYTo(scrollTop);
             })
          }
-        showSym&&store.dispatch(embedPush({mode:10,action: "diag",}))
+        showSym&&store.dispatch(embedPush({action: "diag",isTcm:true}))
 
     }
     handleMouseEnterDrug() {

src/components/PushData/index.jsx

@@ -37,9 +37,9 @@ class PushData extends Component{
 
     render(){
         const {hashNum } = this.state
-        const {mrId,planCode,showPushData,togglePushData ,windowWidth,windowHeight,hospitalId} = this.props
+        const {mrId,isTcm,planCode,showPushData,togglePushData ,windowWidth,windowHeight,hospitalId} = this.props
         const pushBoxPos = windowWidth>1200?(windowWidth-1200)/2:0;
-        const url =`${pushPage2}?mrId=${mrId.indexOf("reStart") > - 1?"":mrId}&planCode=${planCode}&hospitalId=${hospitalId}${mrId.indexOf("reStart") > - 1 ? '&reStart='+Math.random():""}`;
+        const url =`${pushPage2}?mrId=${mrId.indexOf("reStart") > - 1?"":mrId}&isTcm=${isTcm}&planCode=${planCode}&hospitalId=${hospitalId}${mrId.indexOf("reStart") > - 1 ? '&reStart='+Math.random():""}`;
         return <div >
             {!showPushData&&<div className={style['slideButton']} style={{right:pushBoxPos+'px'}} onClick={this.showPushData}>
                 朗通智能提醒 

src/containers/DiagnosticList.js

@@ -86,7 +86,7 @@ function mapDispatchToProps(dispatch) {
                 type: GET_DIAGNOSTIC_STR,
                 isTcm
             });
-            dispatch(embedPush({mode:10,action: "diag"}))
+            dispatch(embedPush({action: "diag",isTcm:true}))
         },
         delReact: (item) => {
             dispatch({

src/containers/PushDataContainer.js

@@ -10,6 +10,7 @@ function mapStateToProps(state){
     return {
         showPushData:showPushData,
         mrId:mrInfo.mrId,
+        isTcm:mrInfo.isTcm,
         planCode:mrInfo.mode,
         windowHeight:state.homePage.windowHeight,
         windowWidth:state.homePage.windowWidth,

src/store/actions/print.js

@@ -42,12 +42,14 @@ export const clearSearchParam=(state,action)=>{
   return res;
 };
 // 推送保存mrid信息
-export const setMrId=(state,action)=>{
+export const setMrId=(state,action)=>{console.log(action)
   const res=Object.assign({},state);
   const {update} = res.mrInfo;
   res.mrInfo.update = +update+1;
   res.mrInfo.mrId = action.data.data;
   res.mrInfo.mode = action.data.action;
+  res.mrInfo.isTcm = action.isTcm;
+
   return res;
 };
 

src/store/async-actions/pushMessage.js

@@ -46,7 +46,6 @@ export const embedPush = (obj) => {      //内嵌页面推送时推送
     // console.log(obj,'推送的obj');
     const param = getEMRParams();   // 获取推送参数
     // console.log(param,'=param');
-    param.mode = obj ? obj.mode : -1;    // 模式  >100 输入中    < 100  获取
       param.dept = [{name:param.deptName,uniqueName:param.deptName}]
       param.deptName = undefined;
     json(api.setMrInfo, param, true).then((res) => {
@@ -59,6 +58,7 @@ export const embedPush = (obj) => {      //内嵌页面推送时推送
         dispatch({
           type: SET_MR_INFO,
           data: params,
+          isTcm:obj.isTcm   //是否为中医触发
         });
       }
     });