修改触发病历分析触发条件

src/common/components/ItemBox/index.jsx

@@ -40,7 +40,7 @@ class ItemBox extends Component {
     const state = store.getState()
     const moduleName = state.homePage.moduleName
     handleClick && handleClick(e);//为了获取鼠标位置，显示搜索结果框；
-    if(moduleName != title) {
+    if((title=='化验'|| title=='辅检'|| title=='诊断' || title=='医嘱')&& moduleName != title) {
       store.dispatch({
         type: SET_CURRENT_MODULE,
         moduleName:title

src/components/DiagnosticItem/index.jsx

@@ -2,10 +2,14 @@ import React, { Component } from 'react';
 import style from './index.less';
 import {ConfirmModal} from '@commonComp';
 import Notify from '@commonComp/Notify';
+import store from '@store';
 import infoShow from '@common/images/info-show.png';
 import infoMove from '@common/images/info-move.png';
 import {getChronic} from '@store/async-actions/homePage.js';
 import {storageLocal} from '@utils/tools';
+import {
+    getMRAnalyse
+  } from '@store/async-actions/pushMessage';
 
 class DiagnosticItem extends Component{
     constructor(props){
@@ -81,6 +85,8 @@ class DiagnosticItem extends Component{
                EMRScrollCont.scrollYTo(scrollTop);
             })
          }
+         store.dispatch(getMRAnalyse())
+
     }
     handleMouseEnterDrug() {
         this.setState({

src/components/PushItems/index.jsx

@@ -20,6 +20,7 @@ import RecommendInspect from './RecommendInspect';
 import TipsMsg from './TipsMsg'
 import dataLis from '@components/EmergencyProcedure/emergency';
 import EmergencyProcedure from '@components/EmergencyProcedure';
+import {getMRAnalyse} from '@store/async-actions/pushMessage';
 
 class PushItems extends Component {
   constructor(props) {
@@ -62,6 +63,9 @@ class PushItems extends Component {
     const checkedAssay = assay.filter(item => item.checked);
     const checkedCheck = check.filter(item => item.checked);
     this.props.billing(checkedAssay, checkedCheck);
+    if(checkedAssay.length > 0 ||checkedCheck.length > 0) {
+      store.dispatch(getMRAnalyse())
+    }
     let obj = {   //添加化验
       details: [],
       name: '',

src/containers/EditableSpan.js

@@ -5,10 +5,11 @@ import {SET_SEARCH,MAIN_FOCUS_INDEX,CLEAR_SEARCH,SETMAINTEXT,DEL_MAIN,REMOVE_MAI
 import {SETOTHERTEXT,SETOTHERSEARCHDATA,OTHER_FOCUS_INDEX,OTHERHIS_CLEAR,DEL_OTHERHIS,REMOVE_OTHER_ID,DEL_OTHERHIS_LABLE} from '@types/otherHistory';
 import {SET_CURRENT_SEARCH,CURRENT_CLEAR,SETCURRENTTEXT,CURRENT_FOCUS_INDEX,DEL_CURRENT,REMOVE_CURR_ID,DEL_CURRENT_LABLE} from '@types/currentIll';
 import {getSearch} from '@store/async-actions/fetchModules';
-import {billing} from '@store/async-actions/pushMessage';
+import {billing,getMRAnalyse} from '@store/async-actions/pushMessage';
 import {didPushParamChange,storageLocal} from '@utils/tools';
-import {SETTEXTFOCUS,RESET,SETDROPSHOW,ISREAD,SET_SELECTED_AREA} from '@types/homePage';
+import {SETTEXTFOCUS,RESET,SETDROPSHOW,ISREAD,SET_SELECTED_AREA,SET_CURRENT_MODULE} from '@types/homePage';
 import config from '@config/index';
+import store from '@store';
 
 function mapStateToProps(state){//console.log(state)
   return {
@@ -91,7 +92,8 @@ function otherHisSearch(obj) {
 function mapDispatchToProps(dispatch,state) {
   return {
     setFocusIndex(obj){//将选中值插入相应位置
-
+      const storeState = store.getState()
+      const {moduleName, moduleObj} = storeState.homePage
       const {i,boxMark} = obj;
       switch (+obj.boxMark){
         case 1:
@@ -138,6 +140,13 @@ function mapDispatchToProps(dispatch,state) {
       dispatch({
         type: RESET
       });
+      if(moduleName != moduleObj[boxMark]) {
+        dispatch({
+          type: SET_CURRENT_MODULE,
+          moduleName: moduleObj[boxMark]
+        });
+        dispatch(getMRAnalyse());
+      }
     },
     handleChange(obj){//存data值
       switch (+obj.boxMark){

src/containers/MainSuit.js

@@ -2,17 +2,18 @@ import React from 'react';
 import { connect } from 'react-redux';
 import MainSuit from '@components/MainSuit';
 import {CLEAR_COMSYMPTOMS,SHOW_TAIL,INSERT_MAIN,CLEAR_SEARCH,SET_SEARCH,SAVE_FREE,SET_DATA,INSERT_SEARCH,SETTEXTMODEVALUE,SET_FEATURE,SAVE_CHRONIC,SHOW_HISTORY_BOX,HIDE_HISTORY_BOX} from '@store/types/mainSuit';
-import {RESET,CLICKCOUNT,ISREAD,MODI_LOADING,SETDROPSHOW} from '@store/types/homePage.js';
+import {RESET,CLICKCOUNT,ISREAD,MODI_LOADING,SETDROPSHOW,SET_CURRENT_MODULE} from '@store/types/homePage.js';
 import {getCommSymptoms,getCommSymptomPush} from '@store/async-actions/mainSuit.js'
 import {CLEAR_DIAGNOSE} from '@store/types/diagnosticList';
 import {getSearch,getFeature,autoFillModules} from '@store/async-actions/fetchModules';
-import {billing} from '@store/async-actions/pushMessage';
+import {billing,getMRAnalyse} from '@store/async-actions/pushMessage';
 import {didPushParamChange,filterDataArr,inspectAndAssist} from '@utils/tools.js';
 import config from '@config/index.js';
 import {Notify} from '@commonComp';
 import {getInitModules} from '@store/async-actions/homePage.js';
 import {SHOW_REFER_RECORD} from '@store/types/diagnosticList';
 import { SET_READ_MODE } from "@store/types/typeConfig";
+import store from '@store';
 
 function mapStateToProps(state) {
   const {mainSuit,homePage,diagnosticList,typeConfig} = state;
@@ -45,6 +46,8 @@ function mapStateToProps(state) {
 }
 
 function mapDispatchToProps(dispatch) {
+  const storeState = store.getState()
+  const {moduleName, moduleObj} = storeState.homePage
     return {
         reTotalHide:()=>{//重置隐藏
           dispatch({
@@ -222,6 +225,13 @@ function mapDispatchToProps(dispatch) {
           type:SETDROPSHOW,
           data:obj
         });
+        if(moduleName != moduleObj[obj.ikey]) {
+          dispatch({
+            type: SET_CURRENT_MODULE,
+            moduleName: moduleObj[obj.ikey]
+          });
+          dispatch(getMRAnalyse());
+        }
         dispatch({
           type: RESET
         });

src/containers/Multiple.js

@@ -1,15 +1,16 @@
 // import React from "react";
 import {connect} from "react-redux";
 import Multiple from "@components/Multiple";
-import {RESET,SETDROPSHOW,HIDEDROP,CLICKCOUNT,SET_SELECTED_AREA} from '@store/types/homePage.js';
+import {RESET,SETDROPSHOW,HIDEDROP,CLICKCOUNT,SET_SELECTED_AREA,SET_CURRENT_MODULE} from '@store/types/homePage.js';
 import {CURRENT_MUL,CURRENT_TEXT_LABEL} from '@types/currentIll';
 import {MAINSUIT_MUL,CHANGE_LABELVAL} from '@types/mainSuit';
 import {OTHERHIS_MUL,CHANGEOTHERTEXTLABEL} from '@types/otherHistory';
 import {CHECKBODY_MUL,CHANGECHECKTEXTLABEL} from '@types/checkBody';
 import {filterDataArr,getLabelIndex,didPushParamChange} from '@utils/tools.js';
 import config from '@config/index.js';
-import {billing} from '@store/async-actions/pushMessage';
+import {billing, getMRAnalyse} from '@store/async-actions/pushMessage';
 import {Notify} from '@commonComp';
+import store from '@store';
 
 function handleMainSuit(dispatch,params){
   const {ikey,seleData,seleId,value,mainSaveText} = params;
@@ -141,8 +142,12 @@ function mapStateToProps(state){
 }
 
 function mapDispatchToProps(dispatch){
+
   return{
+   
     handleShow(obj){
+      const storeState = store.getState()
+      const {moduleName, moduleObj} = storeState.homePage
       dispatch({
         type:CLICKCOUNT,
         data:obj,
@@ -153,6 +158,13 @@ function mapDispatchToProps(dispatch){
         type:SETDROPSHOW,
         data:obj
       });
+      if(moduleName != moduleObj[obj.ikey[0]]) {
+        dispatch({
+          type: SET_CURRENT_MODULE,
+          moduleName: moduleObj[obj.ikey[0]]
+        });
+        dispatch(getMRAnalyse());
+      }
       dispatch({
         type: RESET
       });

src/containers/NumberDrop.js

@@ -3,13 +3,14 @@ import {connect} from 'react-redux';
 import NumberDrop from "@components/NumberDrop";
 import {SETNUMBER,CHANGEOTHERTEXTLABEL} from '@types/otherHistory';
 import {SETNUMBER4} from '@types/checkBody';
-import {SETDROPSHOW,CLICKCOUNT,HIDE,RESET,HIDEDROP,ISREAD,SET_SELECTED_AREA} from '@types/homePage';
+import {SETDROPSHOW,CLICKCOUNT,HIDE,RESET,HIDEDROP,ISREAD,SET_SELECTED_AREA,SET_CURRENT_MODULE} from '@types/homePage';
 import {NUMBER_SELECT} from '@store/types/mainSuit';
 import {CURRENT_NUMBER} from '@store/types/currentIll';
-import {billing} from '@store/async-actions/pushMessage';
+import {billing,getMRAnalyse} from '@store/async-actions/pushMessage';
 import {Notify} from '@commonComp';
 import {filterArr,didPushParamChange,filterDataArr} from '@utils/tools';
 import config from '@config/index';
+import storeGlobal from '@store';
 
 function mapStateToProps(state){
   return {
@@ -89,6 +90,8 @@ function mapDispatchToProps(dispatch,store){
       })
     },
     handleShow(params) {
+      const storeState = storeGlobal.getState()
+      const {moduleName, moduleObj} = storeState.homePage
       dispatch({
         type:CLICKCOUNT,
         data:params,
@@ -99,6 +102,13 @@ function mapDispatchToProps(dispatch,store){
         type:SETDROPSHOW,
         data:params
       });
+      if(moduleName != moduleObj[params.ikey[0]]) {
+        dispatch({
+          type: SET_CURRENT_MODULE,
+          moduleName: moduleObj[params.ikey[0]]
+        });
+        dispatch(getMRAnalyse());
+      }
       /*dispatch({
         type: RESET
       });*/

src/containers/NumberUnitDrop.js

@@ -3,13 +3,14 @@ import {connect} from 'react-redux';
 import NumberUnitDrop from "@components/NumberUnitDrop";
 import {SETNUMBER,CHANGEOTHERTEXTLABEL} from '@types/otherHistory';
 import {SETNUMBER4,CHANGECHECKTEXTLABEL} from '@types/checkBody.js';
-import {SETDROPSHOW,CLICKCOUNT,HIDE,RESET,HIDEDROP,ISREAD,SET_SELECTED_AREA} from '@types/homePage.js';
+import {SETDROPSHOW,CLICKCOUNT,HIDE,RESET,HIDEDROP,ISREAD,SET_SELECTED_AREA,SET_CURRENT_MODULE} from '@types/homePage.js';
 import {NUMBER_SELECT,CHANGE_LABELVAL} from '@store/types/mainSuit.js';
 import {CURRENT_NUMBER,CURRENT_TEXT_LABEL} from '@store/types/currentIll.js';
 import {Notify} from '@commonComp';
 import {didPushParamChange,filterDataArr,getLabelIndex} from '@utils/tools.js';
-import {billing} from '@store/async-actions/pushMessage';
+import {billing,getMRAnalyse} from '@store/async-actions/pushMessage';
 import config from '@config/index.js';
+import storeGlobal from '@store';
 
 function mapStateToProps(state){
   return {
@@ -162,6 +163,8 @@ function mapDispatchToProps(dispatch,store){
       })
     },
     handleShow(params) {
+      const storeState = storeGlobal.getState()
+      const {moduleName, moduleObj} = storeState.homePage
       dispatch({
         type:CLICKCOUNT,
         data:params,
@@ -172,6 +175,13 @@ function mapDispatchToProps(dispatch,store){
         type:SETDROPSHOW,
         data:params
       });
+      if(moduleName != moduleObj[params.ikey[0]]) {
+        dispatch({
+          type: SET_CURRENT_MODULE,
+          moduleName: moduleObj[params.ikey[0]]
+        });
+        dispatch(getMRAnalyse());
+      }
       /*dispatch({
         type: RESET
       });*/

src/containers/RadioDrop.js

@@ -3,13 +3,14 @@ import {connect} from 'react-redux';
 import RadioDrop from "@components/RadioDrop";
 import {SETRADIO,CLEARSELECTED,CONFIRMSELECTED,CHANGEOTHERTEXTLABEL} from '@types/otherHistory';
 import {SETSELECTED4,CHANGECHECKTEXTLABEL} from '@types/checkBody';
-import {SETDROPSHOW,HIDE,RESET,HIDEDROP,CLICKCOUNT,ISREAD,SET_SELECTED_AREA} from '@types/homePage.js';
+import {SETDROPSHOW,HIDE,RESET,HIDEDROP,CLICKCOUNT,ISREAD,SET_SELECTED_AREA,SET_CURRENT_MODULE} from '@types/homePage.js';
 import {RADIO_SELECT,CHANGE_LABELVAL} from '@store/types/mainSuit.js';
 import {CURRENT_RADIO,CURRENT_TEXT_LABEL} from '@store/types/currentIll.js';
 import {Notify} from '@commonComp';
 import {filterArr,didPushParamChange,filterDataArr,getLabelIndex,fullfillText} from '@utils/tools.js';
-import {billing} from '@store/async-actions/pushMessage';
+import {billing,getMRAnalyse} from '@store/async-actions/pushMessage';
 import config from '@config/index.js';
+import storeGlobal from '@store';
 
 function mapStateToProps(state){
   const {typeConfig} = state;
@@ -139,6 +140,8 @@ function mapDispatchToProps(dispatch,store){
       })
     },
     handleShow(obj) {
+      const storeState = storeGlobal.getState()
+      const {moduleName, moduleObj} = storeState.homePage
       dispatch({
         type:CLICKCOUNT,
         data:obj,
@@ -149,6 +152,13 @@ function mapDispatchToProps(dispatch,store){
         type:SETDROPSHOW,
         data:obj
       });
+      if(moduleName != moduleObj[obj.ikey[0]]) {
+        dispatch({
+          type: SET_CURRENT_MODULE,
+          moduleName: moduleObj[obj.ikey[0]]
+        });
+        dispatch(getMRAnalyse());
+      }
       dispatch({
         type: RESET
       });

src/containers/RadioInpDrop.js

@@ -3,13 +3,14 @@ import {connect} from 'react-redux';
 import RadioInpDrop from "@components/RadioInpDrop";
 import {SETRADIO,CLEARSELECTED,CONFIRMSELECTED,SET_OT_RADIO_INPUT_VAL} from '@types/otherHistory';
 import {SETSELECTED4,SET_CK_RADIO_INPUT_VAL} from '@types/checkBody';
-import {SETDROPSHOW,HIDE,RESET,HIDEDROP,CLICKCOUNT,ISREAD,SET_SELECTED_AREA} from '@types/homePage.js';
+import {SETDROPSHOW,HIDE,RESET,HIDEDROP,CLICKCOUNT,ISREAD,SET_SELECTED_AREA,SET_CURRENT_MODULE} from '@types/homePage.js';
 import {RADIO_SELECT,SET_MS_RADIO_INPUT_VAL} from '@store/types/mainSuit.js';
 import {CURRENT_RADIO,SET_RADIO_INPUT_VALUE} from '@store/types/currentIll.js';
 import {Notify} from '@commonComp';
 import {filterArr,didPushParamChange,filterDataArr,getLabelIndex,fullfillText} from '@utils/tools.js';
-import {billing} from '@store/async-actions/pushMessage';
+import {billing,getMRAnalyse} from '@store/async-actions/pushMessage';
 import config from '@config/index.js';
+import storeGlobal from '@store';
 
 function mapStateToProps(state){
   return {
@@ -149,6 +150,8 @@ function mapDispatchToProps(dispatch,store){
       })
     },
     handleShow(obj) {
+      const storeState = storeGlobal.getState()
+      const {moduleName, moduleObj} = storeState.homePage
       dispatch({
         type:CLICKCOUNT,
         data:obj,
@@ -159,6 +162,13 @@ function mapDispatchToProps(dispatch,store){
         type:SETDROPSHOW,
         data:obj
       });
+      if(moduleName != moduleObj[obj.ikey[0]]) {
+        dispatch({
+          type: SET_CURRENT_MODULE,
+          moduleName: moduleObj[obj.ikey[0]]
+        });
+        dispatch(getMRAnalyse());
+      }
       dispatch({
         type: RESET
       });

src/containers/SpreadDrop.js

@@ -3,17 +3,18 @@ import {connect} from 'react-redux';
 
 import SpreadDrop from '@components/SpreadDrop';
 import {SETSELECTED,CLEARSELECTED,CONFIRMSELECTED,SETOTHERCHECKBOX,CHANGEOTHERTEXTLABEL} from '@types/otherHistory';
-import {RESET,SETDROPSHOW,HIDEDROP,CLICKCOUNT,ISREAD,SET_SELECTED_AREA} from '@store/types/homePage.js';
+import {RESET,SETDROPSHOW,HIDEDROP,CLICKCOUNT,ISREAD,SET_SELECTED_AREA,SET_CURRENT_MODULE} from '@store/types/homePage.js';
 import {getModules as fetchModules} from '@store/async-actions/fetchModules.js';
 import {getCommSymptomPush,getCommSymptoms} from '@store/async-actions/mainSuit.js'
 import {GET_BIGDATAPUSH,MIX_CONFIRM,COMM_CONFIRM,CHANGE_LABELVAL} from '@store/types/mainSuit';
 import {SETCHECKBOX,CHANGECHECKTEXTLABEL,CHECKCONFIRMSELECTED} from '@types/checkBody';
 import {CURRENT_CONFIRM,SETMAINCHECKBOX,CURRENT_TEXT_LABEL,CURRENT_GET_BIGDATAPUSH,SHOW_COMMON_ON_CURRENT} from '@types/currentIll';
-import {billing} from '@store/async-actions/pushMessage';
+import {billing,getMRAnalyse} from '@store/async-actions/pushMessage';
 import {Notify} from '@commonComp';
 import {filterArr,didPushParamChange,filterDataArr,getLabelIndex,fullfillText,checkFullfillText,getIds} from '@utils/tools.js';
 import config from '@config/index.js';
 import {CLEAR_COMSYMPTOMS} from "../store/types/mainSuit";
+import storeGlobal from '@store';
 
 function mapStateToProps(state) {//console.log(state);
   const {mainSuit,homePage} = state;
@@ -508,6 +509,15 @@ function mapDispatchToProps(dispatch,store){
               type:SETDROPSHOW,
               data:obj
             });
+            const storeState = storeGlobal.getState()
+            const {moduleName, moduleObj} = storeState.homePage
+            if(moduleName != moduleObj[obj.ikey[0]]) {
+              dispatch({
+                type: SET_CURRENT_MODULE,
+                moduleName: moduleObj[obj.ikey[0]]
+              });
+              dispatch(getMRAnalyse());
+            }
             return;
           }
           let pushDataList = [];
@@ -540,6 +550,15 @@ function mapDispatchToProps(dispatch,store){
               type:SETDROPSHOW,
               data:obj
             });
+            const storeState = storeGlobal.getState()
+            const {moduleName, moduleObj} = storeState.homePage
+            if(moduleName != moduleObj[obj.ikey[0]]) {
+              dispatch({
+                type: SET_CURRENT_MODULE,
+                moduleName: moduleObj[obj.ikey[0]]
+              });
+              dispatch(getMRAnalyse());
+            }
           }else{
             Notify.info(result.msg);
             return;
@@ -552,6 +571,15 @@ function mapDispatchToProps(dispatch,store){
         type:SETDROPSHOW,
         data:obj
       });
+      const storeState = storeGlobal.getState()
+      const {moduleName, moduleObj} = storeState.homePage
+      if(moduleName != moduleObj[obj.ikey[0]]) {
+        dispatch({
+          type: SET_CURRENT_MODULE,
+          moduleName: moduleObj[obj.ikey[0]]
+        });
+        dispatch(getMRAnalyse());
+      }
       dispatch({
         type: RESET
       });

src/store/reducers/homePage.js

@@ -24,7 +24,13 @@ const initState = {
   preData:{},
   item:{},
   admin:false,
-  moduleName:''
+  moduleName:'a',
+  moduleObj: {
+    "common": "主诉",
+    "2": "现病史",
+    "3": "其他史",
+    "4": "查体"
+  }
 };
 
 export default function (state=initState,action) {

src/utils/config.js

@@ -1,8 +1,8 @@
 // const host='http://192.168.3.1:5050';//赵
 // const host='http://192.168.3.100:5050';//王峰
 // const host='http://192.168.2.121:5050';//后端接口访问地址
-const host='http://192.168.2.236:5050';//后端接口访问地址
-// const host='http://192.168.2.241:5050';//后端接口访问地址
+// const host='http://192.168.2.236:5050';//后端接口访问地址
+const host='http://192.168.2.241:5050';//后端接口访问地址
 // const host='http://192.168.3.11:5050';//王宇
 //const host='http://192.168.2.164:8080';
 // const host='http://192.168.3.117:5050'; //周铁刚

src/utils/tools.js

@@ -734,7 +734,11 @@ function getMRInfo() {
   const {mainSuit,currentIll,otherHistory,checkBody,inspect,assistCheck,diagnosticList} = state;
   let diagStr = ""
   for(let i = 0; i < diagnosticList.diagnosticList.length; i++) {
-    diagStr +=diagnosticList.diagnosticList[i].name
+    if(i == 0) {
+      diagStr +=diagnosticList.diagnosticList[i].name
+    } else {
+      diagStr += ',' + diagnosticList.diagnosticList[i].name
+    }
   }
   let str = `姓名: ${message.patientName}
             性别：${message.patientSex}