是否为推荐结果判断删除

src/components/AssessResult/AssessHis/index.jsx

@@ -61,8 +61,7 @@ class AssessResultHis extends Component {
                           scaleItems={scaleItems}
                           result={wholeResults}
                           disabled={true}
-                          text={wholeAssessText}
-                          isRecommend={item.isRecommend}></ScaleItem>;
+                          text={wholeAssessText}></ScaleItem>;
       case 1:     //数据来源于大数据
         return <ChooseItem title={name} data={list} selecteds={chooseSelecteds&&chooseSelecteds[i]} disabled={true}></ChooseItem>;
       case 10:    //数据来源于后台

src/components/AssessResult/ScaleItem/index.jsx

@@ -327,9 +327,9 @@ class ScaleItem extends Component {
     }
   }
   render() {
-    const {title,handleInp,disabled,isRecommend} = this.props;
+    const {title,handleInp,disabled} = this.props;
     return <div className={style['assess-item']}>
-      {isRecommend?'':<h2>{title}</h2>}
+      <h2>{title}</h2>
       <div className={style['item-content']}>
         <ul>
           {
@@ -338,7 +338,7 @@ class ScaleItem extends Component {
           {
             this.getScales()
           }
-          {isRecommend?'':<li>
+          <li>
             <textarea className={style['edit-row']}
                       ref={this.$area}
                       type="text"
@@ -347,7 +347,7 @@ class ScaleItem extends Component {
                       onBlur={()=>handleInp(this.state.text)}
                       onInput={this.handleInput.bind(this)}>{this.state.text}</textarea>
             <div className={style['textareaStatic']}>评估描述：{this.state.text}</div>
-          </li>}
+          </li>
         </ul>
       </div>
     </div>;

src/components/AssessResult/index.jsx

@@ -36,7 +36,7 @@ class AssessResult extends Component {
   }
   componentWillMount(){
     //获取评估
-    this.props.getAssess(this.props.isRecommend);
+    this.props.getAssess();
   }
   handleScaleText(text){
     const {disId} = this.props;
@@ -90,20 +90,20 @@ class AssessResult extends Component {
   }
   componentWillUnmount(){
     //点确定关闭弹窗时把参数传到父组件去
-    const {saveAssessInfos,isAssessConfirm,clearChartData,handleSavePossible,isRecommend} = this.props;
+    const {saveAssessInfos,isAssessConfirm,clearChartData,handleSavePossible} = this.props;
     clearChartData&&clearChartData();
-    if(!isRecommend&&isAssessConfirm && readyKeepHistory() == 1){
+    if(isAssessConfirm && readyKeepHistory() == 1){
       Notify.error("主诉不能为空");
-    }else if(!isRecommend&&isAssessConfirm && readyKeepHistory() == 2){
+    }else if(isAssessConfirm && readyKeepHistory() == 2){
       Notify.info('诊断不能为空');
     }
     handleSavePossible&&handleSavePossible(this.state.wholeResults);
     if(isAssessConfirm){
-      saveAssessInfos(this.state,readyKeepHistory(),isRecommend);
+      saveAssessInfos(this.state,readyKeepHistory());
     }
   }
   handoutTypes(item,i){
-    const {getIndexData,indexData,timeTypes,wholeIndexs,closeAssess,showScaleFn,isRecommend,chronicPushItems,
+    const {getIndexData,indexData,timeTypes,wholeIndexs,closeAssess,showScaleFn,chronicPushItems,
       formulaResult,indexNames,disId} =this.props;
     let obj = [];
     Object.keys(wholeIndexs).map((i)=>{
@@ -129,7 +129,6 @@ class AssessResult extends Component {
                           calcuResult={calcuResult}
                           calcuValues={calcuValues}
                           formulaResult={formulaResult}
-                          isRecommend={isRecommend}
                           chronicPushItems={chronicPushItems}
                           closeAssess={closeAssess}></ScaleItem>;
       case 1:     //数据来源于大数据
@@ -151,9 +150,7 @@ class AssessResult extends Component {
   }
   render() {
     //const {data} =this.props;
-    let { isRecommend } = this.props;
-    const wholeItems = [{regionName: "整体评估",regionType: "0"}];
-    const data = isRecommend?wholeItems:this.props.data;
+    const data = this.props.data;
     return <div className={style['assess-cont']} id="AssistResult">
       <div className={style['printShow']}>
         <Information></Information>

src/containers/AssessResult.js

@@ -46,19 +46,7 @@ function mapStateToProps(state) {
 
 function mapDispatchToProps(dispatch) {
   return {
-    getAssess(isRecommend){        //获取评估内容数据
-      if(isRecommend){
-        const data = {
-          regionName: "整体评估",
-          regionType: "0",
-          isRecommend:true
-        };
-        dispatch({
-          type:SET_ASSESS_DATA,
-          data:[data]
-        });
-        return;
-      }
+    getAssess(){        //获取评估内容数据
       dispatch(getAssessData()).then((res)=>{
         if(res.data.code=='0'){
           dispatch({