bug1777

src/components/Emergency/index.jsx

@@ -104,28 +104,27 @@ class EmergencyHis extends Component{
     const {chooseItem,index,filtFlag,changeInd} = this.state;
     const {addSecond,data} = this.props;
     if(chooseItem.trim()){
+      // 在非默认筛选条件下添加二次诊断后重新调筛选接口
+      if(filtFlag !== -1){
+        if(filtFlag ==0){//无二次诊断添加后重置index
+          this.setState({
+            index:0,
+            changeInd:!changeInd //重置list中的index标识
+          })
+        }
+      }
       // 添加接口
       const item = {
         name:chooseItem,
         id:data[index].inquiryId
       }
-      addSecond&&addSecond(item);
+      addSecond&&addSecond({item,flag:filtFlag});
       this.searInp.current.value = "";
       this.setState({
         valChange:true,
         chooseItem:''
       });
     }
-    // 在非默认筛选条件下添加二次诊断后重新调筛选接口
-    if(filtFlag !== -1){
-      this.handleFilter({flag:filtFlag});
-      if(filtFlag ==0){//无二次诊断添加后重置index
-        this.setState({
-          index:0,
-          changeInd:!changeInd //重置list中的index标识
-        })
-      }
-    }
   }
 
   componentWillUnmount(){

src/containers/Emergency.js

@@ -35,12 +35,12 @@ const mapDispatchToProps = function(dispatch){
     handleChangeValue(val){
       dispatch(getSearchList(val,true))
     },
-    async addSecond(item){
-      // dispatch(addSecondDiag(item))
-      let resData = await addSecondDiag(item);
+    async addSecond(obj){
+      let resData = await addSecondDiag(obj.item);
       if(resData&&resData.data.code==0){
         Notify.info("添加成功");
-        dispatch(getFilterHis({flag:-1}));
+        // dispatch(getFilterHis({flag:-1}));
+        dispatch(getFilterHis({flag:obj.flag}));
       }
       
     }