Merge branch 'dev5.4.1' into dev/new1

src/components/Treat/AdverseReactions/index.jsx

@@ -75,10 +75,10 @@ class AdverseReactions extends Component {
                         
                     </span>
                         {item.details.map((it, idx) => {
-                            return <span className={style['adverse-reactions-name']} key={item.conceptId + item.name + it.name}>
-                                <input type="radio" checked={it.select} id={item.conceptId +item.name + it.name} onChange={this.changeReact.bind(this, it, index)}/>
+                            return <span className={`style['adverse-reactions-name'] ${it.value == 1 ? style['selectd']:''}`} key={item.conceptId + item.name + it.name}>
+                                <input type="radio" checked={it.value == 1}  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>}
+                                {/* {it.value==1 && <span className={style['adverse-reactions-recommend']}>(智能推荐)</span>} */}
                             </span>
                         })}
                     </div>)

src/components/Treat/AdverseReactions/index.less

@@ -58,4 +58,7 @@
     }
 
 }
+.selectd{
+    color: #3B9ED0;
+}
 

src/store/actions/treat.js

@@ -167,9 +167,9 @@ export const changeReact=(state,action)=>{
     const res = JSON.parse(JSON.stringify(state));
     const index = action.index
     res.adversReactionList[index].details = res.adversReactionList[index].details.map(item => {
-      item.select = false;
+      item.value = 0;
       if(item.name == action.it.name){
-        item.select = !item.select
+        item.value = 1
       }
       return item
     })

src/store/async-actions/treat.js

@@ -178,8 +178,8 @@ function getTreatment(item, dispatch, state,url,params, isChronic) {
                                          if(adverseEvent[j].conceptId == allAdversReactionList[i].adversReactionList[z].conceptId && adverseEvent[j].name == allAdversReactionList[i].adversReactionList[z].name) {
                                              for(let x = 0; x < allAdversReactionList[i].adversReactionList[z].details.length; x++) {
                                                  for(let y = 0; y < adverseEvent[j].details.length; y++) {//判断每一项是否选择过
-                                                     if(allAdversReactionList[i].adversReactionList[z].details[x].name == adverseEvent[j].details[y].name && allAdversReactionList[i].adversReactionList[z].details[x].select) {
-                                                        adverseEvent[j].details[y].select = allAdversReactionList[i].adversReactionList[z].details[x].select
+                                                     if(allAdversReactionList[i].adversReactionList[z].details[x].name == adverseEvent[j].details[y].name && allAdversReactionList[i].adversReactionList[z].details[x].value == '1') {
+                                                        adverseEvent[j].details[y].value = allAdversReactionList[i].adversReactionList[z].details[x].value
                                                      }
                                                  }
                                              }