计算公式修改（266）

src/components/AssessResult/ScaleItem/index.jsx

@@ -83,6 +83,7 @@ class ScaleItem extends Component {
     }
   }
   handleInputformula(id,calcuContent,i,e) {
+    const { calcuResult,handleCalcu } = this.props;
     const {calcuValues} = this.state;
     let obj = deepClone(calcuValues);
     let values = (obj&&obj[id])||deepClone(calcuContent);
@@ -96,6 +97,7 @@ class ScaleItem extends Component {
       isCalculated:false,
       calcuValues:obj
     });
+    handleCalcu&&handleCalcu(id,values,calcuResult);
   }
   handleForRadio(id,calcuContent,i,fidx){//计算公式
     const { calcuValues } = this.state;
@@ -135,8 +137,8 @@ class ScaleItem extends Component {
   }
   calcuFormula(item) { //计算公式计算
     const { calcuResult,handleCalcu } = this.props;
-    const {formulaId,calcuValues} = this.state;
-    let it=calcuValues&&calcuValues[formulaId];
+    const {calcuValues,formulaId} = this.state;
+    let it=calcuValues&&deepClone(calcuValues[formulaId]);
     let allHasInfo = true;
     for (let i = 0; i < it.length; i++) {
       if(it[i].controlType == 2) {  //输入框类型的有没有填值
@@ -155,14 +157,16 @@ class ScaleItem extends Component {
         }
       }
     }
-    item.content.details = calcuValues[formulaId];
+    const itemCopy = deepClone(item)
+    itemCopy.content.details = calcuValues[formulaId]
+    // item.content.details = calcuValues[formulaId];
     if(allHasInfo) { //所有都有值，则计算
       let results = deepClone(calcuResult);
-      getFormulaResult({type:2,data:item}).then((res)=>{
+      getFormulaResult({type:2,data:itemCopy}).then((res)=>{
         if(+res.data.code==0){
           const result = res.data.data.result;
           results[formulaId] = result;
-          handleCalcu&&handleCalcu(formulaId,calcuValues,results);
+          handleCalcu&&handleCalcu(formulaId,calcuValues[formulaId],results);
           this.setState({
             isCalculated:true
           });
@@ -176,10 +180,9 @@ class ScaleItem extends Component {
   }
   getDetailItems(item,i){
     let arr = [],temp='';
-    const {indexs,result,formulaResult,disabled,calcuResult} = this.props;
-    const {optionId,formulaId,radioVal,calcuValues} = this.state;
+    const {indexs,result,formulaResult,disabled,calcuValues,calcuResult} = this.props;
+    const {optionId,formulaId,radioVal} = this.state;
     const possible=result&&result.possible;
-
     item.details.map((its,j)=>{
       let it=its;
       if(indexs[i]&&indexs[i].includes(j)){
@@ -194,6 +197,7 @@ class ScaleItem extends Component {
         }else if(its.type==2){      //计算公式
           const showRes = calcuResult&&calcuResult[item.conceptId]||it.content.result;
           const details = calcuValues&&calcuValues[item.conceptId]||it.content.details;
+
           const cresult = showRes&&showRes[1]&&showRes[1].text;
                     temp = <div className={style['results']}>
                     <span>计算公式结果：</span>
@@ -233,7 +237,7 @@ class ScaleItem extends Component {
                               </td>
                             </tr>
                           }else if(item1.controlType==2){//输入框
-                            {console.log('item1.value', item1.value)}
+                            
                             return <tr>
                               <td>
                                 <span>{item1.isShow == '0' ? item1.name+'：':'请输入'+item1.name+'：'}</span>

src/components/AssessResult/index.jsx

@@ -95,10 +95,10 @@ class AssessResult extends Component {
     const {saveCalcuValue,saveCalcuResult}=this.props;
     this.setState({
       calcuResult:ret,
-      calcuValues:values
+      calcuValues:{[id]:values}
     });
     saveCalcuResult&&saveCalcuResult(ret);
-    saveCalcuValue&&saveCalcuValue(values,id);
+    saveCalcuValue&&saveCalcuValue(values, id);
   }
   componentWillUnmount(){
     //点确定关闭弹窗时把参数传到父组件去

src/components/ChronicInfo/index.jsx

@@ -230,8 +230,10 @@ class ChronicInfo extends React.Component{
   addFormula(it,v,pIndex,i){
     const {chronicMagItem, setCalcuInfo} = this.props;
     this.closeFormula(it);
-    setCalcuInfo && setCalcuInfo(v.conceptId,it.content.details,it.content.result)
-    chronicMagItem&&this.handleAddAssessItem(v,pIndex,i);
+    const itCopy = deepClone(it)
+    const vCopy = deepClone(v)
+    setCalcuInfo && setCalcuInfo(v.conceptId,itCopy.content.details,itCopy.content.result)
+    chronicMagItem&&this.handleAddAssessItem(vCopy,pIndex,i);
   }
   handleInputformula(id,calcuContent,i,j,idd,cres,e) {
     // const {calcuValues} = this.state;

src/containers/AssessResult.js

@@ -76,6 +76,18 @@ function mapDispatchToProps(dispatch) {
         data:deepClone(data)
       })
     },
+    // setCalcuInfo(id, calcuVal, calcuResult) {
+    //   dispatch({
+    //     type: SET_CHRONIC_CALCU_RESULT,
+    //     result:calcuResult,
+    //     id:id
+    //   });
+    //   dispatch({
+    //     type:SET_CALCU_VALUES,
+    //     data:deepClone(calcuVal),
+    //     id:id
+    //   })
+    // },
     showScaleFn(item,isPop){
       dispatch({
         type:SHOW_TABLE_LIST,

src/containers/ChronicInfo.js

@@ -109,7 +109,7 @@ function mapDispatchToProps(dispatch){
       });
       dispatch({
         type:SET_CALCU_VALUES,
-        data:calcuVal,
+        data:deepClone(calcuVal),
         id:id
       })
     },

src/store/actions/treat.js

@@ -22,7 +22,6 @@ export const clearTreat = (state, action) => {
     res.adversReactionList=[];
     res.hasFollowUp = false;
     res.followUp = '';
-    console.log('res', res)
     return res
 }
 

src/store/reducers/assessResult.js

@@ -124,7 +124,6 @@ export default (state=init,action)=>{
     case SET_CALCU_VALUES:
       if(action.id){
         res.calcuValues[action.id] = action.data;
-        console.log('bbbbbb', res)
       }else{
         res.calcuValues = action.data;
       }