Merge remote-tracking branch 'origin/dev5.3.1' into dev5.3.1

src/store/async-actions/treat.js

@@ -406,7 +406,7 @@ export const commonTreatAddToAdvice = () => {
             })
             dispatch({
                 type: SET_COMMONTREATMENT,
-                commontreatment: state.treat.generalTreat.content
+                commontreatment: state.treat.generalTreat&&state.treat.generalTreat.content
             })
             if(followUp) {
                 dispatch({
@@ -415,7 +415,7 @@ export const commonTreatAddToAdvice = () => {
                     hasFollowUp: true
                 })
             }
-            if(state.treat.generalTreat.content || followUp) { //如果一般治疗和回访时间存在，定位到医嘱
+            if(state.treat.generalTreat&&state.treat.generalTreat.content || followUp) { //如果一般治疗和回访时间存在，定位到医嘱
                 document.getElementById("adviceBox").scrollIntoView(true)
             }