Merge remote-tracking branch 'origin/ChronicMag' into dev/new1

# Conflicts:
#	src/components/AssessResult/AssessHis/index.jsx
#	src/containers/AssessResult.js

src/components/AssessResult/AssessHis/index.jsx

@@ -43,7 +43,7 @@ class AssessResultHis extends Component {
     }
   }
   handoutTypes(obj,item,i){
-    const {wholeAssess,wholeIndexs,chooseSelecteds,scaleResult,wholeResults,wholeAssessText} =obj;
+    const {wholeAssess,wholeIndexs,chooseSelecteds,scaleResult,wholeResults,wholeAssessText,calcuResult,calcuValues,scaleItems} =obj;
     const {getIndexData,inquiryDate,indexData,timeTypes,indexNames} = this.props;
     const {chartTimeTypes} = this.state;
     const name = item.regionName+"：";
@@ -53,8 +53,12 @@ class AssessResultHis extends Component {
         return <ScaleItem title={name}
                           data={wholeAssess}
                           showScaleFn={this.showScaleFn}
+                          showListScale={this.showScaleFn}
                           indexs={wholeIndexs}
                           formulaResult={scaleResult}
+                          calcuResult={calcuResult}
+                          calcuValues={calcuValues}
+                          scaleItems={scaleItems}
                           result={wholeResults}
                           disabled={true}
                           text={wholeAssessText}

src/components/AssessResult/ScaleItem/index.jsx

@@ -7,6 +7,7 @@ import checkIcon from '@common/images/check.png';
 import {ComplexModal,MiniToast,Radio} from '@commonComp';
 import Notify from '@commonComp/Notify';
 import {deepClone} from '@utils/tools';
+import { getFormulaResult } from '@store/async-actions/fetchModules'
 /**
  * 来源于页面选择
  *
@@ -110,24 +111,18 @@ class ScaleItem extends Component {
       formulaId:null
     })
   }
-  calcuFormula(j, v, ii) { //计算公式计算
-    const { calcuFormula,chronicPushItems,calcuValues } = this.props;
+  calcuFormula() { //计算公式计算
+    const { calcuResult,handleCalcu } = this.props;
     const {formulaId,formulaData} = this.state;
     let it=formulaData&&formulaData[formulaId];
-    const rst = calcuValues&&calcuValues[formulaId];
-    if(rst){
-      it.content = rst;
-    }
-    let pushObj = deepClone(chronicPushItems);
-    pushObj[ii].details[j]=it;
     let allHasInfo = true;
     for (let i = 0; i < it.content.details.length; i++) {
       if(it.content.details[i].controlType == 2) {  //输入框类型的有没有填值
         if(!it.content.details[i].value) {
           allHasInfo = false
         }
-      } else if(it.content.details[i].controlType == 1) {
-        let hasSelect = false
+      } else if(it.content.details[i].controlType == 0) {
+        let hasSelect = false;
         for( let z = 0; z <it.content.details[i].details.length; z++) {
           if(it.content.details[i].details[z].state == 1) {
             hasSelect= true
@@ -140,15 +135,16 @@ class ScaleItem extends Component {
 
     }
     if(allHasInfo) { //所有都有值，则计算
-      // delete it.content.resultz
-      let param = {
-        type: 2,
-        data: it,
-        disId: v.id,
-        pIndex: j,
-        ppIndex: ii,
-      }
-      calcuFormula({param,chronicPushItems:pushObj})
+      let results = deepClone(calcuResult);
+      getFormulaResult({type:2,data:it}).then((res)=>{
+        if(+res.data.code==0){
+          const result = res.data.data.result;
+          results[formulaId] = result;
+          handleCalcu&&handleCalcu(results);
+        }else{
+          Notify.error(res.data.msg||'计算没有结果返回');
+        }
+      })
     } else {  //不是所有值都填过了
       Notify.info('请填写计算公式内容')
     }
@@ -168,8 +164,8 @@ class ScaleItem extends Component {
   }
   getDetailItems(item,i){
     let arr = [],temp='';
-    const {indexs,result,formulaResult,calcuResult,calcuValues,disabled} = this.props;
-    const {optionId,formulaId,radioVal,formulaData,isFormulaConfirm} = this.state;
+    const {indexs,result,formulaResult,calcuValues,disabled,calcuResult} = this.props;
+    const {optionId,formulaId,radioVal,formulaData} = this.state;
     const possible=result&&result.possible;
 
     item.details.map((its,j)=>{
@@ -180,7 +176,7 @@ class ScaleItem extends Component {
           let scaleRes=formulaResult&&formulaResult[it.content.id]&&formulaResult[it.content.id].calcalculate;
           temp =<span className={style['scale']}
                       onClick={()=>this.handleShowScale(it.content,item.id,i)}>
-                        {scaleRes&&scaleRes.result?(' 【'+it.content.name+'】 结果：'+scaleRes.result.value+" "+scaleRes.result.text):'【'+it.content.name+'】'}
+                        {scaleRes&&scaleRes.result?(' 【'+it.content.name+'】 结果：'+scaleRes.result.value+" "+(scaleRes.result.text||'')):'【'+it.content.name+'】'}
                         </span>;
         }else if(its.type==2){      //计算公式
           it=formulaData[formulaId]||deepClone(its);
@@ -233,9 +229,9 @@ class ScaleItem extends Component {
                           }
                         })}
                       </table>
-                      {disabled?"":<div className={style["forMulBtn"]} onClick={this.calcuFormula.bind(this,j, item, i)}>计算</div>}
+                      {disabled?"":<div className={style["forMulBtn"]} onClick={this.calcuFormula.bind(this)}>计算</div>}
                       <table>
-                        {showRes && Array.isArray(showRes) &&showRes.map((itemResult, resultIndex) => {
+                        {showRes && Array.isArray(showRes) &&showRes.map((itemResult) => {
                           return <tr>
                             <td>
                               <span>{itemResult.name+'：'}</span>
@@ -303,7 +299,7 @@ class ScaleItem extends Component {
       if(!it) return '';
       let scaleRes=formulaResult&&formulaResult[it.id]&&formulaResult[it.id].calcalculate;
       temp =<span className={style['scale']} onClick={()=>this.handleShowScale(it)}>
-                        {scaleRes&&scaleRes.result?(' 【'+it.name+'】 结果：'+scaleRes.result.value+" "+scaleRes.result.text):'【'+it.name+'】'}
+                        {scaleRes&&scaleRes.result?(' 【'+it.name+'】 结果：'+scaleRes.result.value+" "+(scaleRes.result.text||'')):'【'+it.name+'】'}
                         </span>;
       li = disabled?<li>
         <span>相关量表：</span>
@@ -325,6 +321,14 @@ class ScaleItem extends Component {
       text
     });
   }
+  componentWillReceiveProps(next){        //修复bug1329,第二次保存值不显示
+    if(next.text!=this.state.text){
+      this.setState({
+        text:next.text
+      });
+    this.$area.current.value=next.text;
+    }
+  }
   render() {
     const {title,handleInp,disabled,isRecommend} = this.props;
     return <div className={style['assess-item']}>

src/components/AssessResult/index.jsx

@@ -26,6 +26,7 @@ class AssessResult extends Component {
         possible:props.possible,
         radioVal:props.radioVal
       },
+      calcuResult:props.calcuResult,     //计算公式结果
     };
     this.handleChooseChange = this.handleChooseChange.bind(this);
     this.handleScaleDel = this.handleScaleDel.bind(this);
@@ -77,9 +78,14 @@ class AssessResult extends Component {
       chartTimeTypes:Object.assign(chartTimeTypes,{[i]:selects})
     });
   }
+  handleCalcu(ret){
+    this.setState({
+      calcuResult:ret
+    });
+  }
   componentWillUnmount(){
     //点确定关闭弹窗时把参数传到父组件去
-    const {handleSave,isAssessConfirm,clearChartData,handleSaveCalcu,isRecommend} = this.props;
+    const {handleSave,isAssessConfirm,clearChartData,handleSaveCalcu,isRecommend,saveCalcuResult} = this.props;
     clearChartData&&clearChartData();
     if(!isRecommend&&isAssessConfirm && readyKeepHistory() == 1){
       Notify.error("主诉不能为空");
@@ -87,16 +93,20 @@ class AssessResult extends Component {
       Notify.info('诊断不能为空');
     }
     handleSaveCalcu&&handleSaveCalcu(this.state.wholeResults);
-    isAssessConfirm&&handleSave(this.state,readyKeepHistory(),isRecommend);
+    if(isAssessConfirm){
+      handleSave(this.state,readyKeepHistory(),isRecommend);
+    }else{
+      saveCalcuResult&&saveCalcuResult(this.state.calcuResult);
+    }
   }
   handoutTypes(item,i){
-    const {getIndexData,indexData,timeTypes,wholeIndexs,closeAssess,showScaleFn,calcuFormula,isRecommend,chronicPushItems,
-      formulaResult,calcuResult,calcuValues,indexNames,showListScale} =this.props;
+    const {getIndexData,indexData,timeTypes,wholeIndexs,closeAssess,showScaleFn,isRecommend,chronicPushItems,
+      formulaResult,calcuValues,indexNames,showListScale} =this.props;
     let obj = [];
     Object.keys(wholeIndexs).map((i)=>{
       obj[i]=chronicPushItems[i];
     });
-    const {chooseSelecteds,wholeAssessItems,wholeScaleItems,wholeAssessText,chartTimeTypes,wholeResults} = this.state;
+    const {chooseSelecteds,wholeAssessItems,wholeScaleItems,wholeAssessText,chartTimeTypes,wholeResults,calcuResult} = this.state;
     const chartData = indexData;
     const name = item.regionName+"：";
     const list = item.data&&item.data.rows;
@@ -107,13 +117,13 @@ class AssessResult extends Component {
                           handleRemove={this.handleScaleDel}
                           handleInp={this.handleScaleText}
                           handleRes={this.handleResult}
+                          handleCalcu={this.handleCalcu.bind(this)}
                           text={wholeAssessText}
                           indexs={wholeAssessItems}
                           scaleItems ={wholeScaleItems}
                           result={wholeResults}
                           showScaleFn={showScaleFn}
                           showListScale={showListScale}
-                          calcuFormula={calcuFormula}
                           calcuResult={calcuResult}
                           calcuValues={calcuValues}
                           formulaResult={formulaResult}

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>
@@ -469,7 +469,7 @@ class ChronicInfo extends React.Component{
       <span className={style['print']} onClick={this.onPrint}><img src={printIcon} alt=""/>打印</span>
       <span className={style['okBtn']} onClick={()=>this.closeTable()}>确定</span>
     </div>;
-    const {chronicMagItem,tableList,saveAssessInfos,chronicDesease,formulaResult,showHide,calcuFormula,addScaleItems,wholeScaleItems} = this.props;
+    const {chronicMagItem,tableList,saveAssessInfos,chronicDesease,formulaResult,showHide} = this.props;
     const {showAssess,isAssessConfirm,tableName,tableId,parentId,parentIndex,isRecommendConfirm,showRecommend,radioVal,possible} = this.state;
     return <div className={style["tips"]} style={{marginBottom:'15px'}}>
               <div className={`${style["tips-title"]} ${style["chronic"]}`}>
@@ -536,7 +536,6 @@ class ChronicInfo extends React.Component{
                               closeAssess={this.showAssessFn}
                               showScaleFn={this.showTable.bind(this)}
                               showListScale={this.handleListClick.bind(this)}
-                              calcuFormula={calcuFormula}
                               radioVal={radioVal}
                               possible={possible}
                               isAssessConfirm={isAssessConfirm}></AssessResult>
@@ -552,7 +551,6 @@ class ChronicInfo extends React.Component{
                               closeAssess={this.showRecommendFn}
                               isRecommend={true}
                               showScaleFn={this.showTable.bind(this)}
-                              calcuFormula={calcuFormula}
                               radioVal={radioVal}
                               possible={possible}
                               isAssessConfirm={isRecommendConfirm}></AssessResult>

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/components/ScaleTableHis/index.jsx

@@ -98,7 +98,7 @@ class ScaleTableHis extends React.Component{
                   {this.getContent(datas)}
                   {datas&&datas.Calc==1?<div className={style['total']}>
                     <span>总分：</span>
-                    <span>{result&&result.calcalculate&&result.calcalculate.result&&result.calcalculate.result.value +' '+ result.calcalculate.result.text||''}</span>
+                    <span>{result&&result.calcalculate&&result.calcalculate.result&&result.calcalculate.result.value +' '+ (result.calcalculate.result.text||'')}</span>
                   </div>:''}
                 </div>
               }

src/components/Treat/AdverseReactions/index.jsx

@@ -76,8 +76,9 @@ class AdverseReactions extends Component {
                     </span>
                         {item.details.map((it, idx) => {
                             return <span className={style['adverse-reactions-name']} key={item.id + it.name}>
-                                <input type="checkbox" checked={it.value == 1} id={item.id + it.name} onChange={this.changeReact.bind(this, it, index)}/>
+                                <input type="checkbox" checked={it.select} id={item.id + it.name} onChange={this.changeReact.bind(this, it, index)}/>
                                 <label for={item.id + it.name}> {it.name} </label>
+                                {it.value==1 && <span className={style['adverse-reactions-recommend']}>(智能推荐)</span>}
                             </span>
                         })}
                     </div>)

src/components/Treat/AdverseReactions/index.less

@@ -46,7 +46,12 @@
 .last-treat-big-name {
     position: relative;
 }
+.adverse-reactions-recommend {
+    cursor: pointer;
+    color: #3B9ED0;
+}
 .adverse-reactions-name {
+    margin-right: 10px;
     input, label {
         cursor: pointer;
     }

src/components/TreatDesc/index.jsx

@@ -26,11 +26,11 @@ class TreatDesc extends Component {
 
     handleMouseEnterDrug( index, item) {
         // console.log('item', item)
-        const drugNameWidth = parseInt($('#'+item.medicitionName)[0].offsetWidth)
+        // const drugNameWidth = parseInt($('#'+item.medicitionName)[0].offsetWidth)
         
-        const imgLeft = drugNameWidth/2-10
+        // const imgLeft = drugNameWidth/2-10
         // console.log('imgLeft', imgLeft)
-        $('#'+item.medicitionName).find('img').css('left', imgLeft)
+        // $('#'+item.medicitionName).find('img').css('left', imgLeft)
        
         this.setState({
             currentIndex: index,

src/components/TreatDesc/index.less

@@ -61,10 +61,10 @@
 }
 .info-img {
     width: 15px;
-    margin: 0 3px -1px;
-    cursor: pointer;
     position: absolute;
     top: -15px;
+    left: 50%;
+    margin-left: -7px;
 }
 .info-flag {
     display: inline-block;

src/containers/AssessResult.js

@@ -4,8 +4,8 @@ import AssessResult from '@components/AssessResult';
 import {ISREAD} from '@store/types/homePage.js';
 import {billing} from '@store/async-actions/pushMessage';
 import {getAssessData,getIndexData} from '@store/async-actions/fetchModules';
-import {SET_ASSESS_DATA,SET_INDEX_DATA,SET_INDEX_SUB_TYPE,REMOVE_ASSESS_ITEMS,CLEAR_INDEX_DATA} from '@types/assessResult';
-import {parseChartData} from '@utils/tools';
+import {SET_ASSESS_DATA,SET_INDEX_DATA,SET_INDEX_SUB_TYPE,REMOVE_ASSESS_ITEMS,CLEAR_INDEX_DATA,SET_CHRONIC_CALCU_RESULT} from '@types/assessResult';
+import {parseChartData,deepClone} from '@utils/tools';
 
 /***
  * 管理评估逻辑：
@@ -32,11 +32,10 @@ function mapStateToProps(state) {
     chooseSelecteds:assessResult.chooseSelecteds,    //已选中的选项
     wholeAssessText:assessResult.wholeAssessText,     //整体评估补充说明
     scaleInfo: pushMessage.scaleInfo,//量表内容
-    scaleUpdate:pushMessage.scaleUpdate,
     chronicPushItems: pushMessage.chronicPushItems, //慢病右侧推送
     formulaResult:pushMessage.formulaResult,       //量表计算结果
-    calcuResult:pushMessage.calcuResult,      //评估弹窗可能结果计算结果
-    calcuValues:pushMessage.calcuValues,      //计算公式填的值
+    calcuResult:assessResult.calcuResult,      //评估弹窗可能结果计算结果
+    calcuValues:assessResult.calcuValues,      //计算公式填的值
     wholeScaleItems:assessResult.wholeScaleItems,     //全部量表中已加入病例的量表
   }
 }
@@ -90,6 +89,12 @@ function mapDispatchToProps(dispatch) {
         type:CLEAR_INDEX_DATA
       })
     },
+    saveCalcuResult(data){
+      dispatch({
+        type: SET_CHRONIC_CALCU_RESULT,
+        data:deepClone(data)
+      })
+    }
   }
 }
 

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,23 +82,22 @@ 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) {
-      // dispatch(getFormulaResult(item))
-      const {param,chronicPushItems} = item;
+      const {param} = item;
       getFormulaResult(param).then((res)=>{
         if(+res.data.code==0){
-          const data = chronicPushItems;
           const result = res.data.data.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/actions/treat.js

@@ -167,7 +167,7 @@ export const changeReact=(state,action)=>{
     const index = action.index
     res.adversReactionList[index].details = res.adversReactionList[index].details.map(item => {
       if(item.name == action.it.name){
-        item.value = item.value == 0 ? 1 : 0
+        item.select = !item.select
       }
       return item
     })

src/store/async-actions/print.js

@@ -144,7 +144,10 @@ function getEvaluations(base,pushMessage){
       wholeIndexs:base.wholeIndexs,
       scaleInfo:pushMessage.scaleInfo,
       scaleResult:pushMessage.formulaResult,
-      wholeResults:base.wholeResults
+      wholeResults:base.wholeResults,
+      calcuResult:base.calcuResult,
+      calcuValues:base.calcuValues,
+      scaleItems:base.wholeScaleItems,
     };
 }
 

src/store/async-actions/treat.js

@@ -219,7 +219,13 @@ function getTreatment(item, dispatch, state,url,params, isChronic) {
                             for (let j = 0; j < adverseReactions.length; j++) { //判断不良反应是否有相同的不良反应，如果有，替换
                                 for(let z = 0; z < allAdversReactionList[i].adversReactionList.length; z++) {
                                     if(adverseReactions[j].id == allAdversReactionList[i].adversReactionList[z].id) {
-                                        adverseReactions[j] = allAdversReactionList[i].adversReactionList[z]
+                                        for(let x = 0; x < allAdversReactionList[i].adversReactionList[z].details.length; x++) {
+                                            for(let y = 0; y < adverseReactions[j].details.length; y++) {//判断每一项是否选择过
+                                                if(allAdversReactionList[i].adversReactionList[z].details[x].name == adverseReactions[j].details[y].name && allAdversReactionList[i].adversReactionList[z].details[x].select) {
+                                                    adverseReactions[j].details[y].select = allAdversReactionList[i].adversReactionList[z].details[x].select
+                                                }
+                                            }
+                                        }
                                     }
                                 }
                             }

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)=>{
@@ -59,6 +60,7 @@ export default (state=init,action)=>{
       res.wholeScaleItems = action.wholeScaleItems||[];
       res.wholeAssessText = action.wholeAssessText||'';
       res.chooseSelecteds = action.chooseSelecteds||{};
+      res.calcuResult = action.calcuResult||{};
       return res;
     //case CLEAR_ASSESS_DATA:
     case ADD_ASSESS_ITEMS:
@@ -78,7 +80,15 @@ 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;
+      if(action.id){
+        res.calcuResult[action.id] = action.result;
+      }else{
+        res.calcuResult = action.data;
+      }
+      res.update1= Math.random();
+      return res;
+    case SET_CALCU_VALUES:
+      res.calcuValues[action.id] = action.data;
       return res;
     default:
       return res;

src/store/reducers/assistCheck.js

@@ -53,8 +53,9 @@ export default (state = initSearchList, action) => {
         const tempArrs = newState.assistLabel;
         let tempArr = [];
         let tmpString = '';
+        let tmpCommonLis = store.getState().homePage.assistList;
         if(action.sign == 'common'){
-          let tmpAssistList = store.getState().homePage.assistList
+          let tmpAssistList = JSON.parse(JSON.stringify(tmpCommonLis))
           tempArr = tmpAssistList;
         }else{
           tempArr = newState.list
@@ -84,13 +85,13 @@ export default (state = initSearchList, action) => {
             tempArrs.push(tempArr[k])
           }
         }
-        if(tempArr == []){
+        if(tempArrs == []){
           tmpString == ''
           return
         }
-        for (let i = 0; i < tempArr.length; i++) {
-          let tmpVal = tempArr[i].value?tempArr[i].value.trim():tempArr[i].value;
-          tmpString += (tempArr[i].name+(tmpVal?(':'+tmpVal)+', ':': ')+(tempArr[i].time?'报告日期:'+tempArr[i].time:'')+';')
+        for (let i = 0; i < tempArrs.length; i++) {
+          let tmpVal = tempArrs[i].value?tempArrs[i].value.trim():tempArrs[i].value;
+          tmpString += (tempArrs[i].name+(tmpVal?(':'+tmpVal)+', ':': ')+(tempArrs[i].time?'报告日期:'+tempArrs[i].time:'')+';')
         }
         newState.assistLabel = [...tempArrs]
         // console.log(tempArrs)

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';  //保存计算公式数据