计算公式相关变量整理

src/components/ChronicInfo/index.jsx

@@ -261,8 +261,8 @@ class ChronicInfo extends React.Component{
     })
   }
   calcuFormula(item,j, v, i) { //计算公式计算
-    const { calcuFormula, data ,chronicPushItems,calcuValues} = this.props;
-    let pushObj = deepClone(chronicPushItems);
+    const { calcuFormula ,data,calcuValues} = this.props;
+    let pushObj = deepClone(data);
     if(calcuValues&&calcuValues[pushObj[i].id]){
       pushObj[i].details[j].content=calcuValues&&calcuValues[pushObj[i].id];
     }
@@ -331,8 +331,8 @@ class ChronicInfo extends React.Component{
     return btn;
   }
   getDetail(){
-    const {data,indexs,formulaResult,calcuResult,calcuValues} = this.props;
-    const {formulaId,optionId,possible,radioVal,isFormulaConfirm} = this.state;
+    const {data,formulaResult,calcuResult,calcuValues} = this.props;
+    const {formulaId,optionId,possible,radioVal} = this.state;
     let list = data&&data.map((v,i)=>{
                     return <div className={style["list"]}>
                       {v.name?<p>

src/components/PushItems/index.jsx

@@ -411,7 +411,7 @@ class PushItems extends Component {
               </div>
             </div>
             {/*{chronicPushItems&&chronicPushItems.length>0?<ChronicInfo data={chronicPushItems}></ChronicInfo>:''}*/}
-            {<ChronicInfo data={chronicPushItems}></ChronicInfo>}
+            {<ChronicInfo></ChronicInfo>}
             <div className={style["tips"]}>
               <h1>
                 <img src={tipsImg} />

src/containers/AssessResult.js

@@ -35,8 +35,8 @@ function mapStateToProps(state) {
     scaleUpdate:pushMessage.scaleUpdate,
     chronicPushItems: pushMessage.chronicPushItems, //慢病右侧推送
     formulaResult:pushMessage.formulaResult,       //量表计算结果
-    calcuResult:pushMessage.calcuResult,      //评估弹窗可能结果计算结果
-    calcuValues:pushMessage.calcuValues,      //计算公式填的值
+    calcuResult:assessResult.calcuResult,      //评估弹窗可能结果计算结果
+    calcuValues:assessResult.calcuValues,      //计算公式填的值
     wholeScaleItems:assessResult.wholeScaleItems,     //全部量表中已加入病例的量表
   }
 }

src/containers/ChronicInfo.js

@@ -2,31 +2,29 @@ import {connect} from 'react-redux';
 import ChronicInfo from '../components/ChronicInfo';
 import {SHOW_TABLE_LIST,HIDE_TABLE_LIST, SET_CHRONIC_PUSHS} from '@store/types/pushMessage';
 import {getTableList,getScaleInfo,getTips} from '../store/async-actions/pushMessage';
-import {ADD_ASSESS_ITEMS,SET_SAVE_ASSESS_DATA,SET_CHRONIC_CALCU_RESULT,ADD_WHOLE_SCALE_ITEMS} from "@types/assessResult";
+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";
 import {saveClickNum} from '@store/async-actions/homePage';
 import { getFormulaResult } from '@store/async-actions/fetchModules'
 import {deepClone} from '@utils/tools';
 import Notify from '@commonComp/Notify';
-import {SET_CALCU_VALUES} from "../store/types/pushMessage";
 
 function mapStateToProps(state){
   const {pushMessage,assessResult} = state;
   return{
     chronicMagItem: state.diagnosticList.chronicMagItem,//慢病疾病
-    chronicPushItems: pushMessage.chronicPushItems, //慢病右侧推送
+    data:pushMessage.chronicPushItems,     //慢病右侧推送
     tableList: pushMessage.tableList,
     showList: pushMessage.showList,
     showHide: pushMessage.showHide,
     scaleInfo: pushMessage.scaleInfo,//量表内容
     chronicDesease:state.mainSuit.chronicDesease,//主诉存的慢病
     update:assessResult.update1,
-    cupdate:pushMessage.update,
     formulaResult:pushMessage.formulaResult, //量表信息
     indexs:assessResult.wholeIndexs,
     wholeResults:assessResult.wholeResults,     //整体评估可能结果
-    calcuResult:pushMessage.calcuResult,      //计算公式结果
-    calcuValues:pushMessage.calcuValues,      //计算公式填的值
+    calcuResult:assessResult.calcuResult,      //计算公式结果
+    calcuValues:assessResult.calcuValues,      //计算公式填的值
     wholeScaleItems:assessResult.wholeScaleItems,     //全部量表中已加入病例的量表
   }
 }
@@ -84,10 +82,13 @@ function mapDispatchToProps(dispatch){
     setChronicPush(data,id,calcuItem) {
       dispatch({
         type: SET_CHRONIC_PUSHS,
-        data: data,
-        calcuItem,
+        data: data
+      });
+      dispatch({
+        type:SET_CALCU_VALUES,
+        data:calcuItem,
         id
-      })
+      });
     },
     // 计算公式计算
     calcuFormula(item) {
@@ -95,12 +96,12 @@ function mapDispatchToProps(dispatch){
       const {param,chronicPushItems} = item;
       getFormulaResult(param).then((res)=>{
         if(+res.data.code==0){
-          const data = chronicPushItems;
+          //const data = chronicPushItems;
           const result = res.data.data.result;
-          const content = data[param.ppIndex].details[param.pIndex].content;
-          content.result =  result;
+          /*const content = data[param.ppIndex].details[param.pIndex].content;
+          content.result =  result;*/
           dispatch({
-            type: SET_CALCU_VALUES,
+            type: SET_CHRONIC_CALCU_RESULT,
             result:deepClone(result),
             id:item.param.disId
           })

src/containers/PushItemsContainer.js

@@ -15,7 +15,7 @@ function mapStateToProps(state) {
         questionId: diagnosticList.clickDiag,
         tableList: pushMessage.tableList,
         showList: pushMessage.showList,
-        chronicPushItems: pushMessage.chronicPushItems,
+        //chronicPushItems: pushMessage.chronicPushItems,
     }
 }
 

src/store/reducers/assessResult.js

@@ -1,5 +1,5 @@
 import {SET_ASSESS_DATA,SET_INDEX_DATA,SET_SAVE_ASSESS_DATA,SET_INDEX_SUB_TYPE,ADD_ASSESS_ITEMS,
-  REMOVE_ASSESS_ITEMS,CLEAR_INDEX_DATA,SET_CHRONIC_CALCU_RESULT,ADD_WHOLE_SCALE_ITEMS} from '@types/assessResult';
+  REMOVE_ASSESS_ITEMS,CLEAR_INDEX_DATA,SET_CHRONIC_CALCU_RESULT,ADD_WHOLE_SCALE_ITEMS,SET_CALCU_VALUES} from '@types/assessResult';
 import config from "@config";
 
 const init = {
@@ -15,7 +15,8 @@ const init = {
     possible:{},
     radioVal:{}
   },    //可能结果
-  calcuResult:{},       //计算公式填的值
+  calcuResult:{},       //计算公式结果
+  calcuValues:{},       //计算公式填的值
   wholeScaleItems:[],   //全部量表中添加的整体评估项
 };
 export default (state=init,action)=>{
@@ -78,7 +79,11 @@ export default (state=init,action)=>{
       //res.wholeAssess[pIndex].details[index].add=false;
       return res;
     case SET_CHRONIC_CALCU_RESULT:
-      res.calcuResult[action.id] = action.data;
+      res.calcuResult[action.id] = action.result;
+      res.update1= Math.random();
+      return res;
+    case SET_CALCU_VALUES:
+      res.calcuValues[action.id] = action.data;
       return res;
     default:
       return res;

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, IS_FIRST_MAIN_DIAG, 
         SET_ADVICE_INPUT ,SET_CHRONIC_TABLELIST,SHOW_TABLE_LIST,SET_SCALE_INFO,SET_CHRONIC_PUSHS,
-        SAVE_TABLE_RESULT, SAVE_FOLLOW_UP, DEL_FOLLOW_UP,SET_CALCU_VALUES} from '../types/pushMessage';
+        SAVE_TABLE_RESULT, SAVE_FOLLOW_UP, DEL_FOLLOW_UP} from '../types/pushMessage';
 import {changeAssay, changeCheck, setAdvice, addScheme, setTips, setTipsDetails, setChangeAdviceTreatment, 
         setChangeAdviceAssay, setChangeAdviceCheck, addBilling, clearAllPushMessage, showTipsDetails, hideTipsDetails, 
         setCommontreatment, isFirstMainDiag, setAdviceInput, saveFollowUp, delFollowUp } from '../actions/pushMessage';
@@ -23,8 +23,6 @@ const initState = {
   formulaResult:{},
   scaleInfo:{},
   showHide:{},
-  calcuResult:{},
-  calcuValues:{}
 };
 export default function(state = initState, action) {
   let res = Object.assign({},state);
@@ -40,7 +38,7 @@ export default function(state = initState, action) {
     case SET_TIPS: 
       return setTips(state, action);
     case SET_TIPS_DETAILS:
-      return setTipsDetails(state,action)
+      return setTipsDetails(state,action);
     case SET_CHANGE_ADVICE_TREATMENT:
       return setChangeAdviceTreatment(state, action);
     case SET_CHANGE_ADVICE_ASSAY: 
@@ -73,13 +71,6 @@ export default function(state = initState, action) {
       return res;
     case SET_CHRONIC_PUSHS:
       res.chronicPushItems = action.data;
-      if(action.id){
-        res.calcuValues[action.id] = action.calcuItem;
-      }
-      return res;
-    case SET_CALCU_VALUES:
-      res.calcuResult[action.id] = action.result;
-      res.update = Math.random();
       return res;
     case SET_SCALE_INFO://量表内容-量表id
       res.scaleInfo = Object.assign({},res.scaleInfo,{[action.id]:action.data});

src/store/types/assessResult.js

@@ -6,4 +6,5 @@ export const ADD_ASSESS_ITEMS = 'ADD_ASSESS_ITEMS';     //加入评估
 export const REMOVE_ASSESS_ITEMS = 'REMOVE_ASSESS_ITEMS';  //整体评估删除
 export const CLEAR_INDEX_DATA = 'CLEAR_INDEX_DATA';     //删除图表数据
 export const SET_CHRONIC_CALCU_RESULT = 'SET_CHRONIC_CALCU_RESULT';   //保存评估中计算结果
-export const ADD_WHOLE_SCALE_ITEMS  = 'ADD_WHOLE_SCALE_ITEMS';    //从全部量表中添加的整体评估
+export const ADD_WHOLE_SCALE_ITEMS  = 'ADD_WHOLE_SCALE_ITEMS';    //从全部量表中添加的整体评估
+export const SET_CALCU_VALUES = 'SET_CALCU_VALUES';  //保存计算公式数据

src/store/types/pushMessage.js

@@ -22,6 +22,5 @@ export const SET_SCALE_INFO = 'SET_SCALE_INFO' ; //量表明细
 export const SAVE_TABLE_RESULT = 'SAVE_TABLE_RESULT' ; //量表计算结果
 export const SAVE_FOLLOW_UP = 'SAVE_FOLLOW_UP'  //保存回访时间
 export const DEL_FOLLOW_UP = 'DEL_FOLLOW_UP'  //保存回访时间
-export const SET_CALCU_VALUES = 'SET_CALCU_VALUES';  //保存计算公式数据