已加入量表显示bug修改1661

src/components/AssessResult/ScaleItem/index.jsx

@@ -294,12 +294,12 @@ class ScaleItem extends Component {
     });
   }
   getScaleContent(data){
+    if(!data){
+      return null;
+    }
     const item = data&&data.find((it)=>{
       return it.type==1;
     });
-    if(!item){
-      return null;
-    }
     const content = JSON.parse(item.content||null);
     return {conceptId:item.conceptId,content,name:content.scaleName};
   }
@@ -310,7 +310,7 @@ class ScaleItem extends Component {
       return '';
     };
     for( let i in scaleItems){
-      it = this.getScaleContent(scaleItems[i].data);
+      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;
       //这里onClick不能用箭头函数，用箭头函数会一直绑定for的最后一个it
@@ -323,7 +323,7 @@ class ScaleItem extends Component {
       </li>:<li>
         <span>相关量表：</span>
         <div className={style['row']}>{temp}</div>
-        <div className={style["recommend"]} onClick={()=>this.props.handleRemove(true,it.id)}>
+        <div className={style["recommend"]} onClick={()=>this.props.handleRemove(true,it.conceptId)}>
           <img className={style["deleteIconNo"]} src={deleteIconNo} />
           <img className={style["deleteIcon"]} src={deleteIcon} />
         </div>