不良反应匹配加名称匹配（1678）

src/components/Treat/AdverseReactions/index.jsx

@@ -15,7 +15,7 @@ class AdverseReactions extends Component {
         this.setDrugInfo = this.setDrugInfo.bind(this);
       
     }
-    changeReact(it, index) {
+    changeReact(it, index, item) {
         this.props.changeReact(it, index);
     }
     handleMouseEnterDrug(index, item) {
@@ -55,7 +55,7 @@ class AdverseReactions extends Component {
                 {/* {console.log('adversReactionList', adversReactionList)} */}
 
                 {adversReactionList.map((item, index) => {
-                    return (<div className={style['adverse-reactions-item']} key={item.conceptId}>
+                    return (<div className={style['adverse-reactions-item']} key={item.conceptId+item.name}>
                     <span className={style['last-treat-name-box']}>   
                         <span   
                                 className={style['last-treat-big-name-box']} 
@@ -74,9 +74,9 @@ class AdverseReactions extends Component {
                         
                     </span>
                         {item.details.map((it, idx) => {
-                            return <span className={style['adverse-reactions-name']} key={item.id + it.name}>
-                                <input type="checkbox" checked={it.select} id={item.id + it.name} onChange={this.changeReact.bind(this, it, index)}/>
-                                <label for={item.id + it.name}> {it.name} </label>
+                            return <span className={style['adverse-reactions-name']} key={item.conceptId + item.name + it.name}>
+                                <input type="checkbox" checked={it.select} id={item.conceptId +item.name + it.name} onChange={this.changeReact.bind(this, it, index)}/>
+                                <label for={item.conceptId +item.name + it.name}> {it.name} </label>
                                 {it.value==1 && <span className={style['adverse-reactions-recommend']}>(智能推荐)</span>}
                             </span>
                         })}

src/store/async-actions/treat.js

@@ -87,7 +87,6 @@ export const addDiagnostic = (item) => {
 
 //判断是否存在治疗方案
 function hasTreatment(dispatch, state,item,url, params) {
-    console.log('state',state)
     const itemTreat = JSON.parse(JSON.stringify(item))
     json(url, params).then((data) =>{
         if (data.data.data) {
@@ -219,7 +218,7 @@ function getTreatment(item, dispatch, state,url,params, isChronic) {
                              if(item.conceptId == allAdversReactionList[i].conceptId) {    //判断是否存过不良反应
                                  for (let j = 0; j < adverseReactions.length; j++) { //判断不良反应是否有相同的不良反应，如果有，替换
                                      for(let z = 0; z < allAdversReactionList[i].adversReactionList.length; z++) {
-                                         if(adverseReactions[j].conceptId == allAdversReactionList[i].adversReactionList[z].conceptId) {
+                                         if(adverseReactions[j].conceptId == allAdversReactionList[i].adversReactionList[z].conceptId && adverseReactions[j].name == allAdversReactionList[i].adversReactionList[z].name) {
                                              for(let x = 0; x < allAdversReactionList[i].adversReactionList[z].details.length; x++) {
                                                  for(let y = 0; y < adverseReactions[j].details.length; y++) {//判断每一项是否选择过
                                                      if(allAdversReactionList[i].adversReactionList[z].details[x].name == adverseReactions[j].details[y].name && allAdversReactionList[i].adversReactionList[z].details[x].select) {