diff --git a/packages/common/business_components/src/ui/map/Gis.js b/packages/common/business_components/src/ui/map/Gis.js
index d5366a525..de36a4144 100644
--- a/packages/common/business_components/src/ui/map/Gis.js
+++ b/packages/common/business_components/src/ui/map/Gis.js
@@ -90,11 +90,11 @@ function Gis({
 			const layerName = layerNmRef.current
 			if (layerName === '하수재이용시설') {
 				featureId = data.searchPk;
-			  } else if (layerName === '빗물이용시설') {
+			  } else if (layerName === '빗물이용시설'|| layerName == '중수도시설') {
 				featureId = data.bdstInfoPk;
 			  } else if (layerName === '하수처리시설') {
 				featureId = data.bscFctCd;
-			  } else if (layerName === '중수도시설' || layerName == '온배수시설') {
+			  } else if (layerName === '온배수시설' ) {
 				featureId = data.bdstRuseFcltPk;
 			  } else {
 				console.warn('해당 레이어에 대한 featureId 매핑 없음', layerNm);
diff --git a/packages/common/components/src/ui/date-picker/index.tsx b/packages/common/components/src/ui/date-picker/index.tsx
index 85c584e5f..ee5d37872 100644
--- a/packages/common/components/src/ui/date-picker/index.tsx
+++ b/packages/common/components/src/ui/date-picker/index.tsx
@@ -2,7 +2,7 @@ import "./date-picker.css";
 
 import { format } from "date-fns";
 import { CalendarIcon } from "lucide-react";
-import type { DayPicker } from "react-day-picker";
+import type { DayPickerSingleProps } from "react-day-picker";
 
 import { cn } from "../../lib/utils";
 import { Button } from "../button";
@@ -12,15 +12,12 @@ import { Popover, PopoverContent, PopoverTrigger } from "../popover";
 type DatePickerProps = {
   placeholder?: string;
   disabled?: boolean;
-  selected?: Date;
-  zIndex?: number; // z-index prop 추가
-} & React.ComponentProps<typeof DayPicker>;
+} & DayPickerSingleProps;
 
 export function DatePicker({
   className,
   placeholder = "날짜 선택",
   disabled,
-  zIndex, // zIndex prop 받기
   ...props
 }: DatePickerProps) {
   return (
@@ -39,11 +36,8 @@ export function DatePicker({
           )}
         </Button>
       </PopoverTrigger>
-      <PopoverContent
-        className="w-auto p-0"
-        style={{ zIndex: zIndex || 'auto' }}
-      >
-        <Calendar classNames={{ cell: "rounded-md" }} {...props} />
+      <PopoverContent className="w-auto p-0">
+        <Calendar initialFocus classNames={{ cell: "rounded-md" }} {...props} />
       </PopoverContent>
     </Popover>
   );