diff --git a/src/main/java/com/pethospital/dao/impl/HealthRecordDaoImpl.java b/src/main/java/com/pethospital/dao/impl/HealthRecordDaoImpl.java
index e41360b..bdc30a8 100644
--- a/src/main/java/com/pethospital/dao/impl/HealthRecordDaoImpl.java
+++ b/src/main/java/com/pethospital/dao/impl/HealthRecordDaoImpl.java
@@ -478,56 +478,57 @@ private HealthRecord mapResultSetToHealthRecord(ResultSet rs) throws SQLExceptio
     public PageResult<HealthRecord> findByCondition(String petName, String diagnosis, String doctorName,
                                                    Date visitDateStart, Date visitDateEnd, Integer ownerId,
                                                    int currentPage, int pageSize) {
-        // 构建查询条件
-        StringBuilder sqlBuilder = new StringBuilder();
-        sqlBuilder.append("SELECT hr.*, p.pet_name, p.pet_type, p.breed ");
-        sqlBuilder.append("FROM health_records hr ");
-        sqlBuilder.append("LEFT JOIN pets p ON hr.pet_id = p.pet_id ");
-        sqlBuilder.append("WHERE 1=1 ");
+        // 构建WHERE条件部分（复用于数据查询和数量查询）
+        StringBuilder whereBuilder = new StringBuilder("FROM health_records hr ");
+        whereBuilder.append("LEFT JOIN pets p ON hr.pet_id = p.pet_id ");
+        whereBuilder.append("WHERE 1=1 ");
 
         List<Object> params = new ArrayList<>();
 
         if (petName != null && !petName.trim().isEmpty()) {
-            sqlBuilder.append("AND p.pet_name LIKE ? ");
+            whereBuilder.append("AND p.pet_name LIKE ? ");
             params.add("%" + petName.trim() + "%");
         }
 
         if (diagnosis != null && !diagnosis.trim().isEmpty()) {
-            sqlBuilder.append("AND hr.diagnosis LIKE ? ");
+            whereBuilder.append("AND hr.diagnosis LIKE ? ");
             params.add("%" + diagnosis.trim() + "%");
         }
 
         if (doctorName != null && !doctorName.trim().isEmpty()) {
-            sqlBuilder.append("AND hr.doctor_name = ? ");
+            whereBuilder.append("AND hr.doctor_name = ? ");
             params.add(doctorName.trim());
         }
 
         if (visitDateStart != null) {
-            sqlBuilder.append("AND hr.visit_date >= ? ");
+            whereBuilder.append("AND hr.visit_date >= ? ");
             params.add(visitDateStart);
         }
 
         if (visitDateEnd != null) {
-            sqlBuilder.append("AND hr.visit_date <= ? ");
+            whereBuilder.append("AND hr.visit_date <= ? ");
             params.add(visitDateEnd);
         }
 
         if (ownerId != null) {
-            sqlBuilder.append("AND p.owner_id = ? ");
+            whereBuilder.append("AND p.owner_id = ? ");
             params.add(ownerId);
         }
 
-        // 先查询总记录数
-        String countSql = sqlBuilder.toString().replace("SELECT hr.*, p.pet_name, p.pet_type, p.breed", "SELECT COUNT(*)");
+        // 先查询总记录数（独立构造COUNT查询）
+        String countSql = "SELECT COUNT(*) " + whereBuilder.toString();
         long totalCount = executeCountQuery(countSql, params);
 
-        // 添加排序和分页
-        sqlBuilder.append("ORDER BY hr.visit_date DESC LIMIT ? OFFSET ?");
-        params.add(pageSize);
-        params.add((currentPage - 1) * pageSize);
+        // 添加排序和分页（构造数据查询）
+        String dataSql = "SELECT hr.*, p.pet_name, p.pet_type, p.breed " +
+                         whereBuilder.toString() +
+                         "ORDER BY hr.visit_date DESC LIMIT ? OFFSET ?";
+        List<Object> dataParams = new ArrayList<>(params);
+        dataParams.add(pageSize);
+        dataParams.add((currentPage - 1) * pageSize);
 
         // 查询分页数据
-        List<HealthRecord> healthRecords = executeQuery(sqlBuilder.toString(), params);
+        List<HealthRecord> healthRecords = executeQuery(dataSql, dataParams);
 
         return new PageResult<>(healthRecords, currentPage, pageSize, totalCount);
     }
diff --git a/src/main/java/com/pethospital/dao/impl/PetDaoImpl.java b/src/main/java/com/pethospital/dao/impl/PetDaoImpl.java
index 699c608..cc39137 100644
--- a/src/main/java/com/pethospital/dao/impl/PetDaoImpl.java
+++ b/src/main/java/com/pethospital/dao/impl/PetDaoImpl.java
@@ -57,33 +57,16 @@ public List<Pet> findByOwnerId(Integer ownerId) {
         ResultSet rs = null;
         List<Pet> pets = new ArrayList<>();
 
-        System.out.println("DEBUG: PetDaoImpl.findByOwnerId() 执行SQL查询，ownerId: " + ownerId);
-        System.out.println("DEBUG: SQL: " + sql);
-
         try {
             conn = DBUtil.getConnection();
-            System.out.println("DEBUG: 数据库连接获取成功: " + (conn != null));
-
             pstmt = conn.prepareStatement(sql);
             pstmt.setInt(1, ownerId);
             rs = pstmt.executeQuery();
 
-            int count = 0;
             while (rs.next()) {
-                Pet pet = mapResultSetToPet(rs);
-                pets.add(pet);
-                count++;
-                System.out.println("DEBUG: 找到宠物 " + count + " - ID: " + pet.getPetId() +
-                                 ", 名称: " + pet.getPetName() +
-                                 ", 类型: " + pet.getPetType() +
-                                 ", 品种: " + pet.getBreed() +
-                                 ", 主人ID: " + pet.getOwnerId());
+                pets.add(mapResultSetToPet(rs));
             }
-
-            System.out.println("DEBUG: 总共找到 " + count + " 只宠物");
-
         } catch (SQLException e) {
-            System.out.println("DEBUG: 数据库查询异常: " + e.getMessage());
             e.printStackTrace();
         } finally {
             DBUtil.closeAll(conn, pstmt, rs);
diff --git a/src/main/java/com/pethospital/entity/HealthRecord.java b/src/main/java/com/pethospital/entity/HealthRecord.java
index 02b72b6..9ea4429 100644
--- a/src/main/java/com/pethospital/entity/HealthRecord.java
+++ b/src/main/java/com/pethospital/entity/HealthRecord.java
@@ -168,7 +168,7 @@ public void setPet(Pet pet) {
      */
     public boolean needsFollowUp() {
         if (nextVisitDate == null) return false;
-        return nextVisitDate.after(new Date(System.currentTimeMillis()));
+        return !nextVisitDate.before(new Date(System.currentTimeMillis()));
     }
 
     /**
diff --git a/src/main/java/com/pethospital/service/impl/PetServiceImpl.java b/src/main/java/com/pethospital/service/impl/PetServiceImpl.java
index f17de2d..0288db0 100644
--- a/src/main/java/com/pethospital/service/impl/PetServiceImpl.java
+++ b/src/main/java/com/pethospital/service/impl/PetServiceImpl.java
@@ -31,17 +31,12 @@ public Pet getPetById(Integer petId) {
     
     @Override
     public List<Pet> getPetsByOwnerId(Integer ownerId) {
-        System.out.println("DEBUG: PetServiceImpl.getPetsByOwnerId() 被调用，ownerId: " + ownerId);
-
         if (ownerId == null || ownerId <= 0) {
-            System.out.println("DEBUG: ownerId 无效，返回 null");
-            return null;
+            return new java.util.ArrayList<>();
         }
 
         List<Pet> pets = petDao.findByOwnerId(ownerId);
-        System.out.println("DEBUG: DAO 返回的宠物数量: " + (pets != null ? pets.size() : "null"));
-
-        return pets;
+        return pets != null ? pets : new java.util.ArrayList<>();
     }
 
     @Override
diff --git a/src/main/java/com/pethospital/service/impl/UserServiceImpl.java b/src/main/java/com/pethospital/service/impl/UserServiceImpl.java
index be87e34..8e1c880 100644
--- a/src/main/java/com/pethospital/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/pethospital/service/impl/UserServiceImpl.java
@@ -90,10 +90,11 @@ public boolean updateUser(User user) {
         
         // 检查邮箱是否被其他用户使用
         if (user.getEmail() != null && !user.getEmail().trim().isEmpty()) {
-            User existingUser = userDao.findByUsername(user.getUsername());
-            if (existingUser != null && !existingUser.getUserId().equals(user.getUserId()) &&
-                user.getEmail().equals(existingUser.getEmail())) {
-                return false;
+            if (userDao.existsByEmail(user.getEmail().trim())) {
+                User currentStoredUser = userDao.findById(user.getUserId());
+                if (currentStoredUser == null || !user.getEmail().trim().equals(currentStoredUser.getEmail())) {
+                    return false;
+                }
             }
         }
         
diff --git a/src/main/java/com/pethospital/servlet/AppointmentServlet.java b/src/main/java/com/pethospital/servlet/AppointmentServlet.java
index be67220..fe19e1b 100644
--- a/src/main/java/com/pethospital/servlet/AppointmentServlet.java
+++ b/src/main/java/com/pethospital/servlet/AppointmentServlet.java
@@ -358,49 +358,8 @@ private void forwardToAddPage(HttpServletRequest request, HttpServletResponse re
         } else {
             // 普通用户只能看到自己的宠物
             List<Pet> myPets = petService.getPetsByOwnerId(currentUser.getUserId());
-
-            // 调试信息：打印用户ID和宠物数量
-            System.out.println("DEBUG: 当前用户ID: " + currentUser.getUserId());
-            System.out.println("DEBUG: 用户名: " + currentUser.getUsername());
-            System.out.println("DEBUG: 查询到的宠物数量: " + (myPets != null ? myPets.size() : "null"));
-            if (myPets != null && !myPets.isEmpty()) {
-                for (Pet pet : myPets) {
-                    System.out.println("DEBUG: 宠物详情 - ID: " + pet.getPetId() +
-                                     ", 名称: '" + pet.getPetName() + "'" +
-                                     ", 类型: '" + pet.getPetType() + "'" +
-                                     ", 品种: '" + pet.getBreed() + "'" +
-                                     ", 主人ID: " + pet.getOwnerId());
-
-                    // 检查并修复异常的宠物名称
-                    if (pet.getPetName() == null || pet.getPetName().trim().isEmpty() ||
-                        pet.getPetName().matches("\\d+")) { // 如果名称是纯数字
-                        System.out.println("DEBUG: 发现异常宠物名称，尝试修复...");
-                        String newName = "宠物" + pet.getPetId(); // 临时名称
-                        pet.setPetName(newName);
-                        System.out.println("DEBUG: 已临时修复宠物名称为: " + newName);
-                    }
-                }
-            } else {
-                System.out.println("DEBUG: 宠物列表为空或null");
-            }
-
-            // 如果宠物列表为空或null，创建一个测试宠物
-            if (myPets == null || myPets.isEmpty()) {
-                System.out.println("DEBUG: 宠物列表为空，创建测试宠物");
+            if (myPets == null) {
                 myPets = new java.util.ArrayList<>();
-                Pet testPet = new Pet();
-                testPet.setPetId(999);
-                testPet.setPetName("测试宠物");
-                testPet.setPetType("狗");
-                testPet.setBreed("测试品种");
-                testPet.setOwnerId(currentUser.getUserId());
-                myPets.add(testPet);
-                System.out.println("DEBUG: 已添加测试宠物");
-            }
-
-            System.out.println("DEBUG: 最终设置到request的宠物数量: " + myPets.size());
-            for (Pet pet : myPets) {
-                System.out.println("DEBUG: 最终宠物 - ID: " + pet.getPetId() + ", 名称: " + pet.getPetName());
             }
 
             request.setAttribute("myPets", myPets);
diff --git a/src/main/java/com/pethospital/servlet/PetServlet.java b/src/main/java/com/pethospital/servlet/PetServlet.java
index debc6cc..c6a9e98 100644
--- a/src/main/java/com/pethospital/servlet/PetServlet.java
+++ b/src/main/java/com/pethospital/servlet/PetServlet.java
@@ -447,8 +447,6 @@ private void handleUpdate(HttpServletRequest request, HttpServletResponse respon
                 }
             }
 
-            System.out.println("更新宠物 - petIdStr: " + petIdStr);
-
             if (petIdStr == null || petIdStr.trim().isEmpty()) {
                 response.sendError(HttpServletResponse.SC_BAD_REQUEST, "宠物ID不能为空");
                 return;
diff --git a/src/main/java/com/pethospital/servlet/UserServlet.java b/src/main/java/com/pethospital/servlet/UserServlet.java
index fbabec8..5996ff4 100644
--- a/src/main/java/com/pethospital/servlet/UserServlet.java
+++ b/src/main/java/com/pethospital/servlet/UserServlet.java
@@ -178,7 +178,7 @@ private void handleRegister(HttpServletRequest request, HttpServletResponse resp
         String address = request.getParameter("address");
         
         // 验证密码确认
-        if (!password.equals(confirmPassword)) {
+        if (password == null || !password.equals(confirmPassword)) {
             request.setAttribute("error", "两次输入的密码不一致");
             request.getRequestDispatcher("/pages/common/register.jsp").forward(request, response);
             return;
@@ -860,7 +860,6 @@ private void handleImport(HttpServletRequest request, HttpServletResponse respon
 
             // 解析Excel文件
             List<User> users = parseExcelFile(fileItem.getInputStream());
-            System.out.println("解析到的用户数量: " + users.size());
 
             if (users.isEmpty()) {
                 out.write("{\"success\":false,\"message\":\"Excel文件中没有有效的用户数据，请检查文件格式是否正确\"}");
@@ -870,10 +869,6 @@ private void handleImport(HttpServletRequest request, HttpServletResponse respon
             // 导入用户数据
             Map<String, Object> result = importUsers(users, skipDuplicates);
 
-            System.out.println("导入结果 - 成功: " + result.get("success") +
-                             ", 跳过: " + result.get("skip") +
-                             ", 失败: " + result.get("error"));
-
             Integer successCount = (Integer) result.get("success");
             Integer skipCount = (Integer) result.get("skip");
             Integer errorCount = (Integer) result.get("error");
@@ -1004,13 +999,10 @@ private List<User> parseExcelFile(InputStream inputStream) throws Exception {
         Workbook workbook = WorkbookFactory.create(inputStream);
         Sheet sheet = workbook.getSheetAt(0);
 
-        System.out.println("Excel文件总行数: " + (sheet.getLastRowNum() + 1));
-
         // 跳过标题行，从第二行开始读取数据
         for (int i = 1; i <= sheet.getLastRowNum(); i++) {
             Row row = sheet.getRow(i);
             if (row == null) {
-                System.out.println("第" + (i+1) + "行为空，跳过");
                 continue;
             }
 
@@ -1028,28 +1020,22 @@ private List<User> parseExcelFile(InputStream inputStream) throws Exception {
             }
 
             if (isEmptyRow) {
-                System.out.println("第" + (i+1) + "行为空行，跳过");
                 continue;
             }
 
             try {
-                System.out.println("正在解析第" + (i+1) + "行数据");
                 User user = new User();
 
                 // 用户名（必填）
                 String username = getCellValueAsString(row.getCell(0));
-                System.out.println("用户名: " + username);
                 if (username == null || username.trim().isEmpty()) {
-                    System.out.println("用户名为空，跳过第" + (i+1) + "行");
                     continue; // 跳过用户名为空的行
                 }
                 user.setUsername(username.trim());
 
                 // 真实姓名（必填）
                 String realName = getCellValueAsString(row.getCell(1));
-                System.out.println("真实姓名: " + realName);
                 if (realName == null || realName.trim().isEmpty()) {
-                    System.out.println("真实姓名为空，跳过第" + (i+1) + "行");
                     continue; // 跳过真实姓名为空的行
                 }
                 user.setRealName(realName.trim());
@@ -1072,9 +1058,6 @@ private List<User> parseExcelFile(InputStream inputStream) throws Exception {
                     phone = phone.trim().replaceAll("[^0-9]", "");
                     if (phone.length() == 11 && phone.startsWith("1")) {
                         user.setPhone(phone);
-                        System.out.println("手机号: " + phone);
-                    } else {
-                        System.out.println("手机号格式不正确，跳过: " + phone);
                     }
                 }
 
@@ -1104,16 +1087,11 @@ private List<User> parseExcelFile(InputStream inputStream) throws Exception {
                 // 设置默认密码
                 user.setPassword("123456");
 
-                System.out.println("成功解析用户: " + user.getUsername() + ", 真实姓名: " + user.getRealName() +
-                                 ", 类型: " + user.getUserType() + ", 状态: " + user.getStatus());
-
                 users.add(user);
 
             } catch (Exception e) {
-                System.out.println("解析第" + (i+1) + "行时发生异常: " + e.getMessage());
                 e.printStackTrace();
                 // 跳过解析失败的行
-                continue;
             }
         }
 
@@ -1161,16 +1139,11 @@ private Map<String, Object> importUsers(List<User> users, boolean skipDuplicates
         int errorCount = 0;
         StringBuilder errorDetails = new StringBuilder();
 
-        System.out.println("开始导入用户，总数: " + users.size() + ", 跳过重复: " + skipDuplicates);
-
         for (User user : users) {
             try {
-                System.out.println("正在处理用户: " + user.getUsername());
-
                 // 验证用户数据
                 String validationResult = userService.validateUser(user, false);
                 if (validationResult != null) {
-                    System.out.println("用户验证失败: " + user.getUsername() + ", 原因: " + validationResult);
                     errorDetails.append("用户[").append(user.getUsername()).append("]: ").append(validationResult).append("; ");
                     errorCount++;
                     continue;
@@ -1178,7 +1151,6 @@ private Map<String, Object> importUsers(List<User> users, boolean skipDuplicates
 
                 // 检查用户名是否已存在
                 if (userService.isUsernameExists(user.getUsername())) {
-                    System.out.println("用户名已存在: " + user.getUsername());
                     if (skipDuplicates) {
                         skipCount++;
                         continue;
@@ -1192,7 +1164,6 @@ private Map<String, Object> importUsers(List<User> users, boolean skipDuplicates
                 // 检查邮箱是否已存在
                 if (user.getEmail() != null && !user.getEmail().trim().isEmpty() &&
                     userService.isEmailExists(user.getEmail())) {
-                    System.out.println("邮箱已存在: " + user.getEmail());
                     if (skipDuplicates) {
                         skipCount++;
                         continue;
@@ -1204,18 +1175,14 @@ private Map<String, Object> importUsers(List<User> users, boolean skipDuplicates
                 }
 
                 // 注册用户
-                System.out.println("尝试注册用户: " + user.getUsername());
                 if (userService.register(user)) {
-                    System.out.println("用户注册成功: " + user.getUsername());
                     successCount++;
                 } else {
-                    System.out.println("用户注册失败: " + user.getUsername());
                     errorDetails.append("用户[").append(user.getUsername()).append("]: 注册失败; ");
                     errorCount++;
                 }
 
             } catch (Exception e) {
-                System.out.println("处理用户时发生异常: " + user.getUsername() + ", 异常: " + e.getMessage());
                 errorDetails.append("用户[").append(user.getUsername()).append("]: ").append(e.getMessage()).append("; ");
                 e.printStackTrace();
                 errorCount++;
diff --git a/src/main/resources/init.sql b/src/main/resources/init.sql
index e27a16c..2882fb0 100644
--- a/src/main/resources/init.sql
+++ b/src/main/resources/init.sql
@@ -12,7 +12,7 @@ CREATE TABLE IF NOT EXISTS users (
     password VARCHAR(100) NOT NULL COMMENT '密码',
     real_name VARCHAR(50) NOT NULL COMMENT '真实姓名',
     phone VARCHAR(20) COMMENT '电话号码',
-    email VARCHAR(100) COMMENT '邮箱',
+    email VARCHAR(100) UNIQUE COMMENT '邮箱',
     address VARCHAR(200) COMMENT '地址',
     user_type ENUM('admin', 'user') DEFAULT 'user' COMMENT '用户类型：admin-管理员，user-普通用户',
     status ENUM('active', 'inactive') DEFAULT 'active' COMMENT '状态：active-激活，inactive-禁用',
diff --git a/src/main/webapp/debug-pets.jsp b/src/main/webapp/debug-pets.jsp
deleted file mode 100644
index f774aaf..0000000
--- a/src/main/webapp/debug-pets.jsp
+++ /dev/null
@@ -1,115 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ page import="com.pethospital.service.impl.PetServiceImpl" %>
-<%@ page import="com.pethospital.service.PetService" %>
-<%@ page import="com.pethospital.entity.Pet" %>
-<%@ page import="com.pethospital.entity.User" %>
-<%@ page import="java.util.List" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-<!DOCTYPE html>
-<html>
-<head>
-    <title>宠物数据调试页面</title>
-    <meta charset="UTF-8">
-</head>
-<body>
-    <h1>宠物数据调试页面</h1>
-    
-    <%
-        // 获取当前用户
-        User currentUser = (User) session.getAttribute("currentUser");
-        out.println("<h2>当前用户信息:</h2>");
-        if (currentUser != null) {
-            out.println("用户ID: " + currentUser.getUserId() + "<br>");
-            out.println("用户名: " + currentUser.getUsername() + "<br>");
-            out.println("真实姓名: " + currentUser.getRealName() + "<br>");
-            out.println("用户类型: " + currentUser.getUserType() + "<br>");
-        } else {
-            out.println("当前用户为空，请先登录<br>");
-        }
-        
-        out.println("<hr>");
-        
-        // 测试宠物服务
-        PetService petService = new PetServiceImpl();
-        
-        out.println("<h2>所有宠物数据:</h2>");
-        List<Pet> allPets = petService.getAllPets();
-        if (allPets != null && !allPets.isEmpty()) {
-            out.println("总共找到 " + allPets.size() + " 只宠物:<br>");
-            for (Pet pet : allPets) {
-                out.println("- ID: " + pet.getPetId() + ", 名称: " + pet.getPetName() + 
-                           ", 类型: " + pet.getPetType() + ", 主人ID: " + pet.getOwnerId() + "<br>");
-            }
-        } else {
-            out.println("没有找到任何宠物数据<br>");
-        }
-        
-        out.println("<hr>");
-        
-        if (currentUser != null) {
-            out.println("<h2>当前用户的宠物:</h2>");
-            List<Pet> myPets = petService.getPetsByOwnerId(currentUser.getUserId());
-            if (myPets != null && !myPets.isEmpty()) {
-                out.println("找到 " + myPets.size() + " 只宠物:<br>");
-                for (Pet pet : myPets) {
-                    out.println("- ID: " + pet.getPetId() +
-                               ", 名称: '" + pet.getPetName() + "'" +
-                               ", 类型: '" + pet.getPetType() + "'" +
-                               ", 品种: '" + pet.getBreed() + "'" +
-                               ", 性别: '" + pet.getGender() + "'" +
-                               ", 年龄: " + pet.getAge() + "个月" +
-                               ", 主人ID: " + pet.getOwnerId() + "<br>");
-                }
-
-                // 测试前端渲染
-                out.println("<h3>前端选择框测试:</h3>");
-                out.println("<select>");
-                out.println("<option value=''>请选择宠物</option>");
-                for (Pet pet : myPets) {
-                    out.println("<option value='" + pet.getPetId() + "'>" +
-                               pet.getPetName() + " (" + pet.getPetType() + ")</option>");
-                }
-                out.println("</select>");
-
-            } else {
-                out.println("当前用户没有宠物数据<br>");
-            }
-        }
-        
-        out.println("<hr>");
-        
-        // 测试特定用户ID的宠物
-        out.println("<h2>测试用户ID 2 的宠物:</h2>");
-        List<Pet> user2Pets = petService.getPetsByOwnerId(2);
-        if (user2Pets != null && !user2Pets.isEmpty()) {
-            out.println("用户ID 2 有 " + user2Pets.size() + " 只宠物:<br>");
-            for (Pet pet : user2Pets) {
-                out.println("- ID: " + pet.getPetId() + ", 名称: " + pet.getPetName() + 
-                           ", 类型: " + pet.getPetType() + "<br>");
-            }
-        } else {
-            out.println("用户ID 2 没有宠物数据<br>");
-        }
-        
-        out.println("<hr>");
-        
-        // 测试特定用户ID的宠物
-        out.println("<h2>测试用户ID 3 的宠物:</h2>");
-        List<Pet> user3Pets = petService.getPetsByOwnerId(3);
-        if (user3Pets != null && !user3Pets.isEmpty()) {
-            out.println("用户ID 3 有 " + user3Pets.size() + " 只宠物:<br>");
-            for (Pet pet : user3Pets) {
-                out.println("- ID: " + pet.getPetId() + ", 名称: " + pet.getPetName() + 
-                           ", 类型: " + pet.getPetType() + "<br>");
-            }
-        } else {
-            out.println("用户ID 3 没有宠物数据<br>");
-        }
-    %>
-    
-    <hr>
-    <p><a href="${pageContext.request.contextPath}/appointment/add">返回预约页面</a></p>
-    <p><a href="${pageContext.request.contextPath}/pages/common/login.jsp">登录页面</a></p>
-</body>
-</html>
diff --git a/src/main/webapp/direct-test.jsp b/src/main/webapp/direct-test.jsp
deleted file mode 100644
index ae44fc5..0000000
--- a/src/main/webapp/direct-test.jsp
+++ /dev/null
@@ -1,129 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ page import="com.pethospital.service.impl.PetServiceImpl" %>
-<%@ page import="com.pethospital.service.PetService" %>
-<%@ page import="com.pethospital.entity.Pet" %>
-<%@ page import="com.pethospital.entity.User" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.ArrayList" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-<!DOCTYPE html>
-<html>
-<head>
-    <title>直接测试页面</title>
-    <meta charset="UTF-8">
-    <style>
-        body { font-family: Arial, sans-serif; margin: 20px; }
-        .debug { background-color: #f0f0f0; padding: 10px; margin: 10px 0; border: 1px solid #ccc; }
-        .error { color: red; }
-        .success { color: green; }
-    </style>
-</head>
-<body>
-    <h1>直接测试页面</h1>
-    
-    <%
-        // 获取当前用户
-        User currentUser = (User) session.getAttribute("currentUser");
-        
-        out.println("<div class='debug'>");
-        out.println("<h2>当前用户信息:</h2>");
-        if (currentUser != null) {
-            out.println("用户ID: " + currentUser.getUserId() + "<br>");
-            out.println("用户名: " + currentUser.getUsername() + "<br>");
-            out.println("真实姓名: " + currentUser.getRealName() + "<br>");
-            out.println("用户类型: " + currentUser.getUserType() + "<br>");
-        } else {
-            out.println("<span class='error'>当前用户为空，请先登录</span><br>");
-        }
-        out.println("</div>");
-        
-        if (currentUser != null) {
-            // 测试宠物服务
-            PetService petService = new PetServiceImpl();
-            
-            out.println("<div class='debug'>");
-            out.println("<h2>直接调用PetService测试:</h2>");
-            List<Pet> myPets = petService.getPetsByOwnerId(currentUser.getUserId());
-            
-            if (myPets != null && !myPets.isEmpty()) {
-                out.println("<span class='success'>找到 " + myPets.size() + " 只宠物:</span><br>");
-                for (Pet pet : myPets) {
-                    out.println("- ID: " + pet.getPetId() + 
-                               ", 名称: '" + pet.getPetName() + "'" + 
-                               ", 类型: '" + pet.getPetType() + "'" + 
-                               ", 品种: '" + pet.getBreed() + "'" + 
-                               ", 主人ID: " + pet.getOwnerId() + "<br>");
-                }
-                
-                // 设置到request中供JSTL使用
-                request.setAttribute("myPets", myPets);
-                
-            } else {
-                out.println("<span class='error'>没有找到宠物数据</span><br>");
-                
-                // 创建测试宠物
-                myPets = new ArrayList<>();
-                Pet testPet = new Pet();
-                testPet.setPetId(999);
-                testPet.setPetName("测试宠物");
-                testPet.setPetType("狗");
-                testPet.setBreed("测试品种");
-                testPet.setOwnerId(currentUser.getUserId());
-                myPets.add(testPet);
-                
-                request.setAttribute("myPets", myPets);
-                out.println("<span class='success'>已创建测试宠物</span><br>");
-            }
-            out.println("</div>");
-            
-            out.println("<div class='debug'>");
-            out.println("<h2>JSTL测试:</h2>");
-        }
-    %>
-    
-    <c:if test="${not empty myPets}">
-        <div class="success">JSTL能够访问宠物数据，数量: ${myPets.size()}</div>
-        <ul>
-            <c:forEach var="pet" items="${myPets}">
-                <li>ID: ${pet.petId}, 名称: "${pet.petName}", 类型: ${pet.petType}</li>
-            </c:forEach>
-        </ul>
-        
-        <h3>选择框测试:</h3>
-        <select id="testSelect" style="width: 300px; padding: 5px;">
-            <option value="">请选择宠物</option>
-            <c:forEach var="pet" items="${myPets}">
-                <option value="${pet.petId}">${pet.petName} (${pet.petType})</option>
-            </c:forEach>
-        </select>
-        
-        <script>
-            document.addEventListener('DOMContentLoaded', function() {
-                const select = document.getElementById('testSelect');
-                console.log('选择框选项数量:', select.options.length);
-                for (let i = 0; i < select.options.length; i++) {
-                    console.log('选项 ' + i + ':', select.options[i].value, select.options[i].text);
-                }
-            });
-        </script>
-        
-    </c:if>
-    
-    <c:if test="${empty myPets}">
-        <div class="error">JSTL无法访问宠物数据</div>
-    </c:if>
-    
-    <%
-        if (currentUser != null) {
-            out.println("</div>");
-        }
-    %>
-    
-    <hr>
-    <h2>测试链接:</h2>
-    <p><a href="${pageContext.request.contextPath}/appointment/add">访问预约页面</a></p>
-    <p><a href="${pageContext.request.contextPath}/debug-pets.jsp">访问调试页面</a></p>
-    <p><a href="${pageContext.request.contextPath}/fix-pet-data.jsp">访问数据修复页面</a></p>
-</body>
-</html>
diff --git a/src/main/webapp/fix-pet-data.jsp b/src/main/webapp/fix-pet-data.jsp
deleted file mode 100644
index f55fcd5..0000000
--- a/src/main/webapp/fix-pet-data.jsp
+++ /dev/null
@@ -1,147 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ page import="com.pethospital.service.impl.PetServiceImpl" %>
-<%@ page import="com.pethospital.service.PetService" %>
-<%@ page import="com.pethospital.entity.Pet" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.sql.*" %>
-<%@ page import="com.pethospital.util.DBUtil" %>
-
-<!DOCTYPE html>
-<html>
-<head>
-    <title>宠物数据修复工具</title>
-    <meta charset="UTF-8">
-    <style>
-        body { font-family: Arial, sans-serif; margin: 20px; }
-        .error { color: red; }
-        .success { color: green; }
-        .info { color: blue; }
-        table { border-collapse: collapse; width: 100%; }
-        th, td { border: 1px solid #ddd; padding: 8px; text-align: left; }
-        th { background-color: #f2f2f2; }
-    </style>
-</head>
-<body>
-    <h1>宠物数据修复工具</h1>
-    
-    <%
-        String action = request.getParameter("action");
-        
-        if ("fix".equals(action)) {
-            out.println("<h2>执行数据修复...</h2>");
-            
-            Connection conn = null;
-            PreparedStatement pstmt = null;
-            ResultSet rs = null;
-            
-            try {
-                conn = DBUtil.getConnection();
-                
-                // 查找有问题的宠物数据
-                String selectSql = "SELECT pet_id, pet_name, pet_type, breed, owner_id FROM pets WHERE pet_name REGEXP '^[0-9]+$' OR pet_name IS NULL OR pet_name = ''";
-                pstmt = conn.prepareStatement(selectSql);
-                rs = pstmt.executeQuery();
-                
-                int fixedCount = 0;
-                while (rs.next()) {
-                    int petId = rs.getInt("pet_id");
-                    String oldName = rs.getString("pet_name");
-                    String petType = rs.getString("pet_type");
-                    String breed = rs.getString("breed");
-                    int ownerId = rs.getInt("owner_id");
-                    
-                    // 生成新的宠物名称
-                    String newName = generatePetName(petType, breed, petId);
-                    
-                    // 更新宠物名称
-                    PreparedStatement updateStmt = conn.prepareStatement("UPDATE pets SET pet_name = ? WHERE pet_id = ?");
-                    updateStmt.setString(1, newName);
-                    updateStmt.setInt(2, petId);
-                    
-                    int updated = updateStmt.executeUpdate();
-                    if (updated > 0) {
-                        out.println("<div class='success'>修复成功 - 宠物ID: " + petId + 
-                                   ", 原名称: '" + oldName + "' -> 新名称: '" + newName + "'</div>");
-                        fixedCount++;
-                    }
-                    updateStmt.close();
-                }
-                
-                out.println("<div class='info'>总共修复了 " + fixedCount + " 条宠物数据</div>");
-                
-            } catch (SQLException e) {
-                out.println("<div class='error'>修复失败: " + e.getMessage() + "</div>");
-                e.printStackTrace();
-            } finally {
-                DBUtil.closeAll(conn, pstmt, rs);
-            }
-        }
-        
-        // 显示当前宠物数据
-        out.println("<h2>当前宠物数据:</h2>");
-        
-        PetService petService = new PetServiceImpl();
-        List<Pet> allPets = petService.getAllPets();
-        
-        if (allPets != null && !allPets.isEmpty()) {
-            out.println("<table>");
-            out.println("<tr><th>ID</th><th>名称</th><th>类型</th><th>品种</th><th>主人ID</th><th>状态</th></tr>");
-            
-            boolean hasProblems = false;
-            for (Pet pet : allPets) {
-                String nameClass = "";
-                boolean isProblem = false;
-                
-                if (pet.getPetName() == null || pet.getPetName().trim().isEmpty() || 
-                    pet.getPetName().matches("\\d+")) {
-                    nameClass = "class='error'";
-                    isProblem = true;
-                    hasProblems = true;
-                }
-                
-                out.println("<tr>");
-                out.println("<td>" + pet.getPetId() + "</td>");
-                out.println("<td " + nameClass + ">" + pet.getPetName() + (isProblem ? " (有问题)" : "") + "</td>");
-                out.println("<td>" + pet.getPetType() + "</td>");
-                out.println("<td>" + pet.getBreed() + "</td>");
-                out.println("<td>" + pet.getOwnerId() + "</td>");
-                out.println("<td>" + pet.getStatus() + "</td>");
-                out.println("</tr>");
-            }
-            out.println("</table>");
-            
-            if (hasProblems) {
-                out.println("<br><a href='?action=fix' style='background-color: #4CAF50; color: white; padding: 10px 20px; text-decoration: none; border-radius: 4px;'>修复有问题的宠物数据</a>");
-            } else {
-                out.println("<div class='success'>所有宠物数据都正常！</div>");
-            }
-            
-        } else {
-            out.println("<div class='error'>没有找到任何宠物数据</div>");
-        }
-    %>
-    
-    <%!
-        private String generatePetName(String petType, String breed, int petId) {
-            if (petType != null && breed != null) {
-                if ("狗".equals(petType)) {
-                    if ("金毛".equals(breed)) return "金毛" + petId;
-                    if ("泰迪".equals(breed)) return "泰迪" + petId;
-                    if ("哈士奇".equals(breed)) return "哈士奇" + petId;
-                    return "狗狗" + petId;
-                } else if ("猫".equals(petType)) {
-                    if ("英短".equals(breed)) return "英短" + petId;
-                    if ("美短".equals(breed)) return "美短" + petId;
-                    if ("布偶".equals(breed)) return "布偶" + petId;
-                    return "猫咪" + petId;
-                }
-            }
-            return "宠物" + petId;
-        }
-    %>
-    
-    <hr>
-    <p><a href="${pageContext.request.contextPath}/appointment/add">返回预约页面</a></p>
-    <p><a href="${pageContext.request.contextPath}/debug-pets.jsp">查看调试页面</a></p>
-</body>
-</html>
diff --git a/src/main/webapp/pages/user/appointment-add-simple.jsp b/src/main/webapp/pages/user/appointment-add-simple.jsp
deleted file mode 100644
index 7fca7bb..0000000
--- a/src/main/webapp/pages/user/appointment-add-simple.jsp
+++ /dev/null
@@ -1,222 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<!DOCTYPE html>
-<html lang="zh-CN">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>预约挂号 - 宠物医院管理系统</title>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css" rel="stylesheet">
-</head>
-<body>
-    <div class="container-fluid">
-        <div class="row">
-            <!-- 侧边栏 -->
-            <div class="col-md-2 p-0">
-                <%@ include file="../common/user-sidebar.jsp" %>
-            </div>
-            
-            <!-- 主内容区 -->
-            <div class="col-md-10">
-                <div class="main-content p-4">
-                    <!-- 页面标题 -->
-                    <div class="d-flex justify-content-between align-items-center mb-4">
-                        <h2><i class="fas fa-calendar-plus me-2"></i>预约挂号</h2>
-                    </div>
-
-                    <!-- 提示信息 -->
-                    <c:if test="${not empty error}">
-                        <div class="alert alert-danger alert-dismissible fade show" role="alert">
-                            <i class="fas fa-exclamation-circle me-2"></i>${error}
-                            <button type="button" class="btn-close" data-bs-dismiss="alert"></button>
-                        </div>
-                    </c:if>
-
-                    <!-- 预约表单 -->
-                    <div class="card">
-                        <div class="card-header">
-                            <h5 class="mb-0"><i class="fas fa-calendar-check me-2"></i>预约信息</h5>
-                        </div>
-                        <div class="card-body">
-                            <form action="${pageContext.request.contextPath}/appointment/add" method="post" id="appointmentForm">
-                                <input type="hidden" name="action" value="add">
-                                
-                                <div class="row">
-                                    <!-- 基本信息 -->
-                                    <div class="col-md-6">
-                                        <h6 class="text-primary mb-3"><i class="fas fa-info-circle me-2"></i>基本信息</h6>
-                                        
-                                        <div class="mb-3">
-                                            <label for="petId" class="form-label">选择宠物 <span class="text-danger">*</span></label>
-                                            
-                                            <!-- 简单的调试信息 -->
-                                            <div class="form-text text-info mb-2">
-                                                当前用户: ${sessionScope.currentUser.username} (ID: ${sessionScope.currentUser.userId})
-                                            </div>
-                                            
-                                            <select class="form-select" id="petId" name="petId" required>
-                                                <option value="">请选择宠物</option>
-                                                <c:forEach var="pet" items="${myPets}">
-                                                    <option value="${pet.petId}" ${appointment.petId == pet.petId ? 'selected' : ''}>
-                                                        ${pet.petName} (${pet.petType})
-                                                    </option>
-                                                </c:forEach>
-                                            </select>
-                                            
-                                            <c:if test="${empty myPets}">
-                                                <div class="form-text text-warning">
-                                                    您还没有宠物档案，请先 <a href="${pageContext.request.contextPath}/pet/add">添加宠物</a>
-                                                </div>
-                                            </c:if>
-                                        </div>
-
-                                        <div class="mb-3">
-                                            <label for="serviceType" class="form-label">服务类型 <span class="text-danger">*</span></label>
-                                            <select class="form-select" id="serviceType" name="serviceType" required>
-                                                <option value="">请选择服务类型</option>
-                                                <option value="体检">体检</option>
-                                                <option value="疫苗接种">疫苗接种</option>
-                                                <option value="驱虫">驱虫</option>
-                                                <option value="绝育手术">绝育手术</option>
-                                                <option value="外科手术">外科手术</option>
-                                                <option value="内科治疗">内科治疗</option>
-                                                <option value="皮肤病治疗">皮肤病治疗</option>
-                                                <option value="眼科检查">眼科检查</option>
-                                                <option value="牙科护理">牙科护理</option>
-                                                <option value="美容护理">美容护理</option>
-                                                <option value="急诊治疗">急诊治疗</option>
-                                                <option value="其他">其他</option>
-                                            </select>
-                                        </div>
-
-                                        <div class="mb-3">
-                                            <label for="appointmentDate" class="form-label">预约日期 <span class="text-danger">*</span></label>
-                                            <input type="date" class="form-control" id="appointmentDate" name="appointmentDate" 
-                                                   value="${appointment.appointmentDate}" required>
-                                        </div>
-
-                                        <div class="mb-3">
-                                            <label for="appointmentTime" class="form-label">预约时间 <span class="text-danger">*</span></label>
-                                            <select class="form-select" id="appointmentTime" name="appointmentTime" required>
-                                                <option value="">请先选择日期</option>
-                                            </select>
-                                        </div>
-
-                                        <div class="mb-3">
-                                            <label for="doctorName" class="form-label">指定医生</label>
-                                            <select class="form-select" id="doctorName" name="doctorName">
-                                                <option value="">不指定（由医院安排）</option>
-                                                <option value="张医生">张医生</option>
-                                                <option value="李医生">李医生</option>
-                                                <option value="王医生">王医生</option>
-                                                <option value="刘医生">刘医生</option>
-                                                <option value="陈医生">陈医生</option>
-                                            </select>
-                                        </div>
-                                    </div>
-
-                                    <!-- 详细信息 -->
-                                    <div class="col-md-6">
-                                        <h6 class="text-primary mb-3"><i class="fas fa-clipboard me-2"></i>详细信息</h6>
-                                        
-                                        <div class="mb-3">
-                                            <label for="symptoms" class="form-label">症状描述</label>
-                                            <textarea class="form-control" id="symptoms" name="symptoms" 
-                                                      rows="6" maxlength="500" placeholder="请详细描述宠物的症状或需要的服务">${appointment.symptoms}</textarea>
-                                            <div class="form-text">详细的症状描述有助于医生更好地准备和诊断</div>
-                                        </div>
-
-                                        <div class="mb-3">
-                                            <label for="notes" class="form-label">备注信息</label>
-                                            <textarea class="form-control" id="notes" name="notes" 
-                                                      rows="4" maxlength="500" placeholder="其他需要说明的信息">${appointment.notes}</textarea>
-                                            <div class="form-text">如特殊要求、联系方式等</div>
-                                        </div>
-                                    </div>
-                                </div>
-
-                                <!-- 提交按钮 -->
-                                <div class="row mt-4">
-                                    <div class="col-12">
-                                        <div class="d-flex justify-content-end">
-                                            <a href="${pageContext.request.contextPath}/appointment/my-appointments?action=my-appointments" 
-                                               class="btn btn-outline-secondary me-2">
-                                                <i class="fas fa-times me-2"></i>取消
-                                            </a>
-                                            <button type="submit" class="btn btn-primary">
-                                                <i class="fas fa-save me-2"></i>提交预约
-                                            </button>
-                                        </div>
-                                    </div>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"></script>
-    <script>
-        // 页面加载完成后的调试信息
-        document.addEventListener('DOMContentLoaded', function() {
-            console.log('页面加载完成');
-            
-            // 设置最小日期为明天
-            const today = new Date();
-            const tomorrow = new Date(today);
-            tomorrow.setDate(tomorrow.getDate() + 1);
-            
-            const dateInput = document.getElementById('appointmentDate');
-            dateInput.min = tomorrow.toISOString().split('T')[0];
-            
-            // 检查宠物选择框
-            const petSelect = document.getElementById('petId');
-            console.log('宠物选择框元素:', petSelect);
-            console.log('宠物选择框选项数量:', petSelect.options.length);
-            
-            for (let i = 0; i < petSelect.options.length; i++) {
-                console.log('选项 ' + i + ':', petSelect.options[i].value, petSelect.options[i].text);
-            }
-        });
-
-        // 表单验证
-        document.getElementById('appointmentForm').addEventListener('submit', function(e) {
-            const petId = document.getElementById('petId').value;
-            const serviceType = document.getElementById('serviceType').value;
-            const appointmentDate = document.getElementById('appointmentDate').value;
-            const appointmentTime = document.getElementById('appointmentTime').value;
-            
-            if (!petId) {
-                e.preventDefault();
-                alert('请选择宠物');
-                document.getElementById('petId').focus();
-                return;
-            }
-            
-            if (!serviceType) {
-                e.preventDefault();
-                alert('请选择服务类型');
-                document.getElementById('serviceType').focus();
-                return;
-            }
-            
-            if (!appointmentDate) {
-                e.preventDefault();
-                alert('请选择预约日期');
-                document.getElementById('appointmentDate').focus();
-                return;
-            }
-            
-            if (!appointmentTime) {
-                e.preventDefault();
-                alert('请选择预约时间');
-                document.getElementById('appointmentTime').focus();
-                return;
-            }
-        });
-    </script>
-</body>
-</html>
diff --git a/src/main/webapp/test-basic.jsp b/src/main/webapp/test-basic.jsp
deleted file mode 100644
index 6cf3ae4..0000000
--- a/src/main/webapp/test-basic.jsp
+++ /dev/null
@@ -1,42 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<!DOCTYPE html>
-<html>
-<head>
-    <title>基本测试页面</title>
-    <meta charset="UTF-8">
-</head>
-<body>
-    <h1>基本测试页面</h1>
-    
-    <h2>当前用户信息:</h2>
-    <p>用户名: ${sessionScope.currentUser.username}</p>
-    <p>用户ID: ${sessionScope.currentUser.userId}</p>
-    
-    <h2>宠物列表测试:</h2>
-    <c:if test="${empty myPets}">
-        <p>宠物列表为空</p>
-    </c:if>
-    
-    <c:if test="${not empty myPets}">
-        <p>找到宠物数据:</p>
-        <ul>
-            <c:forEach var="pet" items="${myPets}">
-                <li>ID: ${pet.petId}, 名称: ${pet.petName}, 类型: ${pet.petType}</li>
-            </c:forEach>
-        </ul>
-        
-        <h3>选择框测试:</h3>
-        <select>
-            <option value="">请选择宠物</option>
-            <c:forEach var="pet" items="${myPets}">
-                <option value="${pet.petId}">${pet.petName} (${pet.petType})</option>
-            </c:forEach>
-        </select>
-    </c:if>
-    
-    <hr>
-    <p><a href="${pageContext.request.contextPath}/appointment/add">访问预约页面</a></p>
-    <p><a href="${pageContext.request.contextPath}/pages/user/appointment-add-simple.jsp">访问简化预约页面</a></p>
-</body>
-</html>