diff --git a/src/components/analysis/history/AnalysisHistorySearch.js b/src/components/analysis/history/AnalysisHistorySearch.js
index 30d23c1..61553e8 100644
--- a/src/components/analysis/history/AnalysisHistorySearch.js
+++ b/src/components/analysis/history/AnalysisHistorySearch.js
@@ -13,20 +13,15 @@ import {
 } from 'reactstrap';
 
 export const AnalysisHistorySearch = props => {
-  const [isClick, setIsClick] = useState(1);
-  const [dateType, setDateType] = useState(1);
+
   useEffect(() => {
     props.setParams({
       ...props.params,
-      stDate: moment().subtract(dateType, 'day').format('YYYY-MM-DD')
+      stDate: moment().subtract(props.dateType, 'day').format('YYYY-MM-DD')
     });
   
-  }, [dateType,props.params.groupId]);
+  }, [props.dateType,props.params.groupId]);
 
-  const handlerClickDate = val => {
-    setDateType(val);
-    setIsClick(val);
-  };
 
 
 
@@ -89,32 +84,32 @@ export const AnalysisHistorySearch = props => {
                                 <Button
                                   outline
                                   size='sm'
-                                  className={isClick == 1 ? 'active' : ''}
-                                  onClick={e => handlerClickDate(1)}
+                                  className={props.isClick == 1 ? 'active' : ''}
+                                  onClick={e => props.handlerClickDate(1)}
                                 >
                                   최근1일
                                 </Button>
                                 <Button
                                   outline
-                                  className={isClick == 7 ? 'active' : ''}
+                                  className={props.isClick == 7 ? 'active' : ''}
                                   size='sm'
-                                  onClick={e => handlerClickDate(7)}
+                                  onClick={e => props.handlerClickDate(7)}
                                 >
                                   최근7일
                                 </Button>
                                 <Button
                                   outline
-                                  className={isClick == 15 ? 'active' : ''}
+                                  className={props.isClick == 15 ? 'active' : ''}
                                   size='sm'
-                                  onClick={e => handlerClickDate(15)}
+                                  onClick={e => props.handlerClickDate(15)}
                                 >
                                   최근 15일
                                 </Button>
                                 <Button
                                   outline
-                                  className={isClick == 30 ? 'active' : ''}
+                                  className={props.isClick == 30 ? 'active' : ''}
                                   size='sm'
-                                  onClick={e => handlerClickDate(30)}
+                                  onClick={e => props.handlerClickDate(30)}
                                 >
                                   최근 30일
                                 </Button>
diff --git a/src/containers/analysis/history/AnalysisHistoryContainer.js b/src/containers/analysis/history/AnalysisHistoryContainer.js
index c55aa4a..c56b0a7 100644
--- a/src/containers/analysis/history/AnalysisHistoryContainer.js
+++ b/src/containers/analysis/history/AnalysisHistoryContainer.js
@@ -35,6 +35,10 @@ export const AnalysisHistoryContainer = props => {
   const { joinList, joinListCount } = useSelector(state => state.groupState);
   const { user } = useSelector(state => state.authState, shallowEqual);
 
+  const [isClick, setIsClick] = useState(1);
+  const [dateType, setDateType] = useState(1);
+
+
   const handleGroupSelect = ({ groupId, groupNm, groupAuthCd }) => {
     // 권한 상관 없이 모두 조회 가능
     const param = searchData;
@@ -247,10 +251,15 @@ export const AnalysisHistoryContainer = props => {
           stDate: moment(val[0]).format('YYYY-MM-DD'),
           endDate: moment(val[1]).format('YYYY-MM-DD'),
         });
-        
+        setIsClick(0)
       }
     }
   };
+  const handlerClickDate = val => {
+    setDateType(val);
+    setIsClick(val);
+  };
+
   return (
 
     <CustomMainLayout title={titleName}>
@@ -274,6 +283,9 @@ export const AnalysisHistoryContainer = props => {
                   params={params}
                   onKeyPress={onKeyPress}
                   setParams={setParams}
+                  isClick={isClick}
+                  dateType={dateType}
+                  handlerClickDate={handlerClickDate}
                 />
               </>