评估计算公式处理

src/components/AssessResult/ScaleItem/index.jsx

@@ -97,7 +97,7 @@ class ScaleItem extends Component {
     })
   }
   calcuFormula(j, v, i) { //计算公式计算
-    const { calcuFormula } = this.props;
+    const { calcuFormula ,chronicPushItems} = this.props;
     const {formulaId,formulaData} = this.state;
     const it =formulaData&&formulaData[formulaId];
     let allHasInfo = true
@@ -128,7 +128,8 @@ class ScaleItem extends Component {
         pIndex: j,
         ppIndex: i,
       }
-      calcuFormula(param)
+      // calcuFormula(param)
+      calcuFormula({param,chronicPushItems})
     } else {  //不是所有值都填过了
       Notify.info('请填写计算公式内容')
     }

src/components/AssessResult/index.jsx

@@ -74,7 +74,7 @@ class AssessResult extends Component {
     isAssessConfirm&&handleSave(this.state,readyKeepHistory());
   }
   handoutTypes(item,i){
-    const {getIndexData,indexData,timeTypes,wholeAssessData,closeAssess,showScaleFn,calcuFormula,isRecommend} =this.props;
+    const {getIndexData,indexData,timeTypes,wholeAssessData,closeAssess,showScaleFn,calcuFormula,isRecommend,chronicPushItems} =this.props;
     const {chooseSelecteds,wholeAssessItems,wholeAssessText,chartTimeTypes,wholeResults} = this.state;
     const chartData = indexData;
     const name = item.regionName+"：";
@@ -92,7 +92,8 @@ class AssessResult extends Component {
                           showScaleFn={showScaleFn}
                           calcuFormula={calcuFormula}
                           isRecommend={isRecommend}
-                          closeAssess={closeAssess}></ScaleItem>;
+                          closeAssess={closeAssess}
+                          chronicPushItems={chronicPushItems}></ScaleItem>;
       case 1:     //数据来源于大数据
         return <ChooseItem title={name}
                            data={list}

src/containers/AssessResult.js

@@ -35,6 +35,7 @@ function mapStateToProps(state) {
     wholeAssessText:assessResult.wholeAssessText,     //整体评估补充说明
     scaleInfo: state.pushMessage.scaleInfo,//量表内容
     scaleUpdate:state.pushMessage.scaleUpdate,
+    chronicPushItems: state.pushMessage.chronicPushItems, //慢病右侧推送
   }
 }