Merge remote-tracking branch 'origin/dev/new1' into dev/new1

src/components/ChronicInfo/index.jsx

@@ -333,7 +333,7 @@ class ChronicInfo extends React.Component{
                                   加入病历记录
                                 </span>
                             }
-                            <MiniToast title={it.content.name}
+                            {formulaId&&formulaId==v.id&&<MiniToast title={it.content.name}
                                 icon={allTableIcon}
                                 show={formulaId&&formulaId==v.id?true:false}
                                 close={this.closeFormula}
@@ -387,7 +387,7 @@ class ChronicInfo extends React.Component{
                                   })}
                                 </table>
                                 
-                            </MiniToast>
+                            </MiniToast>}
                           </div>
                         }else if(it.type==3){
                           return <div className={style["marTop"]}>

src/components/Treat/AdverseReactions/index.jsx

@@ -75,7 +75,7 @@ class AdverseReactions extends Component {
                         
                     </span>
                         {item.details.map((it, idx) => {
-                            return <span key={item.id + it.name}>
+                            return <span className={style['adverse-reactions-name']} key={item.id + it.name}>
                                 <input type="checkbox" checked={it.value == 1} id={item.id + it.name} onChange={this.changeReact.bind(this, it, index)}/>
                                 <label for={item.id + it.name}> {it.name} </label>
                             </span>

src/components/Treat/AdverseReactions/index.less

@@ -46,4 +46,10 @@
 .last-treat-big-name {
     position: relative;
 }
+.adverse-reactions-name {
+    input, label {
+        cursor: pointer;
+    }
+    
+}
 

src/store/actions/pushMessage.js

@@ -113,7 +113,7 @@ export const addScheme = (state, action) => {
 	 //将同类药添加到一起
 	for (let i = 0; i < scheme[RepeatIndex].treatment.length; i++) {
 		for (let j = 0; j < treatment.length; j++) {
-			if (scheme[RepeatIndex].treatment[i].id === treatment[j].id && scheme[RepeatIndex].treatment[i].bigdrugsName === treatment[j].bigdrugsName) {
+			if (scheme[RepeatIndex].treatment[i].id === treatment[j].id && scheme[RepeatIndex].treatment[i].bigdrugsName === treatment[j].bigdrugsName && scheme[RepeatIndex].treatment[i].subdrugsName === treatment[j].subdrugsName) {
 				for(let z = 0; z < treatment[j].medicitionsList.length; z++) {
 					if(treatment[j].medicitionsList[z].selected) {
 						if(scheme[RepeatIndex].treatment[i].treatmentStr !== '') {