Merge remote-tracking branch 'origin/Chronic_test' into ChronicMag

# Conflicts:
#	src/components/ChronicInfo/index.jsx
#	src/store/async-actions/print.js

src/components/ChronicInfo/index.jsx

@@ -129,7 +129,7 @@ class ChronicInfo extends React.Component{
     }else{
       this.props.getScaleInfo(item);
     }
-    
+
     this.setState({
       tableName:it.name,
       tableId:it.id,
@@ -150,7 +150,7 @@ class ChronicInfo extends React.Component{
       isAssessConfirm:false
     });
   }
-  
+
   showFormula(id){//计算公式
     this.setState({
       formulaId:id
@@ -218,7 +218,7 @@ class ChronicInfo extends React.Component{
                                 <span className={style["listName"]} onClick={this.showTable.bind(this,it.content,v.id)}>
                                   {'【'+it.content.name+'】'}
                                   {formulaResult&&formulaResult[it.content.id]?<i>{'结果：'+ formulaResult[it.content.id].text}</i>:''}
-                                  
+
                                 </span>
                                 {indexs[i]&&indexs[i].includes(j)?<span className={style["addResult"]}>
                                   <img src={added} />
@@ -328,7 +328,7 @@ class ChronicInfo extends React.Component{
                                 confirm={this.confirmOption.bind(this,v,i)}
                                 footer="true">
                                 <div className={style["infoOption"]}>
-                                  <span>是否贫血：</span>
+                                  <span>{it.content.name?it.content.name+'：':''}</span>
                                   {it.content.details&&it.content.details.map((lis,ind)=>{
                                     return <div className={style["chooseItem"]}>
                                       <Radio label={lis.detailName}
@@ -358,7 +358,6 @@ class ChronicInfo extends React.Component{
     </div>;
     const {chronicMagItem,showList,tableList,scaleInfo,data,saveAssessInfos,chronicDesease,formulaResult,showHide} = this.props;
     const {showInfo,showOption,showAssess,isAssessConfirm,tableName,tableId,parentId,possible,radioVal} = this.state;
-    //console.log(8989,chronicMagItem,chronicDesease);
     return <div className={style["tips"]} style={{marginBottom:'15px'}}>
               <div className={`${style["tips-title"]} ${style["chronic"]}`}>
                 <div className={style["tips-name"]}>