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

src/components/DiagnosticList/index.jsx

@@ -22,8 +22,11 @@ class DiagnosticList extends Component {
         this.handleClickDiag = this.handleClickDiag.bind(this);
     }
 
-    componentWillReceiveProps() {
-        this.props.getBilling();
+    componentWillReceiveProps(nextprops) {
+        if (this.props.diagnosticStr != nextprops.diagnosticStr) {
+            this.props.getBilling();
+        }
+        
     }
 
     upDiagnostic(index) {

src/containers/DiagnosticList.js

@@ -13,7 +13,8 @@ function mapStateToProps(state) {
     return {
         list: state.diagnosticList.diagnosticList,
         treatment: state.treat.show,
-        isFirst: state.diagnosticList.isFirst
+        isFirst: state.diagnosticList.isFirst,
+        diagnosticStr: state.diagnosticList.diagnosticStr
     }
 }
 

src/store/async-actions/diagnosticList.js

@@ -9,9 +9,6 @@ export const isAddMainSuit = () =>{
                                       && (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
-            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