bug：1935，1922,1921,1888,1884

src/common/components/Calendar/index.jsx

@@ -114,7 +114,9 @@ class Calendar extends React.Component {
       second: this.state.select.second
     };
     this.setState({
-      select: info
+      select: info,
+      month:this.month,
+      year:this.year
     });
     // this.props.timeSure(Object.assign({}, info))
     this.props.handleChange(info);

src/components/AddAssistCheck/index.jsx

@@ -37,7 +37,7 @@ class AddAssistCheck extends React.Component {
       if (_con && searchWrapAssist != event.target && !_con.is(event.target) && _con.has(event.target).length === 0) { // Mark 1
         this.setState({ show: false });
       }
-      if (!_cons.is(event.target) && _cons.has(event.target).length === 0) { // Mark 1
+      if (!_cons.is(event.target) && _cons.has(event.target).length === 0 || event.target.isEqualNode(_close)) { // Mark 1
         this.setState({ date: false });
       }
       

src/components/WrapModalBody/WrapModalTableSon/index.jsx

@@ -6,8 +6,12 @@ import {getStatusImg} from '@utils/tools';
 
 class WrapModalTableSon extends React.Component {
   constructor(props) {
-    super(props)
+    super(props);
+    this.state = {
+      msg:'选中异常值数据'
+    }
     this.getImgPath = this.getImgPath.bind(this)
+    this.selectWaring = this.selectWaring.bind(this)
   }
   getImgPath(name,groupName,item){
     const { checkedList,selectOneCheck } = this.props;
@@ -24,11 +28,19 @@ class WrapModalTableSon extends React.Component {
       return <img className={style.check} onClick={()=>selectOneCheck(name,groupName,item)} src={check_circle} alt="" />
     }
   }
+  selectWaring(){
+    let tmpMsg = this.state.msg
+    const { selectWaring } = this.props;
+    this.setState({
+      msg:tmpMsg=='选中异常值数据'?'取消选中异常值数据集':'选中异常值数据'
+    })
+    selectWaring&&selectWaring()
+  }
   render() {
-    const { hospitalSonInspect,allCheckImportIns,allCheck,selectWaring } = this.props;
+    const { hospitalSonInspect,allCheckImportIns,allCheck } = this.props;
     return <div className={style['modalTable']}>
       <div className={style.sonTitle}>
-        <span>组名称 : {hospitalSonInspect.groupName}</span><span className={style.btn} onClick={selectWaring}>选中异常值数据</span>
+        <span>组名称 : {hospitalSonInspect.groupName}</span><span className={style.btn} onClick={this.selectWaring}>{this.state.msg}</span>
       </div>
       <div className={`${style.SonTable}`}>
         <table>