管理评估，图表接口对接

src/components/AssessResult/ChartItem/index.jsx

@@ -104,13 +104,13 @@ class ChartItem extends Component {
     return doms;
   }
   componentDidMount(){
-    const {initFn,pindex} = this.props;
+    const {initFn,pindex,disName} = this.props;
     const type = config.chartDismen;
     const times = this.getXAxisArr(config.chartDismen);
     const startTime=times[0];
     const endTime=times[times.length-1];
     const range = [startTime,endTime];
-    initFn&&initFn({range,rangeType:type,pindex,getNew:true});
+    initFn&&initFn({range,disName,rangeType:type,pindex,getNew:true});
   }
   render() {
     const {title,data,names} = this.props;

src/components/AssessResult/ScaleItem/index.jsx

@@ -177,17 +177,17 @@ class ScaleItem extends Component {
                         {scaleRes&&scaleRes.result?(' 【'+it.content.name+'】 结果：'+scaleRes.result.value+" "+(scaleRes.result.text||'')):'【'+it.content.name+'】'}
                         </span>;
         }else if(its.type==2){      //计算公式
-          const showRes = calcuResult&&calcuResult[item.id]||it.content.result;
-          const details = calcuValues&&calcuValues[item.id]||it.content.details;
+          const showRes = calcuResult&&calcuResult[item.conceptId]||it.content.result;
+          const details = calcuValues&&calcuValues[item.conceptId]||it.content.details;
           const cresult = showRes&&showRes[1]&&showRes[1].text;
                     temp = <div className={style['results']}>
                     <span>计算公式结果：</span>
-                    <span className={style["blue"]} onClick={this.showFormula.bind(this,item.id,it)}>{cresult?cresult:'请选择'}</span>
+                    <span className={style["blue"]} onClick={this.showFormula.bind(this,item.conceptId,it)}>{cresult?cresult:'请选择'}</span>
                     <img src={level1} />
                     <MiniToast title={it.content.name}
                                confirmText='关闭'
                                icon={allTableIcon}
-                               show={formulaId&&formulaId==item.id?true:false}
+                               show={formulaId&&formulaId==item.conceptId?true:false}
                                close={this.closeFormula}
                                confirm={this.closeFormula}
                                footer="true">
@@ -204,7 +204,7 @@ class ScaleItem extends Component {
                                     <Radio label={ii.detailName}
                                            isSelect={ii.state == 1}
                                            disabled={disabled}
-                                           handleClick={this.handleForRadio.bind(this,item.id,details,idd,ind)}>
+                                           handleClick={this.handleForRadio.bind(this,item.conceptId,details,idd,ind)}>
                                       >
                                     </Radio>
                                   </div>
@@ -217,7 +217,7 @@ class ScaleItem extends Component {
                                 <span>{'请输入'+item1.name+'：'}</span>
                               </td>
                               <td>
-                                {disabled?item1.value:<input type="text" placeholder="请输入"  value={item1.value} onInput={(e)=>this.handleInputformula(item.id,details,idd,e)}/>}
+                                {disabled?item1.value:<input type="text" placeholder="请输入"  value={item1.value} onInput={(e)=>this.handleInputformula(item.conceptId,details,idd,e)}/>}
                               </td>
                               <td>
                                 <span>{item1.uint}</span>
@@ -245,13 +245,13 @@ class ScaleItem extends Component {
         }else if(its.type==3){
           temp = <div className={style['results']}>
                     <span>可能结果：</span>
-                    <span onClick={this.showOption.bind(this,item.id)} className={style["blue"]}>{possible&&possible[item.id]?possible[item.id]:'请选择'}</span>
+                    <span onClick={this.showOption.bind(this,item.conceptId)} className={style["blue"]}>{possible&&possible[item.conceptId]?possible[item.conceptId]:'请选择'}</span>
                     <img src={level1} />
                     <MiniToast title='结果选择'
                          icon={checkIcon}
-                         show={optionId&&optionId==item.id?true:false}
+                         show={optionId&&optionId==item.conceptId?true:false}
                          close={this.closeOption}
-                         confirm={this.confirmOption.bind(this,item.id)}
+                         confirm={this.confirmOption.bind(this,item.conceptId)}
                          footer="true">
                         <div className={style["infoOption"]}>
                           <span>{it.content.name?it.content.name+'：':''}</span>
@@ -259,7 +259,7 @@ class ScaleItem extends Component {
                             return <div className={style["chooseItem"]}>
                               <Radio label={lis.detailName}
                                      disabled={disabled}
-                                     isSelect={radioVal&&radioVal[item.id]==lis.detailName}
+                                     isSelect={radioVal&&radioVal[item.conceptId]==lis.detailName}
                                      handleClick={this.handleRadio.bind(this,lis,item,i)}>
                               </Radio>
                               {lis.state==1?<span className={style['recomand']}>（智能推荐）</span>:''}

src/components/AssessResult/index.jsx

@@ -155,6 +155,7 @@ class AssessResult extends Component {
         return <ChartItem title={name}
                           data={chartData||{}}
                           names={indexNames||{}}
+                          disName = {item.diseaseName}
                           timeTypes={JSON.stringify(chartTimeTypes)=='{}'?timeTypes&&timeTypes[i]:chartTimeTypes[i]}
                           pindex={i}
                           initFn={getIndexData}

src/components/DiagnosticList/index.jsx

@@ -105,7 +105,7 @@ class DiagnosticList extends Component {
     handleClickDiag(item) {
         const { getTips } = this.props;
         // getTips && getTips(item);
-        getTips && getTips({id:item.id, type:7, name: item.name, position: 1});
+        getTips && getTips({id:item.conceptId, type:7, name: item.name, position: 1});
     }
     referRecord() {
         const { hideReferRecord, showHistoryCaseModal ,chronicMagItem,hisTemplates,autoFillModules,typeConfig} = this.props
@@ -192,11 +192,11 @@ class DiagnosticList extends Component {
         </div>)
     }
     showAssessFn(item){
-        if(item&&item.id){         //显示评估弹窗
+        if(item&&item.conceptId){         //显示评估弹窗
           this.setState({
             showAssess:true,
             isAssessConfirm:false,
-            assessId:item.id,
+            assessId:item.conceptId,
             disName:item.name
           });
         }else{          //关闭评估弹窗
@@ -259,8 +259,8 @@ class DiagnosticList extends Component {
                     {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['慢病用药内容'] &&  item.drugHistory['慢病用药内容'].length > 0) || (item.drugHistory &&item.drugHistory['普通病用药内容'] &&  item.drugHistory['普通病用药内容'].length > 0) ||item.follow)
-                        isChronic = chronicLine&&item.type==2&&chronicList.findIndex((it)=>it.id==item.id)!=-1;
-                        return (<div draggable={true} className={style['diag-box'] + ' clearfix'}  key={item.id} >
+                        isChronic = chronicLine&&item.type==2&&chronicList.findIndex((it)=>it.conceptId==item.conceptId)!=-1;
+                        return (<div draggable={true} className={style['diag-box'] + ' clearfix'}  key={item.conceptId} >
                                     {index === 0 ? '' : <span className={style['diag-up']} onClick={() => {this.upDiagnostic(index)}}><img className={style["diag-up"]} src={diagUp}/></span>}
                                     {list.length === 1 ? '' : index !== 0 ? '' : <span onClick={() => {this.downDiagnostic(index)}} className={style['diag-down']}><img className={style["diag-down"]} src={diagDown}/></span>}
                                     <span className={style['diag-number']} style={{fontWeight:index === 0 ?'bold':'normal'}}>{index === 0 ? '1' : index+1}</span>

src/containers/AssessResult.js

@@ -55,14 +55,25 @@ function mapDispatchToProps(dispatch) {
             data:res.data.data,
             name:disName
           })
+        }else{
+          dispatch({
+            type:SET_ASSESS_DATA,
+            data:[],
+            name:disName
+          })
         }
       }).catch(error=>{
+        dispatch({
+          type:SET_ASSESS_DATA,
+          data:[],
+          name:disName
+        });
         console.log(error);
       });
     },
     getIndexData(param){        //获取评估图表数据
-      const {range,rangeType,index,pindex,getNew} = param;
-      dispatch(getIndexData(range)).then((res)=>{
+      const {range,rangeType,index,pindex,getNew,disName} = param;
+      dispatch(getIndexData(range,disName)).then((res)=>{
         if(res.data.code=='0'){
           dispatch({
             type:SET_INDEX_DATA,

src/store/async-actions/fetchModules.js

@@ -276,11 +276,11 @@ export function getAssessHis(id){
   }
 }
 //获取评估中图表数据
-export function getIndexData(range){
+export function getIndexData(range,disName){
   return (dispatch,getStore)=>{
     const {patInfo} = getStore();
     const param = {
-      diseaseId:21773,
+      diseaseName:disName,
       startTime:range[0],
       endTime:range[1]+" 23:23:59",
       patientId:patInfo.message.patientId,

src/utils/tools.js

@@ -923,12 +923,12 @@ function parseChartData(indexData){
   if(!indexData){
     return [];
   }
-  indexData.itemIndexData.map((it)=>{
+  indexData.indexData.map((it)=>{
     temp=indexData.indexConfigData.find((i)=>{return it.itemName==i.indexUnique});
-    arr=obj[temp.indexDesc]||[];
-    nameArr=nameObj[temp.indexDesc]||[];
-    obj[temp.indexDesc]=[...arr,it];
-    nameObj[temp.indexDesc]=[...nameArr,it.itemName];
+    arr=obj[temp.groupType]||[];
+    nameArr=nameObj[temp.groupType]||[];
+    obj[temp.groupType]=[...arr,it];
+    nameObj[temp.groupType]=[...nameArr,it.itemName];
   });
   //nameObj,obj;
   return {nameObj,obj};