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

src/components/PushItems/index.jsx

@@ -232,7 +232,7 @@ class PushItems extends Component {
                 推荐检验检查
                 <div className={style["billing"]} 
                      style={assay.length === 0 && check.length === 0 ? {color: 'gray', border: '1px solid gray'} : ''} 
-                     onClick={assay.length === 0 && check.length === 0 ? billing :''}>
+                     onClick={assay.length === 0 && check.length === 0 ? '' : billing}>
                     开单
                 </div>
               </h1>

src/containers/PushItemsContainer.js

@@ -22,7 +22,6 @@ function mapDispatchToProps(dispatch) {
             dispatch({type: CHANGE_CHECK, item})
         },
         addDiagnostic: (item) => {
-            dispatch(isAddMainSuit())
             dispatch({
                 type: ADD_DIAGNOSTIC,
                 item: item
@@ -30,6 +29,7 @@ function mapDispatchToProps(dispatch) {
             dispatch({
                 type: GET_DIAGNOSTIC_STR
             });
+            dispatch(isAddMainSuit())
             dispatch(billing());
         },
         billing: (checkedAssay, checkedCheck) => {

src/store/async-actions/diagnosticList.js

@@ -1,7 +1,6 @@
 import { SET_DIAG_TO_MAINSUIT } from '@store/types/diagnosticList';
 import { SAVE_FREE } from '@store/types/mainSuit';
 import {ISREAD} from "../types/homePage";
-import {billing} from '@store/async-actions/pushMessage';
 export const isAddMainSuit = () =>{
     return (dispatch, getState) => {
         const state = getState();
@@ -22,7 +21,6 @@ export const isAddMainSuit = () =>{
                     type: SAVE_FREE,
                     data:state.diagnosticList.diagnosticStr
                 })
-                dispatch(billing());
             }
         }