Merge branch 'dev/new1' of http://192.168.2.236:10080/zhouna/newICSS into dev/new1

src/store/async-actions/treat.js

@@ -398,6 +398,7 @@ export const getInstroduce = (item, type, position)=>{
 export const commonTreatAddToAdvice = () => {
     return (dispatch, getState) => {
         const state = getState();
+
         const followUp = state.treat.followUp
         if(state.treat.treatItem.conceptId === state.diagnosticList.diagnosticList[0].conceptId && state.treat.isFirstMainDiag) {
             dispatch({
@@ -405,7 +406,7 @@ export const commonTreatAddToAdvice = () => {
             })
             dispatch({
                 type: SET_COMMONTREATMENT,
-                commontreatment: state.treat.treatItem.treat.commonTreatment.content
+                commontreatment: state.treat.generalTreat.content
             })
             if(followUp) {
                 dispatch({