历史病例量表显示bug修改1686,1685

src/components/AssessResult/ScaleItem/index.jsx

@@ -183,9 +183,11 @@ class ScaleItem extends Component {
       if(indexs[i]&&indexs[i].includes(j)){
         if(its.type==1){     //量表
           let scaleRes=formulaResult&&formulaResult[it.content.conceptId]&&formulaResult[it.content.conceptId].calcalculate;
+          const name = scaleRes&&scaleRes.result?(' 【'+it.content.name+'】 结果：'+scaleRes.result.value+" "+(scaleRes.result.text||'')):'【'+it.content.name+'】';
           temp =<span className={style['scale']}
+                      title={name}
                       onClick={this.handleShowScale.bind(this,it.content)}>
-                        {scaleRes&&scaleRes.result?(' 【'+it.content.name+'】 结果：'+scaleRes.result.value+" "+(scaleRes.result.text||'')):'【'+it.content.name+'】'}
+                        {name}
                         </span>;
         }else if(its.type==2){      //计算公式
           const showRes = calcuResult&&calcuResult[item.conceptId]||it.content.result;
@@ -323,10 +325,11 @@ class ScaleItem extends Component {
       it = {conceptId:i,name:scaleItems[i].name};//this.getScaleContent(scaleItems[i].data);
       if(!it) continue;
       let scaleRes=formulaResult&&formulaResult[it.conceptId]&&formulaResult[it.conceptId].calcalculate;
+      const name = scaleRes&&scaleRes.result?(' 【'+scaleItems[i].name+'】 结果：'+scaleRes.result.value+" "+(scaleRes.result.text||'')):'【'+scaleItems[i].name+'】';
       //这里onClick不能用箭头函数，用箭头函数会一直绑定for的最后一个it
-      temp =<span className={style['scale']} onClick={this.handleShowScale.bind(this,it)}>
-                        {scaleRes&&scaleRes.result?(' 【'+scaleItems[i].name+'】 结果：'+scaleRes.result.value+" "+(scaleRes.result.text||'')):'【'+scaleItems[i].name+'】'}
-                        </span>;
+      temp =<span className={style['scale']}
+                  title={name}
+                  onClick={this.handleShowScale.bind(this,it)}>{name}</span>;
       li = disabled?<li>
         <span>相关量表：</span>
         <div className={style['row']}>{temp}</div>

src/components/AssessResult/index.less

@@ -34,6 +34,10 @@
   }
   li {
     line-height: 35px;
+    white-space: nowrap;
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
     .row{
       display: inline-block;
     }

src/components/ScaleTableHis/index.jsx

@@ -104,7 +104,7 @@ class ScaleTableHis extends React.Component{
 
   render(){
     const {title,data,result} = this.props;
-    const scale = data && this.filterScale(data);
+    const scale = data && this.filterScale(data.data);
     const datas = scale && scale.content && JSON.parse(scale.content);
     const scaleResult = datas; //量表计算结果
     return <div className={style['tableBox']} id="printcontent">
@@ -112,7 +112,7 @@ class ScaleTableHis extends React.Component{
               <Information></Information>
             </div> 
             <h1>{datas?datas.scaleName:''}</h1>
-            {data && data.map((v,i)=>{
+            {data &&data.data&& data.data.map((v,i)=>{
               if(v.type==0){
                 return <div dangerouslySetInnerHTML={{__html:v.content}} className={style['textlh']}></div>
               }else{