历史病例全部量表中加入的显示bug修改1375

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,calcuResult,calcuValues} =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,10 +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/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/store/async-actions/print.js

@@ -146,7 +146,8 @@ function getEvaluations(base,pushMessage){
       scaleResult:pushMessage.formulaResult,
       wholeResults:base.wholeResults,
       calcuResult:base.calcuResult,
-      calcuValues:base.calcuValues
+      calcuValues:base.calcuValues,
+      scaleItems:base.wholeScaleItems,
     };
 }