diff --git a/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx b/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx
index e5c9241d5..d61478a75 100644
--- a/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltReg/pbnstReg/page.tsx
@@ -1,7 +1,6 @@
 "use client";
 import {
   ContentsDiv,
-  DateMonthPicker,
   ScrollArea,
   SearchDiv,
   SearchFormLeft,
@@ -40,7 +39,6 @@ export default function PublicReuseFaciltyInsert() {
   const {
     code,
     pbnst,
-    searchFclts,
     pubHasuInit,
     pbnstInsert,
     pbnstRegClick,
@@ -60,7 +58,7 @@ export default function PublicReuseFaciltyInsert() {
   const [bdstTable, setbdstTable] = useState<pubHasuType[]>();
   const [selectRow, setSelectRow] = useState<pubHasuType>();
   const [pageNation, setPageNation] = useState<number>(1);
-
+  const [testMonth, setTestMonth] = useState<string>("202406");
   const form = useForm<{
     items: z.infer<typeof pbnstRegZod>[];
   }>({
@@ -165,17 +163,16 @@ export default function PublicReuseFaciltyInsert() {
     console.log("bdstTable ", bdstTable);
   }, [bdstTable]);
 
-
   useEffect(() => {
-
-    if (code.sggCd.length &&pbnstHasuRes.length > 0) {
+    if (code.sggCd.length && pbnstHasuRes.length > 0) {
       setbdstTable(tableData(pbnstHasuRes, { code }));
-      // if (searchFclts) {
+      // if (searchFclts) {  // 왜 오류가 발생할까?
+
       //   setbdstTable(tableData(searchFclts, { code }));
       // } else if (code.sggCd.length > 0 && pbnstHasuRes.length > 0) {
       // }
     }
-  }, [code, pbnstHasuRes, searchFclts]);
+  }, [code, pbnstHasuRes]);
 
   const cellClick = (val: number | undefined) => {
     if (val === undefined) return;
@@ -192,10 +189,8 @@ export default function PublicReuseFaciltyInsert() {
 
   useEffect(() => {
     if (pbnst.pbnstRes && pbnst.pbnstRes?.length > 0) {
-      console.log("pbnst.pbnstRes", pbnstRes);
       form.reset({ items: pbnstRegArrayZod.parse(pbnst.pbnstRes) });
     } else {
-      console.log("pbnst.pbnstRes is null", pbnstRes);
       form.reset({ items: [] });
     }
   }, [pbnst.pbnstRes]);
@@ -252,10 +247,6 @@ export default function PublicReuseFaciltyInsert() {
     }
   }, [pbnstRegZod, pbnstRes, append, selectRow, form]);
 
-  useEffect(() => {
-    // console.log(" page getgetvaslue ", form.getValues());
-  }, [form.getValues()]);
-
   useEffect(() => {
     pubHasuInit(String(pageNation), "41");
   }, [pageNation, pubHasuInit]);
@@ -305,7 +296,6 @@ export default function PublicReuseFaciltyInsert() {
                   >
                     신규등록
                   </Button>
-          
                 </div>
               </SearchFormLeft>
             </SearchDiv>
diff --git a/apps/wr/app/ruseFcltMng/fcltReg/rswtReg/page.tsx b/apps/wr/app/ruseFcltMng/fcltReg/rswtReg/page.tsx
index 2931690b9..d57c730ce 100644
--- a/apps/wr/app/ruseFcltMng/fcltReg/rswtReg/page.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltReg/rswtReg/page.tsx
@@ -42,8 +42,8 @@ export default function Home() {
     }
   }, [rswt.isInit, initRswt]);
   useEffect(() => {
-    if (code.sggCd.length > 0) {
-      const rswtData = tableData(rswtRes, { code }).map(
+    if (code.sggCd.length > 0 && rswtRes?.length > 0) {
+      const rswtData = tableData(rswtRes, { code })?.map(
         (item: customRswtBdst) => {
           return {
             ...item,
@@ -151,7 +151,7 @@ export default function Home() {
         </div>
 
         <UiModal
-          body={<BdstReg moType="RST"></BdstReg>}
+          body={<BdstReg moType="RST" setIsModal={setIsNewReg}></BdstReg>}
           bodyClass="w-[68vw] max-w-none h-[90vh]"
           open={issNewReg}
           onOpenChange={(open) => {
@@ -162,7 +162,7 @@ export default function Home() {
           bodyClass={""}
           open={bdstChgProps.isOpen}
           body={
-            <BdstChgModal chgBuilding={bdstChgProps.chgBuilding}></BdstChgModal>
+            <BdstChgModal chgBuilding={bdstChgProps.chgBuilding} ></BdstChgModal>
           }
           onOpenChange={(open) => {
             setBdstChgProps({ ...bdstChgProps, isOpen: open });
diff --git a/apps/wr/app/ruseFcltMng/fcltSttn/rswtSttn/page.tsx b/apps/wr/app/ruseFcltMng/fcltSttn/rswtSttn/page.tsx
index 7a3444a9b..f9b3c6187 100644
--- a/apps/wr/app/ruseFcltMng/fcltSttn/rswtSttn/page.tsx
+++ b/apps/wr/app/ruseFcltMng/fcltSttn/rswtSttn/page.tsx
@@ -65,7 +65,7 @@ export default function RswtSttn() {
   }, [rswtSttn.isInit, rswtSttnInit]);
 
   useEffect(() => {
-    if (rswtSttnRes.length > 0 && code.cityCd.length > 0) {
+    if (rswtSttnRes?.length > 0 && code.cityCd.length > 0) {
       const data = tableData(rswtSttnRes, { code });
       const chData = data
         .map((item: customRswtBdst) => ({
diff --git a/apps/wr/app/store/common/searchCode/index.ts b/apps/wr/app/store/common/searchCode/index.ts
index 34c2c86c5..51ebda8a5 100644
--- a/apps/wr/app/store/common/searchCode/index.ts
+++ b/apps/wr/app/store/common/searchCode/index.ts
@@ -82,6 +82,7 @@ export const comFcltSearchAction: (set: any) => comFcltActions = (set: any) => {
         addr: item.addr,
         fctCpc: item.fctCpc,
       }));
+
       set((state: comFcltState) => ({
         ...state,
         searchFclts: searchFclts,
diff --git a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList.tsx b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList.tsx
index 3cc75d70c..d8057cad6 100644
--- a/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList.tsx
+++ b/apps/wr/app/store/prfmncReg/chkgdnReg/rainChkgdn/headList.tsx
@@ -17,7 +17,7 @@ export const chkgdRegExcel = z.object({
       },
       { message: "현재 년도보다 높은 수를 입력할 수 없습니다." }
     ),
-  file: z.instanceof(File).optional(),
+  file: z.instanceof(File).nullish(),
 });
 
 export const guideDetail = z.object({
diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx
index 0a51ebb5d..314d5762b 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/htdflReg/index.tsx
@@ -1,10 +1,63 @@
 import { getFetch, postFectch, putFectch } from "@/components/lib/api";
-import { upHeadList, type chgBuilding} from "../rainReg";
+import { upHeadList, type chgBuilding } from "../rainReg";
 
 import { z } from "zod";
 import { makeMdfr, makeRstr } from "../bdstReg";
+import {
+  baseReuseBuildingSchema,
+  chgBuildingSchema,
+  validationMessages,
+} from "../rainReg/type"; // Import baseReuseBuildingSchema, chgBuildingSchema, validationMessages
 import type { TableUpperProps } from "@/app/store/common/type/header";
 
+const hdtflObjSchema = z.object({
+  htdflFcltPk: z.number().nullish(),
+  bdstRuseFcltFk: z.number().nullish(),
+  etgtType: z
+    .string()
+    .min(1, { message: validationMessages.required("에너지원 종류") }),
+  fclCpct: z
+    .number()
+    .positive({ message: validationMessages.required("시설 용량") }),
+  plwtYn: z.enum(["Y", "N"]).default("Y"),
+  orgwtWtritSpt: z
+    .number()
+    .positive({ message: validationMessages.required("원수 취수량") }),
+  orgwtOcrnProcs: z
+    .string()
+    .min(1, { message: validationMessages.required("원수 발생 공정") }),
+  wtritEntrcTp: z
+    .number()
+    .max(100, { message: "온도는 100이상이 될 수 없습니다." })
+    .default(0), // Changed max to 100 based on message
+  amtgnr: z.number().default(0),
+  prcsProcsYn: z.enum(["Y", "N"]).default("Y"),
+  prcsFcltCpct: z
+    .number()
+    .positive({ message: validationMessages.required("처리시설 용량") }),
+  fmYn: z.string().default(""),
+  utztnCpct: z
+    .number()
+    .positive({ message: validationMessages.required("이용 용량") }),
+  utztnUsg: z
+    .string()
+    .min(1, { message: validationMessages.required("이용 용도") }),
+  grssClfg: z.number().default(0), // Measurements, 0 is fine as default
+  combResdch: z.number().default(0), // Measurements, 0 is fine as default
+  trbt: z.number().default(0), // Measurements, 0 is fine as default
+  bod: z.number().default(0), // Measurements, 0 is fine as default
+  smll: z.number().default(0), // Measurements, 0 is fine as default
+  crmty: z.number().default(0), // Measurements, 0 is fine as default
+  tn: z.number().default(0), // Measurements, 0 is fine as default
+  tph: z.number().default(0), // Measurements, 0 is fine as default
+  ph: z.number().default(0), // Measurements, 0 is fine as default
+  clIonQnt: z.number().default(0), // Measurements, 0 is fine as default
+  cdtnv: z.number().default(0), // Measurements, 0 is fine as default
+  emsnExitTp: z.number().default(0), // Measurements, 0 is fine as default
+  rgtr: z.string().nullish().default(null),
+  mdfr: z.string().nullish().default(null),
+});
+
 export const hdtflZod = z.object({
   bdstInfoPk: z.number().nullish(),
   ctpvCd: z.number().default(0),
@@ -14,85 +67,25 @@ export const hdtflZod = z.object({
   daddr: z.string().default(" "),
   bdstNm: z.string().default(" "),
   frstArchPrmsnDt: z.date().default(() => new Date()),
-  archChgPrmsnDt: z.date().default(() => new Date()).nullish() ,
+  archChgPrmsnDt: z
+    .date()
+    .default(() => new Date())
+    .nullish(),
   archArea: z.number().default(0),
   archChgArea: z.number().nullish().default(0),
-  rgtr:z.string().nullish().default(null),
-  mdfr:z.string().nullish().default(null),
+  rgtr: z.string().nullish().default(null),
+  mdfr: z.string().nullish().default(null),
   reuseBuilding: z
     .array(
-      z.object({
-        bdstRuseFcltPk: z.number().nullish(),
-        bdstInfoFk: z.number().nullish(),
-        instlCmptnDt: z.coerce.date().default(() => new Date()),
-        instlCst: z.number().nullish().default(0),
-        operMngCd: z.string().nullish().default(""),
-        anlOperCst: z.number().default(0),
-        instlCstSprtYn:  z.enum(["Y", "N"]).nullish(),
-        instlCstSprtAmt: z.number().nullish().default(0),
-        grntchBdstCertNo: z.string().nullish().default(""),
-        grntchBdstCertGrd: z.string().nullish().default(""),
-         ruseFcltFlg: z.string().nullish().default(""),
-        bdstUsgCd: z.number().default(0),
-        lawTrgtYn:  z.enum(["Y", "N"]).nullish(),
-        rgtr:z.string().nullish().default(null),
-        mdfr:z.string().nullish().default(null),
-        // htdflObj 매핑
-        htdflObj: z
-          .object({
-            htdflFcltPk: z.number().nullish(),
-            bdstRuseFcltFk: z.number().nullish(),
-            etgtType: z.string().default(""),
-            fclCpct: z.number().default(0),
-            plwtYn:  z.enum(["Y", "N"]), 
-            orgwtWtritSpt: z.number().default(0),
-            orgwtOcrnProcs: z.string().default(""),
-            wtritEntrcTp: z.number().max(4, "온도는 100이상이 될 수 없습니다.")
-            .default(0),
-            amtgnr: z.number().default(0),
-            prcsProcsYn: z.enum(["Y", "N"]), 
-            prcsFcltCpct: z.number().default(0),
-            fmYn: z.string().default(""),
-            utztnCpct: z.number().default(0),
-            utztnUsg: z.string().default(""),
-            grssClfg: z.number().default(0),
-            combResdch: z.number().default(0),
-            trbt: z.number().default(0),
-            bod: z.number().default(0),
-            smll: z.number().default(0),
-            crmty: z.number().default(0),
-            tn: z.number().default(0),
-            tph: z.number().default(0),
-            ph: z.number().default(0),
-            clIonQnt: z.number().default(0),
-            cdtnv: z.number().default(0),
-            emsnExitTp: z.number().default(0),
-            rgtr:z.string().nullish().default(null),
-            mdfr:z.string().nullish().default(null),
-          })
-          .default({
-            plwtYn: "N",
-            prcsProcsYn: "N",
-          }),
-      })
-    )
-    .default([]),
-  chgBuilding: z
-    .array(
-      z.object({
-        bdstInfoFk: z.number().nullish(),
-        archChgPrmsnDt: z.coerce.date() ,
-        archChgArea: z.string().default("-").nullish(),
-        bdstChgNm: z.string().default(""),
-        rgtr:z.string().nullish().default(null),
-        mdfr:z.string().nullish().default(null),
+      baseReuseBuildingSchema.extend({
+        htdflObj: hdtflObjSchema,
       })
     )
     .default([]),
+  chgBuilding: z.array(chgBuildingSchema).default([]), // Use imported chgBuildingSchema
 });
 
- export type customHtdflBdst = z.infer<typeof hdtflZod>
-
+export type customHtdflBdst = z.infer<typeof hdtflZod>;
 
 export type htdflFacState = {
   htdfl: {
@@ -102,11 +95,10 @@ export type htdflFacState = {
   };
 };
 type htdflFacSActions = {
-  initHtdfl: (code: string ) => void;
-  htdflBdstUpdate:(data: customHtdflBdst, code:string|number) => void;
-  htdflBdstReg:(data: customHtdflBdst, code:string|number) => void;
-  getHtdflBdstData:(pageNation:number, code:string|number) =>void;
-
+  initHtdfl: (code: string) => void;
+  htdflBdstUpdate: (data: customHtdflBdst, code: string | number) => void;
+  htdflBdstReg: (data: customHtdflBdst, code: string | number) => void;
+  getHtdflBdstData: (pageNation: number, code: string | number) => void;
 };
 
 const htdflRes: customHtdflBdst[] = [];
@@ -121,25 +113,22 @@ export const htdflFacStateExport: htdflFacState = {
   },
 };
 
+const initFetch = async (code: string | number) => {
+  const rswtRes = await getFetch("wr", `/facilityList/1/20/${code}`);
 
-const initFetch = async (code:string|number) => {
-  const rswtRes = await getFetch(
-    "wr",
-    `/facilityList/1/20/${code}`)
-    
   return rswtRes;
 };
 export const htdflFacActionsExport: (set: any) => htdflFacSActions = (
   set: any
 ) => {
   return {
- getHtdflBdstData: async (pageNation: number, code: string | number) => {
+    getHtdflBdstData: async (pageNation: number, code: string | number) => {
       try {
         const rswtRes = await getFetch(
           "wr",
           `/drain/facilityList/${pageNation}/20/${code}`
         );
-        console.log(pageNation)
+        console.log(pageNation);
         // 여기서 상태 업데이트
         return set((state: htdflFacState) => ({
           ...state,
@@ -154,8 +143,7 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = (
       }
     },
 
-
-    initHtdfl: async (code: string ) => {
+    initHtdfl: async (code: string) => {
       try {
         const htdflRes = await initFetch(code);
         set((state: htdflFacState) => {
@@ -172,9 +160,9 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = (
         console.log(error);
       }
     },
-    htdflBdstUpdate: async (data: customHtdflBdst, code:string|number) => {
+    htdflBdstUpdate: async (data: customHtdflBdst, code: string | number) => {
       try {
-         const chData=await  makeMdfr(data)
+        const chData = await makeMdfr(data);
         const res = await putFectch("/drain/facility", data);
         if (res.ok) {
           alert(" 수정이 완료되었습니다.");
@@ -196,18 +184,17 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = (
         );
       }
     },
-    htdflBdstReg: async (data: customHtdflBdst , code:string|number) => {
+    htdflBdstReg: async (data: customHtdflBdst, code: string | number) => {
       try {
-         const chData=await  makeRstr(data)
+        const chData = await makeRstr(data);
         const res = await postFectch("/drain/facility", data);
         if (res.ok) {
-
-          if(data.chgBuilding.length > 0){
+          if (data.chgBuilding.length > 0) {
             await res
               .json()
               .then((resData: any) => {
                 const chPK = resData?.data?.bdstInfoPk;
-                
+
                 const makeCh = resData.data.chgBuilding.map(
                   (item: chgBuilding) => ({
                     ...item,
@@ -222,9 +209,8 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = (
                   alert("등록이 완료되었습니다.");
                 }
               });
-          }else{
+          } else {
             alert("등록이 완료되었습니다.");
-
           }
         }
         const htdflRes = await initFetch(code);
@@ -238,7 +224,7 @@ export const htdflFacActionsExport: (set: any) => htdflFacSActions = (
         }));
       } catch (errorReg) {
         alert("등록 오류입니다.");
-      } 
+      }
     },
   };
 };
diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/index.tsx
index fb799c26c..67a9f36f4 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/index.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/pbnstReg/index.tsx
@@ -102,12 +102,10 @@ const checkWrRegList = async () => {
 const hasuListFetch = async (page: string, sggOrCity: string, searchTxt?:string) => {
   const checkWrRegListRes = await checkWrRegList();
 
-  console.log(' checkWrRegListRes ', checkWrRegListRes)
 let url = `/prcsFclt/ruseInfo/${page ? page : 1}/10/A/${sggOrCity? sggOrCity : "11"}/0/1/SW`;
 
 
 const data = checkWrRegListRes.filter((item:string) => item !== "")
-  console.log(' checkWrRegListRes ' )
 if(searchTxt){
   url= url +`/${searchTxt}`
 
@@ -177,6 +175,7 @@ export const pubFacActionsExport: (set: any) => pubFacActions = (set: any) => {
       try {
         const pbnstHasuRes = await hasuListFetch(page, sggOrCity);
 
+
         return set((state: pubFacState) => ({
           ...state,
           pbnst: {
diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx
index a029bd869..372a4bd9a 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/rainReg/index.tsx
@@ -22,9 +22,6 @@ const rainyObjSchema = z.object({
 });
 
 
-
-
-
  const rainBuildingSchema = baseReuseBuildingSchema.extend({
   rainyObj: rainyObjSchema,
 })
diff --git a/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx b/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx
index 3c2504b9a..178badd3b 100644
--- a/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx
+++ b/apps/wr/app/store/ruseFcltMng/fcltReg/rswtReg/index.tsx
@@ -1,10 +1,32 @@
 import { getFetch, postFectch, putFectch } from "@/components/lib/api";
-import { upHeadList, type chgBuilding } from "../rainReg";
+import {  upHeadList, type chgBuilding } from "../rainReg";
 
 import type { TableUpperProps } from "@/app/store/common/type/header";
 import { z } from "zod";
+import { baseReuseBuildingSchema, chgBuildingSchema, validationMessages } from "../rainReg/type";
 import { makeMdfr, makeRstr } from "../bdstReg";
 
+ const rswtrObjSchema = z.object({
+  bdstRuseFcltFk: z.number().nullish(),
+  wtrUsqty: z.number({ required_error: validationMessages.required("물사용량(m³)") }).positive({ message: validationMessages.required("물사용량(m³)") }),
+  oblgTrgtWtrUsqty: z.number().nullish().default(0),
+  orgwtKndCd: z.string({ required_error: validationMessages.requiredSelect("원수 종류") }).min(1, { message: validationMessages.requiredSelect("원수 종류") }),
+  filtrTrtmfctCpct: z.number({ required_error: validationMessages.required("처리시설 용량") }).positive({ message: validationMessages.required("처리시설 용량") }),
+  filtrTrtmfctProcs: z.string({ required_error: validationMessages.required("주요처리공정") }).min(1, { message: validationMessages.required("주요처리공정") }),
+  filtrTrtmfctUsgCd: z.string().default("").nullish(),
+  rswtrUsqty: z.number().default(0),
+  altUswtrUtztnYn: z.enum(["Y", "N"]).nullish(), //안쓰는값
+  altUswtrKndCd: z.string().default("").nullish(), //안쓰는값
+  altUswtrUtztnQnt: z.number().default(0), //안쓰는값
+  altUswtrIdntyMthdCd: z.string().default("").nullish(), //안쓰는값
+  rgtr: z.string().nullish().default(null),
+  mdfr: z.string().nullish().default(null),
+});
+
+ const rswtBuildingSchema = baseReuseBuildingSchema.extend({
+  rswtrObj: rswtrObjSchema,
+})
+
 export const rswtZod = z.object({
   bdstInfoPk: z.number().nullish(),
   ctpvCd: z.number().default(0),
@@ -21,73 +43,8 @@ export const rswtZod = z.object({
   bdstUsgText: z.string().default(""),
   cityText: z.string().default(""),
   sggText: z.string().default(""),
-
-  reuseBuilding: z
-    .array(
-      z.object({
-        bdstRuseFcltPk: z.number().nullish(),
-        bdstInfoFk: z.number().nullish(),
-        instlCmptnDt: z.coerce.date().default(() => new Date()),
-        instlCst: z.number().default(0),
-        operMngCd: z.string().nullish().default(""),
-
-        anlOperCst: z.number().default(0),
-        instlCstSprtYn: z.enum(["Y", "N"]),
-        instlCstSprtAmt: z.number().default(0),
-
-        grntchBdstCertYn: z.enum(["Y", "N"]),
-        grntchBdstCertYr: z
-          .string()
-          .default("")
-          .refine((year) => year.length === 0 || /^\d{4}$/.test(year), {
-            message: "4자리 연도만 입력하세요",
-          }),
-        grntchBdstCertNo: z.string().default(""),
-        grntchBdstCertGrd: z.string().default(""),
-
-        crgRdctYn: z.string().default("N").nullish(), // 안쓰는 값
-        crgRdctBss: z.string().default("").nullish(), /// 안쓰는 값
-        crgRdctAmt: z.number().default(0), // 안쓰는 값
-        ruseFcltFlg: z.string().default(""),
-        bdstUsgCd: z.number().default(0),
-        lawTrgtYn: z.string().default(""),
-        rgtr: z.string().nullish().default(null),
-        mdfr: z.string().nullish().default(null),
-
-        rswtrObj: z
-          .object({
-            bdstRuseFcltFk: z.number().nullish(),
-            wtrUsqty: z.number().default(0),
-            oblgTrgtWtrUsqty: z.number().nullish().default(0),
-            orgwtKndCd: z.string().default(""),
-            filtrTrtmfctCpct: z.number().default(0),
-            filtrTrtmfctProcs: z.string().default(""),
-            filtrTrtmfctUsgCd: z.string().default("").nullish(),
-            rswtrUsqty: z.number().default(0),
-            altUswtrUtztnYn: z.enum(["Y", "N"]).nullish(), //안쓰는값
-            altUswtrKndCd: z.string().default("").nullish(), //안쓰는값
-            altUswtrUtztnQnt: z.number().default(0), //안쓰는값
-            altUswtrIdntyMthdCd: z.string().default("").nullish(), //안쓰는값
-            rgtr: z.string().nullish().default(null),
-            mdfr: z.string().nullish().default(null),
-          })
-          .default({}),
-      })
-    )
-    .default([]),
-
-  chgBuilding: z
-    .array(
-      z.object({
-        bdstInfoFk: z.number().nullish(),
-        archChgPrmsnDt: z.coerce.date(),
-        archChgArea: z.string().default("-"),
-        bdstChgNm: z.string().default(""),
-        rgtr: z.string().nullish().default(null),
-        mdfr: z.string().nullish().default(null),
-      })
-    )
-    .default([]),
+  reuseBuilding: z.array(rswtBuildingSchema).default([]),
+  chgBuilding: z.array(chgBuildingSchema).default([]),
 });
 
 export type customRswtBdst = z.infer<typeof rswtZod>;
diff --git a/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx b/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx
index a4f29477a..d820bddc1 100644
--- a/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx
+++ b/apps/wr/components/ui/form/fcltReg/rswtrReg/rswtrRegForm.tsx
@@ -28,10 +28,12 @@ import BdstReg from "../bdstReg/bdstReg";
 export default function RswtrRegForm({
   rswtForm,
   isModal,
+  setIsModal,
   readonly = false
 }: {
   rswtForm: customRswtBdst;
   isModal: boolean;
+  setIsModal?: (isModal: boolean) => void;
   readonly?: boolean;
 }) {
   const { rswt, code, rswtBdstUpdate, rswtBdstReg } = useWrStore(
@@ -54,6 +56,7 @@ export default function RswtrRegForm({
   const onSubmit = (values: z.infer<typeof rswtZod>) => {
     if (isModal) {
       rswtBdstReg(values, "41");
+    if(setIsModal)  setIsModal(false)
     } else {
       rswtBdstUpdate(values, "41");
     }
@@ -61,28 +64,29 @@ export default function RswtrRegForm({
   const cleanRswtData = (raw: any): z.infer<typeof rswtZod> => {
     return {
       ...raw,
-      frstArchPrmsnDt: new Date(raw?.frstArchPrmsnDt || null),
+      frstArchPrmsnDt: raw?.frstArchPrmsnDt
+        ? new Date(raw.frstArchPrmsnDt)
+        : new Date(), // raw?.frstArchPrmsnDt가 유효하지 않으면 현재 날짜로 초기화
       archChgPrmsnDt: raw?.archChgPrmsnDt
         ? new Date(raw?.archChgPrmsnDt)
         : null,
       reuseBuilding: (raw?.reuseBuilding || []).map((item: any) => ({
         ...item,
-        instlCmptnDt: new Date(item?.instlCmptnDt),
-        operMngCd: item?.operMngCd ?? "", // null → ""
-        grntchBdstCertYr:
-          typeof item?.grntchBdstCertYr === "string"
-            ? item?.grntchBdstCertYr
-            : "", // null → ""
-        rswtrObj: {
+        instlCmptnDt: item?.instlCmptnDt
+        ? new Date(item.instlCmptnDt)
+        : new Date(), // item?.instlCmptnDt가 유효하지 않으면 현재 날짜로 초기화
+      operMngCd: item?.operMngCd ?? "", // null → ""
+      instlCstSprtYn: item?.instlCstSprtYn ?? "Y", // null → "Y"
+      grntchBdstCertYn:item?.grntchBdstCertYn??"Y",
+      rswtrObj: {
           ...item?.rswtrObj,
+          filtrTrtmfctYn: item?.rainyObj?.filtrTrtmfctYn ?? "Y",
+
         },
       })),
     };
   };
 
-  useEffect(()=>{
-    console.log("rswtForm:", rswtForm)
-  }, [rswtForm])
 
   useEffect(() => {
     console.log("form errors:", form.formState.errors);
diff --git a/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx b/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx
index 315f9397f..205846bb4 100644
--- a/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx
+++ b/apps/wr/components/ui/modal/fcltReg/bdstRegModal/bdstRegModal.tsx
@@ -29,9 +29,10 @@ export type objSearchType = {
 
  interface BdstRegProps<T extends MoType> {
   moType: T;
+  setIsModal?: (open: boolean) => void;
 }
 
-export function BdstReg<T extends MoType>({ moType }: BdstRegProps<T>) {
+export function BdstReg<T extends MoType>({ moType,setIsModal }: BdstRegProps<T>) {
   const { rain, code, bdst,findBdst } = useWrStore((state) => {
     return state;
   });
@@ -143,7 +144,7 @@ export function BdstReg<T extends MoType>({ moType }: BdstRegProps<T>) {
             { moType === 'RNB'?
               <RainRegForm rainForm={rainBdstForm as customRainBdst} isModal={true} />
             :moType==='RST' 
-              ? <RswtrRegForm rswtForm={rainBdstForm as customRswtBdst} isModal={true}></RswtrRegForm>
+              ? <RswtrRegForm rswtForm={rainBdstForm as customRswtBdst} isModal={true} setIsModal={(open) =>{setIsModal}}></RswtrRegForm>
                             :<HtdflRegForm htdflForm={rainBdstForm as unknown as  customHtdflBdst} isModal={true}></HtdflRegForm>
             }
               
diff --git a/apps/wr/components/ui/modal/fcltReg/pbnstRegModal/pbnstRegModal.tsx b/apps/wr/components/ui/modal/fcltReg/pbnstRegModal/pbnstRegModal.tsx
index b930a36bb..cc0eb80bf 100644
--- a/apps/wr/components/ui/modal/fcltReg/pbnstRegModal/pbnstRegModal.tsx
+++ b/apps/wr/components/ui/modal/fcltReg/pbnstRegModal/pbnstRegModal.tsx
@@ -20,13 +20,13 @@ import { useFieldArray, type UseFormReturn } from "react-hook-form";
 import { writeRgtrAndMdfr } from "@/app/store/ruseFcltMng/fcltReg/pbnstReg";
 
 export function PbnstRegModal({
-  data,
   form,
+  setPbnstInsert
 }: {
-  data: pubHasuType;
   form: UseFormReturn<{ items: PbnstRegArrrayType }>;
+  setPbnstInsert: (data: customPbnst) => void
 }) {
-  const { pbnst, pbnstInsert } = useWrStore((state) => {
+  const {  pbnstInsert } = useWrStore((state) => {
     return state;
   });
   const [pbnstBdstForm, setPbnstBdstForm] = useState<customPbnst>(
@@ -35,40 +35,30 @@ export function PbnstRegModal({
   const [currentTab, setCurrentTab] = useState<string>("mng");
   const [indexMng, setIndexMng] = useState<number>(0);
   const [indexBiz, setIndexBiz] = useState<number>(0);
-   const onSubmit = async (valuse: { items: PbnstRegArrrayType }) => {
-  
-      const item = valuse.items[indexMng];
-      const data = item ? writeRgtrAndMdfr([item]) : [];
+  const onSubmit = async (valuse: { items: PbnstRegArrrayType }) => {
+    const item = valuse.items[indexMng];
+    const data = item ? writeRgtrAndMdfr([item]) : [];
 
-      if(data && data[0]){
-        pbnstInsert(data[0])
-      }
-    };
+    if (data && data[0]) {
+    //  pbnstInsert(data[0]);
+      setPbnstInsert(data[0])
+    }
+  };
 
   const handleTabChange = (value: string) => {
     setCurrentTab(value);
-  };  
-    
-  useEffect(() => {
-      console.log("form errors:", form.formState.errors);
-    }, [form.formState.errors]);
-  
-    
+  };
 
   useEffect(() => {
-    if (data) {
-
-      const firstForm = form.getValues("items");
-      setIndexMng(firstForm.length - 1)    }
-  }, [data, form]);
-
-
+    console.log("form errors:", form.formState.errors);
+  }, [form.formState.errors]);
 
   useEffect(() => {
-     console.log(' form.getValues() ' ,form.getValues())
-   
-  }, [form.getValues()]);
-
+    const firstForm = form.getValues("items");
+    if (firstForm) {
+      setIndexMng(firstForm.length - 1);
+    }
+  }, [form]);
   return (
     <>
       <h1 className="text-2xl font-medium text-label pl-8">
@@ -86,7 +76,7 @@ export function PbnstRegModal({
               차수별정보
             </TabsTrigger>
             <Button
-             onClick={ form.handleSubmit(onSubmit)}
+              onClick={form.handleSubmit(onSubmit)}
               size={"sm"}
               className="!justify-end"
             >
@@ -104,7 +94,7 @@ export function PbnstRegModal({
           </TabsContent>
           <TabsContent className="max-h-full" value="buse">
             <PbnstBuseForm
-                form={form}
+              form={form}
               indexMng={indexMng}
               indexBiz={indexBiz}
               setIndexBiz={setIndexBiz}