Bläddra i källkod

计算公式计算完成后不更新

zhangxc 5 år sedan
förälder
incheckning
c3a5a33462

+ 2 - 1
src/components/PushItems/index.jsx

@@ -165,7 +165,7 @@ class PushItems extends Component {
       showPartName,
       showAllName
     } = this.props.pushMessage;
-    const { tipsDiscalimer,chronicPushItems,wholeIndexs,setPushEmergencyIdx,sysConfig,windowHeight,hideAllDrop,getInfomation} = this.props;
+    const { tipsDiscalimer,chronicPushItems,formulaCaluc,wholeIndexs,setPushEmergencyIdx,sysConfig,windowHeight,hideAllDrop,getInfomation} = this.props;
     const {
       billing,
       changeCheck,
@@ -268,6 +268,7 @@ class PushItems extends Component {
             </div>
             {/*{chronicPushItems&&chronicPushItems.length>0?<ChronicInfo data={chronicPushItems}></ChronicInfo>:''}*/}
             {<ChronicInfo
+              formulaCaluc = {formulaCaluc}
               patDom={this.$cont}
               data={chronicPushItems}></ChronicInfo>}
             <TipsMsg

+ 4 - 1
src/containers/ChronicInfo.js

@@ -1,6 +1,6 @@
 import {connect} from 'react-redux';
 import ChronicInfo from '../components/ChronicInfo';
-import {SHOW_TABLE_LIST,HIDE_TABLE_LIST, SET_CHRONIC_PUSHS,TOGGLE_CHRONIC_INFO} from '@store/types/pushMessage';
+import {SHOW_TABLE_LIST,HIDE_TABLE_LIST, SET_CHRONIC_PUSHS,TOGGLE_CHRONIC_INFO,SET_CALCU_FLAG} from '@store/types/pushMessage';
 import {getTableList,getScaleInfo,getConceptDetail} from '../store/async-actions/pushMessage';
 import {ADD_ASSESS_ITEMS,SET_SAVE_ASSESS_DATA,SET_CHRONIC_CALCU_RESULT,ADD_WHOLE_SCALE_ITEMS,SET_CALCU_VALUES} from "@types/assessResult";
 import {saveMessage} from "../store/async-actions/print";
@@ -120,6 +120,9 @@ function mapDispatchToProps(dispatch){
             data:param.data.content.details,
             id:param.disId
           })
+          dispatch({
+            type: SET_CALCU_FLAG
+          })
         }else{
           Notify.error(res.data.msg||'计算没有结果返回');
         }

+ 1 - 0
src/containers/PushItemsContainer.js

@@ -22,6 +22,7 @@ function mapStateToProps(state) {//console.log(state)
         sysConfig:state.homePage.sysConfig,
         windowHeight:state.homePage.windowHeight,
         EMRScrollCont:inspect.context.scrollArea,             //滚动条对象
+        formulaCalcu: pushMessage.formulaCalcu, //计算公式是否已经计算过
     }
 }
 

+ 1 - 0
src/store/actions/pushMessage.js

@@ -364,6 +364,7 @@ export const clearAllPushMessage = (state, action) => {
 	res.formulaResult = {};   //量表计算结果
 	res.scaleInfo = {};			//量表选中项
 	res.drugList = []; //开单药品列表
+	res.formulaCalcu = false; //重置计算结果
 	return res;
 }
 

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

@@ -103,11 +103,14 @@ export const billing = (mdata,boxMark) => {
    //单独调指标
    getBigPush('22',mainData).then((data) => {
      let {medicalIndications} = data.data.data||{};
+     const { formulaCalcu } = state.pushMessage
      //慢病推送模块数据
-     dispatch({
-       type:SET_CHRONIC_PUSHS,
-       data:medicalIndications
-     });
+     if(!formulaCalcu) {
+      dispatch({
+        type:SET_CHRONIC_PUSHS,
+        data:medicalIndications
+      });
+     }
    }).catch((e) =>{
      console.log(e)
    });

+ 6 - 2
src/store/reducers/pushMessage.js

@@ -2,7 +2,7 @@ import {CHANGE_ASSAY, CHANGE_CHECK, BILLING_ADVICE, ADD_SCHEME, SET_TIPS,  SET_T
         SET_CHANGE_ADVICE_TREATMENT, SET_CHANGE_ADVICE_ASSAY, SET_CHANGE_ADVICE_CHECK, ADD_BILLING,
         CLEAR_ALL_PUSH_MESSAGE,SHOW_TIPS_DETAILS, HIDE_TIPS_DETAILS, SET_COMMONTREATMENT,
         SET_ADVICE_INPUT ,SET_CHRONIC_TABLELIST,SHOW_TABLE_LIST,SET_SCALE_INFO,SET_CHRONIC_PUSHS,
-        SAVE_TABLE_RESULT, SAVE_FOLLOW_UP, DEL_FOLLOW_UP,TOGGLE_CHRONIC_INFO,SET_PUSH_EMERGENCY_IDX} from '../types/pushMessage';
+        SAVE_TABLE_RESULT, SAVE_FOLLOW_UP, DEL_FOLLOW_UP,TOGGLE_CHRONIC_INFO,SET_PUSH_EMERGENCY_IDX,SET_CALCU_FLAG} from '../types/pushMessage';
 import {changeAssay, changeCheck, setAdvice, addScheme, setTips, setTipsDetails, setChangeAdviceTreatment, 
         setChangeAdviceAssay, setChangeAdviceCheck, addBilling, clearAllPushMessage, showTipsDetails, hideTipsDetails, 
         setCommontreatment, setAdviceInput, saveFollowUp, delFollowUp } from '../actions/pushMessage';
@@ -24,7 +24,8 @@ const initState = {
   scaleInfo:{},
   showHide:{},
   setPushEmergency:{},
-  setPushEmergencyIdx:''
+  setPushEmergencyIdx:'',
+  formulaCalcu: false,
 };
 export default function(state = initState, action) {
   let res = Object.assign({},state);
@@ -83,6 +84,9 @@ export default function(state = initState, action) {
     case SET_PUSH_EMERGENCY_IDX:
       res.setPushEmergencyIdx = action.idx;
       return res;
+    case SET_CALCU_FLAG:
+      res.formulaCalcu = true;
+      return res;
     default:
       return state;
   }

+ 1 - 0
src/store/types/pushMessage.js

@@ -24,5 +24,6 @@ export const SAVE_FOLLOW_UP = 'SAVE_FOLLOW_UP';  //保存回访时间
 export const DEL_FOLLOW_UP = 'DEL_FOLLOW_UP';  //删除回访时间
 export const TOGGLE_CHRONIC_INFO = 'TOGGLE_CHRONIC_INFO';   //收起展开指标推送模块
 export const SET_PUSH_EMERGENCY_IDX = 'SET_PUSH_EMERGENCY_IDX';   //急诊设置idx
+export const SET_CALCU_FLAG = 'SET_CALCU_FLAG'  //计算结果计算状态