Merge branch 'ChronicMag' of http://192.168.2.236:10080/zhouna/newICSS into ChronicMag

src/components/AssessResult/AssessHis/index.jsx

@@ -34,7 +34,11 @@ class AssessResultHis extends Component {
     const list = item.data&&item.data.rows;
     switch (+item.regionType){
       case 0:     //数据来源与右侧手动添加
-        return <ScaleItem title={name} data={wholeAssess} indexs={wholeIndexs} disabled={true}></ScaleItem>;
+        return <ScaleItem title={name}
+                          data={wholeAssess}
+                          indexs={wholeIndexs}
+                          disabled={true}
+                          isRecommend={item.isRecommend}></ScaleItem>;
       case 1:     //数据来源于大数据
         return <ChooseItem title={name} data={list} selecteds={chooseSelecteds&&chooseSelecteds[i]} disabled={true}></ChooseItem>;
       case 10:    //数据来源于后台

src/components/AssessResult/ScaleItem/index.jsx

@@ -165,14 +165,14 @@ class ScaleItem extends Component {
 
           temp =<span className={style['scale']}
                       onClick={()=>this.handleShowScale(it.content,item.id)}>
-                        {scaleRes&&scaleRes.result?('结果：'+scaleRes.result.value+" "+scaleRes.result.text+' 【'+it.content.name+'】'):'【'+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);
-          const showRes = calcuResult[item.id]||it.content.result;
+          const showRes = calcuResult&&calcuResult[item.id]||it.content.result;
           const cresult = showRes&&showRes[1]&&showRes[1].text;
                     temp = <div className={style['results']}>
-                    <span>计算公式：</span>
+                    <span>计算公式结果：</span>
                     <span className={style["blue"]} onClick={this.showFormula.bind(this,item.id,it)}>{cresult?cresult:'请选择'}</span>
                     <img src={level1} />
                     <MiniToast title={it.content.name}

src/components/AssessResult/index.jsx

@@ -32,7 +32,7 @@ class AssessResult extends Component {
   }
   componentWillMount(){
     //获取评估
-    this.props.getAssess();
+    this.props.getAssess(this.props.isRecommend);
   }
   handleScaleText(text){
       this.setState({

src/components/AssessResult/index.less

@@ -152,7 +152,7 @@
   text-align: center;
   color: #fff;
   // background: #DBDBDB;
-  background: #DFEAFE;
+  background: #3B9ED0;
   border-radius: 4px;
   cursor: auto;
   margin-top: 15px;

src/components/CheckBody/index.jsx

@@ -36,7 +36,7 @@ class CheckBody extends Component{
     const moreNum =data.length-[...data].reverse().findIndex((it)=>it.showInCheck)-1;//被隐藏的位置
     const moreText = filterDataArr([...saveText].splice(moreNum+1));     //被收起的标签中是否有有值得，有则不能再收起showMoreBtn?more:''
     const more = showAll?<span className={style['more']} onClick={this.showHide}>收起<img src={hideImg} /></span>:<span className={style['more']} onClick={this.showHide}>展开<img src={showImg} /></span>;
-    const showMoreBtn = (data.length>moreNum&&!data[0].full)&&!moreText;
+    const showMoreBtn = data.length>config.showCheckNum&&(data.length>moreNum&&!data[0].full)&&!moreText;
     let showArray = data.filter((it)=>{
       if(it.showInCheck)
         return it;

src/components/ChronicInfo/index.jsx

@@ -462,7 +462,7 @@ class ChronicInfo extends React.Component{
       <span className={style['okBtn']} onClick={()=>this.handleSaveAssess()}>确定</span>
     </div>;
     const recFooter =<div className={style['footer']}>
-      <span className={style['okBtn']} onClick={()=>this.handleSaveRecommend()}>关闭</span>
+      <span className={style['okBtn']} onClick={()=>this.handleSaveRecommend()}>确定</span>
     </div>;
     const scaleFooter = <div className={style['footer']}>
       <span className={style['print']} onClick={this.onPrint}><img src={printIcon} alt=""/>打印</span>

src/components/DiagnosticList/index.jsx

@@ -168,7 +168,7 @@ class DiagnosticList extends Component {
                 <div className={style['diaglist-wrap']}>
                     {list && (list.length > 0) && list.map((item, index) => {
                         const hasTreat = item.treat && (item.treat.commonTreatment.content || item.treat.surgeryTreatment.content || item.treat.treatment.length>0 ||(item.adverseReactions&&item.adverseReactions.length > 0)
-                           || (item.drugHistory['慢病用药内容'] &&  item.drugHistory['慢病用药内容'].length > 0) || (item.drugHistory['普通病用药内容'] &&  item.drugHistory['普通病用药内容'].length > 0) ||item.follow) 
+                           || (item.drugHistory && item.drugHistory['慢病用药内容'] &&  item.drugHistory['慢病用药内容'].length > 0) || (item.drugHistory &&item.drugHistory['普通病用药内容'] &&  item.drugHistory['普通病用药内容'].length > 0) ||item.follow) 
                         // const hasTreat= true;
                         return (<div draggable={true} className={style['diag-box'] + ' clearfix'}  key={item.id} >
                                     {index === 0 ? '' : <span className={style['diag-up']} onClick={() => {this.upDiagnostic(index)}}><img className={style["diag-up"]} src={diagUp}/></span>}

src/containers/AssessResult.js

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