diff --git a/Frontend/_reportManagement.html b/Frontend/_reportManagement.html
index 92bc0bb..b8d9448 100644
--- a/Frontend/_reportManagement.html
+++ b/Frontend/_reportManagement.html
@@ -572,7 +572,6 @@
         if (!Array.isArray(sent_data)) {
             sent_data = [sent_data];
         }
-
         if (!sent_data.some((s) => s.building_tag)) {
             toast_error("請選擇棟別");
             return;
@@ -1067,10 +1066,11 @@
 
     $("#school_zone").on("click", function (event) {
         event.stopPropagation();
-        if (event.target.tagName !== "INPUT") {
+        if (event.target.tagName !== "INPUT" && !$(event.target).hasClass("active")) {
             $("#school_zone label.active").removeClass("active");
             $(event.target).addClass("active");
-        } else {
+            SelectBuildings = []
+        } else if (event.target.tagName === "INPUT") {
             school_zone = event.target.value;
             getbuildings(school_zone);
         }
@@ -1082,10 +1082,11 @@
             ({ school_zone }) => school_zone === value
         )) {
             html += `<label class="btn btn-outline-success waves-effect waves-themed">
-                    <input type="checkbox" name="buildingRadio" id="radio_${building.building_tag}" value="${building.building_tag}" onChange="SelectBuild(this,'${building.building_tag}')"> ${building.full_name}
-                </label>`;
+          <input type="checkbox" name="buildingRadio" id="radio_${building.building_tag}" value="${building.building_tag}" onChange="SelectBuild(this,'${building.building_tag}')"> ${building.full_name}
+          </label>`;
         }
         $("#building").find(".item").empty();
         $("#building").find(".item").append(html);
+        SelectBuildings = []
     }
 </script>