Merge branch 'main' into 'ba'

# Conflicts:
#   src/main/java/com/cardiff/client_project/controller/hospital/HospitalController.java
#   src/main/java/com/cardiff/client_project/mapper/HospitalMapper.java
#   src/main/java/com/cardiff/client_project/service/imp/HospitalServiceImpl.java
#   src/main/resources/static/css/beds.css
#   src/main/resources/static/html/beds.html

health_care.sql

@@ -16,7 +16,23 @@
 
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
-
+-- ----------------------------
+-- Available beds
+-- ----------------------------
+SELECT
+    id AS hospital_id,
+    name AS hospital_name,
+    address AS location,
+    phone,
+    maxAmount AS total_beds,
+    (maxAmount - amountPatient) AS available_beds
+FROM
+    hospital
+WHERE
+    status = 1
+  AND (maxAmount - amountPatient) > 0
+ORDER BY
+    available_beds DESC;
     -- ----------------------------
 -- Table structure for common_admin
 -- ----------------------------

src/main/java/com/cardiff/client_project/mapper/SuperAdminMapper.java

@@ -30,7 +30,7 @@ import java.util.Map;
 public class SuperAdminMapper {
 
     @Autowired
-    JdbcTemplate jdbcTemplate;;
+    JdbcTemplate jdbcTemplate;
 
     /**
      * ser registration

src/main/java/com/cardiff/client_project/service/imp/HospitalService.java

-package com.cardiff.client_project.service.imp;
-
-public class HospitalService {
-}