diff --git a/.env b/.env
index 662473e177b764ace69fb832e76eedf3866a41ab..97becf78c539254e3d8a4a2dee005ff8dc365b5e 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
-PORT=3306
+PORT=8080
 DB_HOST=10.104.20.255
 DB_USER=root
 DB_PASS=OAOsac27273
diff --git a/routes/reports.js b/routes/reports.js
index 7f9708b2bbe32a3293c541c91c1837cb44eee1ac..3f0821b6ffd03a8752a06d2cf7b4d74992ced4fb 100644
--- a/routes/reports.js
+++ b/routes/reports.js
@@ -89,25 +89,26 @@ router.get("/", authMiddleware, (req, res) => {
 
 // 🔹 Get Single Report by ID
 router.get("/:id", authMiddleware, (req, res) => {
-  db.query(`
-      SELECT reports.*, users.username, rooms.room_name
-      FROM reports
-      JOIN users ON reports.user_id = users.id
-      JOIN rooms ON reports.room_id = rooms.id
-      WHERE reports.id = ?`, 
-      [req.params.id], 
-      (err, results) => {
-        if (err) return res.status(500).json({ error: err.message });
-        if (results.length === 0) return res.status(404).json({ error: "Report Not Found" });
-
-        const report = results[0];
-        if (report.image_url) {
-            report.image_url = `http://localhost:8080 ${report.image_url}`;
-        }
-
-        res.json(report);
-  });
-});
+    db.query(`
+        SELECT reports.*, users.username, rooms.room_name, rooms.floor
+        FROM reports
+        JOIN users ON reports.user_id = users.id
+        JOIN rooms ON reports.room_id = rooms.id
+        WHERE reports.id = ?`, 
+        [req.params.id], 
+        (err, results) => {
+          if (err) return res.status(500).json({ error: err.message });
+          if (results.length === 0) return res.status(404).json({ error: "Report Not Found" });
+  
+          const report = results[0];
+          if (report.image_url) {
+              // ลบช่องว่างที่ไม่จำเป็นออก
+              report.image_url = `http://localhost:8080${report.image_url}`;
+          }
+  
+          res.json(report);
+    });
+  });  
 
 // 🔹 Update Report (แก้ไขเฉพาะ Title, Description)
 router.put("/:id", authMiddleware, (req, res) => {
diff --git a/server.js b/server.js
index ee77f021599e747387a5977ad01c3ae6e4f14fed..0a6c6106f8cbec14338571d8b4e81035684c2d35 100644
--- a/server.js
+++ b/server.js
@@ -21,5 +21,6 @@ app.use("/api/reports", require("./routes/reports"));
 app.use("/uploads", express.static("uploads"));
 
 // 📌 กำหนด PORT
-const PORT = 8080;
+const PORT = process.env.PORT || 8080;
 app.listen(PORT, () => console.log(`🚀 Server running on port ${PORT}`));
+