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

src/store/async-actions/diagnosticList.js

@@ -8,8 +8,10 @@ export const isAddMainSuit = () =>{
             const isAddMainSuitFlag = state.mainSuit.data && state.mainSuit.data.length === 0 && state.mainSuit.saveText    //判断主诉和化验查体是否为空
                                       && (state.mainSuit.saveText.length === 0 || state.mainSuit.saveText.length === 1 
                                       &&  state.mainSuit.saveText[0] === '') && state.assistCheck && state.assistCheck.dataString.length === 0
-                                      && state.inspect.labelList && state.inspect.labelList.length === 0 && state.inspect.inspectStrPlus && state.inspect.inspectStrPlus.length === 0
-                                    
+                                      && state.inspect.labelList && state.inspect.labelList.length === 0 && state.inspect.inspectStrPlus.length === 0
+            console.log('isAddMainSuitFlag', state.mainSuit.data && state.mainSuit.data.length === 0 && state.mainSuit.saveText    //判断主诉和化验查体是否为空
+            && (state.mainSuit.saveText.length === 0 || state.mainSuit.saveText.length === 1 
+            &&  state.mainSuit.saveText[0] === '')&& state.assistCheck && state.assistCheck.dataString.length === 0 && state.inspect.labelList && state.inspect.labelList.length === 0  && state.inspect.inspectStrPlus.length === 0  )                     
             if(isAddMainSuitFlag) {
                 dispatch({
                     type:ISREAD