diff --git a/.gitignore b/.gitignore
index 340c491..6b0636e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -128,6 +128,10 @@ buildNumber.properties
 # https://github.com/takari/maven-wrapper#usage-without-binary-jar
 .mvn/wrapper/maven-wrapper.jar
 
+# User-generated content
+img_db/
+src/main/resources/image/checkup_media/
+
 # Eclipse m2e generated files
 # Eclipse Core
 .project
diff --git a/src/main/java/BsK/client/ui/component/CheckUpPage/CheckUpPage.java b/src/main/java/BsK/client/ui/component/CheckUpPage/CheckUpPage.java
index 2e7f09e..6cb0169 100644
--- a/src/main/java/BsK/client/ui/component/CheckUpPage/CheckUpPage.java
+++ b/src/main/java/BsK/client/ui/component/CheckUpPage/CheckUpPage.java
@@ -4,6 +4,7 @@ import BsK.client.LocalStorage;
 import BsK.client.network.handler.ClientHandler;
 import BsK.client.network.handler.ResponseListener;
 import BsK.client.ui.component.CheckUpPage.AddDialog.AddDialog;
+import BsK.client.ui.component.CheckUpPage.HistoryViewDialog.HistoryViewDialog;
 import BsK.client.ui.component.CheckUpPage.MedicineDialog.MedicineDialog;
 import BsK.client.ui.component.CheckUpPage.PrintDialog.MedicineInvoice;
 import BsK.client.ui.component.CheckUpPage.ServiceDialog.ServiceDialog;
@@ -15,6 +16,7 @@ import BsK.client.ui.component.common.RoundedPanel;
 import BsK.client.ui.component.QueueViewPage.QueueViewPage;
 import BsK.common.entity.Patient;
 import BsK.common.entity.Status;
+import BsK.common.entity.Template;
 import BsK.common.packet.req.*;
 import BsK.common.packet.res.*;
 import BsK.common.util.network.NetworkUtil;
@@ -81,7 +83,10 @@ import static org.bytedeco.opencv.global.opencv_core.cvFlip;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import javax.swing.JFrame;
 import javax.swing.JTextPane;
 import javax.swing.JToolBar;
@@ -101,6 +106,15 @@ import java.io.InputStream;
 import BsK.common.entity.PatientHistory;
 import BsK.common.packet.req.GetPatientHistoryRequest;
 import BsK.common.packet.res.GetPatientHistoryResponse;
+import BsK.common.packet.req.SaveCheckupRequest;
+import BsK.common.packet.req.SearchAllRole;
+import BsK.common.packet.req.SearchAllUser;
+import BsK.common.packet.req.UploadCheckupImageRequest;
+import BsK.common.packet.res.AddCheckupResponse;
+import BsK.common.packet.res.AddPatientResponse;
+import BsK.common.packet.res.RegisterSuccessResponse;
+import BsK.common.packet.res.SaveCheckupRes;
+import BsK.common.packet.res.UploadCheckupImageResponse;
 
 @Slf4j
 public class CheckUpPage extends JPanel {
@@ -117,10 +131,12 @@ public class CheckUpPage extends JPanel {
     private final ResponseListener<GetWardResponse> wardResponseListener = this::handleGetWardResponse;
     private final ResponseListener<CallPatientResponse> callPatientResponseListener = this::handleCallPatientResponse;
     private final ResponseListener<GetOrderInfoByCheckupRes> orderInfoByCheckupListener = this::handleGetOrderInfoByCheckupResponse;
+    private final ResponseListener<GetAllTemplatesRes> getAllTemplatesListener = this::handleGetAllTemplatesResponse;
+    private final ResponseListener<UploadCheckupImageResponse> uploadImageResponseListener = this::handleUploadImageResponse;
     private JTextField checkupIdField, customerLastNameField, customerFirstNameField,customerAddressField, customerPhoneField, customerIdField;
     private JTextArea suggestionField, diagnosisField, conclusionField; // Changed symptomsField to suggestionField
     private JTextPane notesField;
-    private JComboBox<String> doctorComboBox, statusComboBox, genderComboBox, provinceComboBox, districtComboBox, wardComboBox, checkupTypeComboBox;
+    private JComboBox<String> doctorComboBox, statusComboBox, genderComboBox, provinceComboBox, districtComboBox, wardComboBox, checkupTypeComboBox, templateComboBox;
     private JSpinner customerWeightSpinner, customerHeightSpinner;
     private JDatePickerImpl datePicker, dobPicker;
     private String[][] medicinePrescription = new String[0][0]; // Initialize to empty
@@ -136,6 +152,7 @@ public class CheckUpPage extends JPanel {
     private JButton callPatientButton;
     private JLabel callingStatusLabel;
     private JPanel rightContainer; // Add this field
+    private List<Template> allTemplates;
 
     private QueueViewPage tvQueueFrame;
     private QueueManagementPage queueManagementPage; // The new queue window
@@ -176,6 +193,9 @@ public class CheckUpPage extends JPanel {
     private javax.swing.Timer recordingTimer;
     private boolean isWebcamInitialized = false;
     private JPanel webcamContainer;
+    private final ExecutorService imageUploadExecutor = Executors.newSingleThreadExecutor();
+    private final ScheduledExecutorService timeoutExecutor = Executors.newSingleThreadScheduledExecutor();
+    private final Map<String, Future<?>> uploadTimeoutTasks = new ConcurrentHashMap<>();
 
     // Video recording components
     private FFmpegFrameRecorder recorder;
@@ -183,10 +203,26 @@ public class CheckUpPage extends JPanel {
 
     boolean returnCell = false;
 
+    // Template print setting
+    private int photoNum = 0;
+    private String printType = "";
+    private String templateName = "";
+    private String templateTitle = "";
+    private String templateGender = "";
+    private String templateContent = "";
+    private String templateConclusion = "";
+    private String templateSuggestion = "";
+    
+
     public void updateQueue() {
         NetworkUtil.sendPacket(ClientHandler.ctx.channel(), new GetCheckUpQueueRequest());
     }
 
+
+    public void getAllTemplates() {
+        NetworkUtil.sendPacket(ClientHandler.ctx.channel(), new GetAllTemplatesReq());
+    }
+
     public void updateUpdateQueue() {
         NetworkUtil.sendPacket(ClientHandler.ctx.channel(), new GetCheckUpQueueUpdateRequest());
     }
@@ -277,11 +313,14 @@ public class CheckUpPage extends JPanel {
         ClientHandler.addResponseListener(GetDistrictResponse.class, districtResponseListener);
         ClientHandler.addResponseListener(GetWardResponse.class, wardResponseListener);
         ClientHandler.addResponseListener(CallPatientResponse.class, callPatientResponseListener);
+        ClientHandler.addResponseListener(GetAllTemplatesRes.class, getAllTemplatesListener);
+        ClientHandler.addResponseListener(UploadCheckupImageResponse.class, uploadImageResponseListener);
 
         // Instantiate the new queue page but don't show it yet
         queueManagementPage = new QueueManagementPage();
 
         updateQueue();
+        getAllTemplates();
 
         // --- Navigation Bar ---
         NavBar navBar = new NavBar(mainFrame, "Thăm khám");
@@ -755,7 +794,7 @@ public class CheckUpPage extends JPanel {
         templatePanel.add(templateLabel, gbcTemplate);
 
         gbcTemplate.gridx = 1; gbcTemplate.weightx = 1.0;
-        JComboBox<String> templateComboBox = new JComboBox<>(new String[]{
+        templateComboBox = new JComboBox<>(new String[]{
             "Không sử dụng mẫu",
             "Mẫu khám tổng quát",
             "Mẫu khám thai",
@@ -763,8 +802,10 @@ public class CheckUpPage extends JPanel {
             "Mẫu khám tim mạch"
         });
         templateComboBox.setFont(fieldFont);
+        templateComboBox.addActionListener(e -> handleTemplateSelection());
         templatePanel.add(templateComboBox, gbcTemplate);
 
+        
         // Add "Thêm mẫu" button next to template combobox
         gbcTemplate.gridx = 2; gbcTemplate.weightx = 0.0;
         JButton addTemplateButton = new JButton("Thêm mẫu");
@@ -1056,8 +1097,16 @@ public class CheckUpPage extends JPanel {
             public void mouseClicked(MouseEvent e) {
                 if (e.getClickCount() == 1) {
                     int selectedRow = historyTable.getSelectedRow();
-                    // send getPatientInfoByCheckupIdReq
-                    
+                    if (selectedRow >= 0 && selectedRow < history.length) {
+                        // Get selected history data
+                        String[] selectedHistory = history[selectedRow];
+                        String checkupId = selectedHistory[0]; // Assuming first column is checkup ID
+                        String patientName = customerFirstNameField.getText() + " " + customerLastNameField.getText();
+                        String checkupDate = selectedHistory.length > 1 ? selectedHistory[1] : ""; // Assuming second column is date
+                        
+                        // Open history view dialog
+                        openHistoryViewDialog(checkupId, patientName, checkupDate);
+                    }
                 }
             }
         });
@@ -2075,25 +2124,91 @@ public class CheckUpPage extends JPanel {
             try {
                 BufferedImage image = selectedWebcam.getImage();
                 if (image != null) {
+                    // Save locally first for immediate UI feedback (PNG for high quality local cache)
                     ImageIO.write(image, "PNG", filePath.toFile());
-                    log.info("Picture taken and saved at: {}", filePath);
-                    JOptionPane.showMessageDialog(this,
-                            "Đã chụp và lưu ảnh thành công tại:\n" + filePath.toString(),
-                            "Chụp ảnh thành công", JOptionPane.INFORMATION_MESSAGE);
+                    log.info("Picture taken and saved locally at: {}", filePath);
+
+                    // Refresh UI to show the new image immediately
                     loadAndDisplayImages(currentCheckupMediaPath);
+
+                    // Now, upload in the background (will be compressed to JPG)
+                    uploadImageInBackground(filePath.getFileName().toString(), image);
+
                 } else {
                     throw new IOException("Không thể lấy ảnh từ webcam");
                 }
             } catch (IOException ex) {
-                log.error("Error capturing/saving image: {}", filePath, ex);
-                JOptionPane.showMessageDialog(this, 
-                    "Lỗi khi chụp/lưu ảnh: " + ex.getMessage(), 
-                    "Lỗi Chụp Ảnh", 
+                log.error("Error capturing/saving image locally: {}", filePath, ex);
+                JOptionPane.showMessageDialog(this,
+                    "Lỗi khi lưu ảnh cục bộ: " + ex.getMessage(),
+                    "Lỗi Lưu Ảnh",
                     JOptionPane.ERROR_MESSAGE);
             }
         }
     }
 
+    private void uploadImageInBackground(String fileName, BufferedImage image) {
+        imageUploadExecutor.submit(() -> {
+            try {
+                // Compress the image to JPEG for smaller size
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                ImageIO.write(image, "jpg", baos);
+                byte[] compressedImageData = baos.toByteArray();
+
+                // Create and send the request
+                String checkupId = currentCheckupIdForMedia;
+
+                // Adjust file name to have .jpg extension for the server
+                String jpgFileName = fileName.substring(0, fileName.lastIndexOf('.')) + ".jpg";
+
+                // Schedule a timeout task for this upload
+                Future<?> timeoutTask = timeoutExecutor.schedule(() -> {
+                    // If the task is still in the map, it means we timed out
+                    if (uploadTimeoutTasks.remove(jpgFileName) != null) {
+                        SwingUtilities.invokeLater(() -> {
+                            JOptionPane.showMessageDialog(CheckUpPage.this,
+                                "Không nhận được phản hồi từ máy chủ khi tải lên ảnh: " + jpgFileName + "\n" +
+                                "Vui lòng kiểm tra lại kết nối mạng (Wi-Fi/Internet).",
+                                "Lỗi Mạng",
+                                JOptionPane.WARNING_MESSAGE);
+                        });
+                    }
+                }, 15, TimeUnit.SECONDS); // 15-second timeout
+
+                // Store the task so we can cancel it if we get a response
+                uploadTimeoutTasks.put(jpgFileName, timeoutTask);
+
+                UploadCheckupImageRequest request = new UploadCheckupImageRequest(checkupId, compressedImageData, jpgFileName);
+                NetworkUtil.sendPacket(ClientHandler.ctx.channel(), request);
+                log.info("Sent UploadCheckupImageRequest for {}", jpgFileName);
+
+            } catch (IOException e) {
+                log.error("Failed to compress image for upload: {}", fileName, e);
+                // The timeout mechanism will handle notifying the user of a potential network issue.
+            }
+        });
+    }
+
+    private void handleUploadImageResponse(UploadCheckupImageResponse response) {
+        String fileName = response.getFileName();
+        
+        // A response was received, so find and cancel the timeout task.
+        Future<?> timeoutTask = uploadTimeoutTasks.remove(fileName);
+        if (timeoutTask != null) {
+            timeoutTask.cancel(false); // Cancel the scheduled timeout
+        }
+        
+        if (response.isSuccess()) {
+            log.info("Successfully uploaded image: {}", response.getMessage());
+        } else {
+            log.error("Failed to upload image: {}", response.getMessage());
+            JOptionPane.showMessageDialog(this,
+                    "Lỗi khi tải ảnh lên server: " + response.getMessage(),
+                    "Lỗi Tải Ảnh",
+                    JOptionPane.ERROR_MESSAGE);
+        }
+    }
+
     private void handleRecordVideo() {
         if (currentCheckupMediaPath == null) {
             JOptionPane.showMessageDialog(this, "Vui lòng chọn một lượt khám để lưu video.", "Chưa chọn lượt khám", JOptionPane.WARNING_MESSAGE);
@@ -2736,6 +2851,72 @@ public class CheckUpPage extends JPanel {
         NetworkUtil.sendPacket(ClientHandler.ctx.channel(), request);
         saved = true;
     }
+
+    private void handleTemplateSelection() {
+        String selectedTemplateName = (String) templateComboBox.getSelectedItem();
+
+        if (selectedTemplateName == null || allTemplates == null || selectedTemplateName.equals("Không sử dụng mẫu")) {
+            return;
+        }
+
+        allTemplates.stream()
+            .filter(t -> t.getTemplateName().equals(selectedTemplateName))
+            .findFirst()
+            .ifPresent(this::applyTemplate);
+    }
+
+    private void applyTemplate(Template template) {
+        diagnosisField.setText(template.getDiagnosis());
+        conclusionField.setText(template.getConclusion());
+        suggestionField.setText(template.getSuggestion());
+        
+        String rtfContent = template.getContent();
+        if (rtfContent != null && !rtfContent.isEmpty()) {
+            setRtfContentFromString(rtfContent);
+        } else {
+            setRtfContentFromString(""); // Clear if content is empty
+        }
+        // Set template print setting
+        photoNum = Integer.parseInt(template.getPhotoNum());
+        printType = template.getPrintType();
+        templateName = template.getTemplateName();
+        templateTitle = template.getTemplateTitle();
+        templateGender = template.getTemplateGender();
+        templateContent = template.getContent();
+        templateConclusion = template.getConclusion();
+        templateSuggestion = template.getSuggestion();
+    }
+
+    private void handleGetAllTemplatesResponse(GetAllTemplatesRes response) {
+        log.info("Get all templates response");
+        this.allTemplates = response.getTemplates();
+        List<Template> templates = response.getTemplates();
+        SwingUtilities.invokeLater(() -> {
+            templateComboBox.removeAllItems();
+            templateComboBox.addItem("Không sử dụng mẫu");
+            for (Template template : templates) {
+                templateComboBox.addItem(template.getTemplateName());
+            }
+        });
+
+        // No need to delete listener here because it will be called again when user click refresh button
+    }
+
+    /**
+     * Opens the history view dialog for the selected checkup
+     */
+    private void openHistoryViewDialog(String checkupId, String patientName, String checkupDate) {
+        try {
+            HistoryViewDialog historyDialog = new HistoryViewDialog(mainFrame, checkupId, patientName, checkupDate);
+            historyDialog.setVisible(true);
+        } catch (Exception e) {
+            log.error("Error opening history view dialog", e);
+            JOptionPane.showMessageDialog(this, 
+                "Không thể mở chi tiết lịch sử khám: " + e.getMessage(), 
+                "Lỗi", 
+                JOptionPane.ERROR_MESSAGE);
+        }
+    }
 }
 
 
diff --git a/src/main/java/BsK/client/ui/component/CheckUpPage/HistoryViewDialog/HistoryViewDialog.java b/src/main/java/BsK/client/ui/component/CheckUpPage/HistoryViewDialog/HistoryViewDialog.java
new file mode 100644
index 0000000..cca6ac1
--- /dev/null
+++ b/src/main/java/BsK/client/ui/component/CheckUpPage/HistoryViewDialog/HistoryViewDialog.java
@@ -0,0 +1,650 @@
+package BsK.client.ui.component.CheckUpPage.HistoryViewDialog;
+
+import javax.swing.*;
+import javax.swing.border.TitledBorder;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import java.awt.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import javax.imageio.ImageIO;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class HistoryViewDialog extends JDialog {
+    
+    // Data models
+    private String checkupId;
+    private String patientName;
+    private String checkupDate;
+    private String content;
+    private String suggestion;
+    private String conclusion;
+    private String[][] medicinePrescription;
+    private String[][] servicePrescription;
+    
+    // UI Components
+    private JLabel imagePreviewLabel;
+    private JPanel imageListPanel;
+    private JScrollPane imageListScrollPane;
+    private JTextArea contentArea;
+    private JTextArea suggestionArea;
+    private JTextArea conclusionArea;
+    private JTree prescriptionTree;
+    private DefaultTreeModel prescriptionTreeModel;
+    private DefaultMutableTreeNode rootPrescriptionNode;
+    private JLabel totalMedCostLabel;
+    private JLabel totalSerCostLabel;
+    private JLabel overallTotalCostLabel;
+    
+    // Constants
+    private static final int THUMBNAIL_WIDTH = 80;
+    private static final int THUMBNAIL_HEIGHT = 80;
+    private static final String CHECKUP_MEDIA_BASE_DIR = "src/main/resources/image/checkup_media";
+    private static final DecimalFormat df = new DecimalFormat("#,##0");
+    
+    // Current selected image
+    private BufferedImage currentSelectedImage;
+    private List<File> imageFiles;
+    
+    public HistoryViewDialog(Frame parent, String checkupId, String patientName, String checkupDate) {
+        super(parent, "Xem chi tiết lịch sử khám - " + patientName, true);
+        this.checkupId = checkupId;
+        this.patientName = patientName;
+        this.checkupDate = checkupDate;
+        this.imageFiles = new ArrayList<>();
+        
+        // Initialize sample data for demonstration
+        initializeSampleData();
+        
+        initializeDialog(parent);
+        setupUI();
+        loadImagesForCheckup();
+        updatePrescriptionTree();
+    }
+    
+    private void initializeSampleData() {
+        // Sample data - in real implementation, this would come from database
+        this.content = "Bệnh nhân có triệu chứng đau đầu, sốt nhẹ. Khám tổng quát không có bất thường đáng kể.";
+        this.suggestion = "Nghỉ ngơi đầy đủ, uống nhiều nước, theo dõi thêm 2-3 ngày.";
+        this.conclusion = "Cảm cúm thông thường, không có biến chứng.";
+        
+        // Sample medicine prescription
+        this.medicinePrescription = new String[][] {
+            {"1", "Paracetamol 500mg", "2", "viên", "1", "1", "1", "5000", "30000", "Uống sau ăn"},
+            {"2", "Vitamin C", "1", "lọ", "0", "1", "0", "15000", "15000", "Uống trước ăn"}
+        };
+        
+        // Sample service prescription
+        this.servicePrescription = new String[][] {
+            {"1", "Xét nghiệm máu", "1", "100000", "100000", "Xét nghiệm tổng quát"},
+            {"2", "Siêu âm", "1", "200000", "200000", "Siêu âm bụng"}
+        };
+    }
+    
+    private void initializeDialog(Frame parent) {
+        setDefaultCloseOperation(DISPOSE_ON_CLOSE);
+        setSize(1200, 800);
+        setLocationRelativeTo(parent);
+        setResizable(true);
+        setModalityType(Dialog.ModalityType.APPLICATION_MODAL);
+        
+        addWindowListener(new WindowAdapter() {
+            @Override
+            public void windowIconified(WindowEvent e) {
+                if (parent != null) {
+                    parent.setState(Frame.ICONIFIED);
+                }
+            }
+            
+            @Override
+            public void windowDeiconified(WindowEvent e) {
+                if (parent != null && parent.getState() == Frame.ICONIFIED) {
+                    parent.setState(Frame.NORMAL);
+                }
+            }
+        });
+    }
+    
+    private void setupUI() {
+        setLayout(new BorderLayout(10, 10));
+        
+        // Create main content panel with padding
+        JPanel mainPanel = new JPanel(new BorderLayout(10, 10));
+        mainPanel.setBorder(BorderFactory.createEmptyBorder(15, 15, 15, 15));
+        
+        // Create header panel
+        JPanel headerPanel = createHeaderPanel();
+        mainPanel.add(headerPanel, BorderLayout.NORTH);
+        
+        // Create center panel with main content
+        JPanel centerPanel = createCenterPanel();
+        mainPanel.add(centerPanel, BorderLayout.CENTER);
+        
+        add(mainPanel, BorderLayout.CENTER);
+    }
+    
+    private JPanel createHeaderPanel() {
+        JPanel headerPanel = new JPanel(new BorderLayout());
+        headerPanel.setBorder(BorderFactory.createCompoundBorder(
+            BorderFactory.createMatteBorder(0, 0, 2, 0, new Color(63, 81, 181)),
+            BorderFactory.createEmptyBorder(10, 15, 10, 15)
+        ));
+        headerPanel.setBackground(new Color(248, 249, 250));
+        
+        // Left side - Patient info
+        JPanel patientInfoPanel = new JPanel(new GridBagLayout());
+        patientInfoPanel.setOpaque(false);
+        GridBagConstraints gbc = new GridBagConstraints();
+        gbc.anchor = GridBagConstraints.WEST;
+        gbc.insets = new Insets(2, 0, 2, 20);
+        
+        JLabel titleLabel = new JLabel("THÔNG TIN KHÁM BỆNH");
+        titleLabel.setFont(new Font("Arial", Font.BOLD, 18));
+        titleLabel.setForeground(new Color(63, 81, 181));
+        gbc.gridx = 0; gbc.gridy = 0; gbc.gridwidth = 2;
+        patientInfoPanel.add(titleLabel, gbc);
+        
+        gbc.gridwidth = 1;
+        gbc.gridy = 1;
+        gbc.gridx = 0;
+        JLabel patientLabel = new JLabel("Bệnh nhân:");
+        patientLabel.setFont(new Font("Arial", Font.BOLD, 12));
+        patientInfoPanel.add(patientLabel, gbc);
+        
+        gbc.gridx = 1;
+        JLabel patientNameLabel = new JLabel(patientName);
+        patientNameLabel.setFont(new Font("Arial", Font.PLAIN, 12));
+        patientInfoPanel.add(patientNameLabel, gbc);
+        
+        gbc.gridy = 2;
+        gbc.gridx = 0;
+        JLabel dateLabel = new JLabel("Ngày khám:");
+        dateLabel.setFont(new Font("Arial", Font.BOLD, 12));
+        patientInfoPanel.add(dateLabel, gbc);
+        
+        gbc.gridx = 1;
+        JLabel checkupDateLabel = new JLabel(formatDate(checkupDate));
+        checkupDateLabel.setFont(new Font("Arial", Font.PLAIN, 12));
+        patientInfoPanel.add(checkupDateLabel, gbc);
+        
+        gbc.gridy = 3;
+        gbc.gridx = 0;
+        JLabel idLabel = new JLabel("Mã khám:");
+        idLabel.setFont(new Font("Arial", Font.BOLD, 12));
+        patientInfoPanel.add(idLabel, gbc);
+        
+        gbc.gridx = 1;
+        JLabel checkupIdLabel = new JLabel(checkupId);
+        checkupIdLabel.setFont(new Font("Arial", Font.PLAIN, 12));
+        patientInfoPanel.add(checkupIdLabel, gbc);
+        
+        headerPanel.add(patientInfoPanel, BorderLayout.WEST);
+        
+        // Right side - Close button
+        JButton closeButton = new JButton("Đóng");
+        closeButton.setFont(new Font("Arial", Font.BOLD, 12));
+        closeButton.setBackground(new Color(244, 67, 54));
+        closeButton.setForeground(Color.WHITE);
+        closeButton.setFocusPainted(false);
+        closeButton.setBorder(BorderFactory.createEmptyBorder(8, 20, 8, 20));
+        closeButton.setCursor(new Cursor(Cursor.HAND_CURSOR));
+        closeButton.addActionListener(e -> dispose());
+        
+        JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+        buttonPanel.setOpaque(false);
+        buttonPanel.add(closeButton);
+        headerPanel.add(buttonPanel, BorderLayout.EAST);
+        
+        return headerPanel;
+    }
+    
+    private JPanel createCenterPanel() {
+        JPanel centerPanel = new JPanel(new BorderLayout(10, 10));
+        
+        // Create main split pane (horizontal)
+        JSplitPane mainSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
+        mainSplitPane.setResizeWeight(0.6); // Left side gets 60%
+        mainSplitPane.setDividerSize(8);
+        mainSplitPane.setContinuousLayout(true);
+        
+        // Left side - Image section (split vertically)
+        JSplitPane leftSplitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
+        leftSplitPane.setResizeWeight(0.75); // Top gets 75%
+        leftSplitPane.setDividerSize(6);
+        leftSplitPane.setContinuousLayout(true);
+        
+        // Top left - Image preview (biggest area)
+        JPanel imagePreviewPanel = createImagePreviewPanel();
+        leftSplitPane.setTopComponent(imagePreviewPanel);
+        
+        // Bottom left - Image list
+        JPanel imageListPanelContainer = createImageListPanel();
+        leftSplitPane.setBottomComponent(imageListPanelContainer);
+        
+        mainSplitPane.setLeftComponent(leftSplitPane);
+        
+        // Right side (split vertically)
+        JSplitPane rightSplitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
+        rightSplitPane.setResizeWeight(0.5); // Equal split
+        rightSplitPane.setDividerSize(6);
+        rightSplitPane.setContinuousLayout(true);
+        
+        // Top right - Information content
+        JPanel infoPanel = createInformationPanel();
+        rightSplitPane.setTopComponent(infoPanel);
+        
+        // Bottom right - Prescription tree
+        JPanel prescriptionPanel = createPrescriptionPanel();
+        rightSplitPane.setBottomComponent(prescriptionPanel);
+        
+        mainSplitPane.setRightComponent(rightSplitPane);
+        
+        centerPanel.add(mainSplitPane, BorderLayout.CENTER);
+        
+        return centerPanel;
+    }
+    
+    private JPanel createImagePreviewPanel() {
+        JPanel panel = new JPanel(new BorderLayout());
+        panel.setBorder(BorderFactory.createTitledBorder(
+            BorderFactory.createLineBorder(new Color(76, 175, 80), 2),
+            "Xem trước hình ảnh",
+            TitledBorder.LEADING, TitledBorder.TOP,
+            new Font("Arial", Font.BOLD, 14), new Color(76, 175, 80)
+        ));
+        
+        // Create image preview label
+        imagePreviewLabel = new JLabel();
+        imagePreviewLabel.setHorizontalAlignment(SwingConstants.CENTER);
+        imagePreviewLabel.setVerticalAlignment(SwingConstants.CENTER);
+        imagePreviewLabel.setBackground(new Color(250, 250, 250));
+        imagePreviewLabel.setOpaque(true);
+        imagePreviewLabel.setBorder(BorderFactory.createLoweredBevelBorder());
+        
+        // Default message
+        imagePreviewLabel.setText("<html><center><div style='color: #999; font-size: 14px;'>" +
+                                 "<p>Chọn hình ảnh bên dưới để xem</p>" +
+                                 "<p>hoặc không có hình ảnh nào</p></div></center></html>");
+        
+        JScrollPane scrollPane = new JScrollPane(imagePreviewLabel);
+        scrollPane.setPreferredSize(new Dimension(400, 300));
+        panel.add(scrollPane, BorderLayout.CENTER);
+        
+        return panel;
+    }
+    
+    private JPanel createImageListPanel() {
+        JPanel containerPanel = new JPanel(new BorderLayout());
+        containerPanel.setBorder(BorderFactory.createTitledBorder(
+            BorderFactory.createLineBorder(new Color(255, 152, 0), 2),
+            "Danh sách hình ảnh",
+            TitledBorder.LEADING, TitledBorder.TOP,
+            new Font("Arial", Font.BOLD, 14), new Color(255, 152, 0)
+        ));
+        
+        // Create image list panel with flow layout
+        imageListPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 5, 5));
+        imageListPanel.setBackground(Color.WHITE);
+        
+        // Create scroll pane for image list
+        imageListScrollPane = new JScrollPane(imageListPanel);
+        imageListScrollPane.setPreferredSize(new Dimension(0, 120));
+        imageListScrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+        imageListScrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_NEVER);
+        
+        containerPanel.add(imageListScrollPane, BorderLayout.CENTER);
+        
+        return containerPanel;
+    }
+    
+    private JPanel createInformationPanel() {
+        JPanel panel = new JPanel(new BorderLayout());
+        panel.setBorder(BorderFactory.createTitledBorder(
+            BorderFactory.createLineBorder(new Color(63, 81, 181), 2),
+            "Thông tin khám bệnh",
+            TitledBorder.LEADING, TitledBorder.TOP,
+            new Font("Arial", Font.BOLD, 14), new Color(63, 81, 181)
+        ));
+        
+        // Create tabbed pane for different information sections
+        JTabbedPane tabbedPane = new JTabbedPane();
+        tabbedPane.setFont(new Font("Arial", Font.BOLD, 12));
+        
+        // Content tab
+        contentArea = new JTextArea(content);
+        contentArea.setEditable(false);
+        contentArea.setLineWrap(true);
+        contentArea.setWrapStyleWord(true);
+        contentArea.setFont(new Font("Arial", Font.PLAIN, 12));
+        contentArea.setBackground(new Color(248, 249, 250));
+        contentArea.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+        JScrollPane contentScroll = new JScrollPane(contentArea);
+        tabbedPane.addTab("Nội dung khám", contentScroll);
+        
+        // Suggestion tab
+        suggestionArea = new JTextArea(suggestion);
+        suggestionArea.setEditable(false);
+        suggestionArea.setLineWrap(true);
+        suggestionArea.setWrapStyleWord(true);
+        suggestionArea.setFont(new Font("Arial", Font.PLAIN, 12));
+        suggestionArea.setBackground(new Color(248, 249, 250));
+        suggestionArea.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+        JScrollPane suggestionScroll = new JScrollPane(suggestionArea);
+        tabbedPane.addTab("Đề nghị", suggestionScroll);
+        
+        // Conclusion tab
+        conclusionArea = new JTextArea(conclusion);
+        conclusionArea.setEditable(false);
+        conclusionArea.setLineWrap(true);
+        conclusionArea.setWrapStyleWord(true);
+        conclusionArea.setFont(new Font("Arial", Font.PLAIN, 12));
+        conclusionArea.setBackground(new Color(248, 249, 250));
+        conclusionArea.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+        JScrollPane conclusionScroll = new JScrollPane(conclusionArea);
+        tabbedPane.addTab("Kết luận", conclusionScroll);
+        
+        panel.add(tabbedPane, BorderLayout.CENTER);
+        
+        return panel;
+    }
+    
+    private JPanel createPrescriptionPanel() {
+        JPanel panel = new JPanel(new BorderLayout());
+        panel.setBorder(BorderFactory.createTitledBorder(
+            BorderFactory.createLineBorder(new Color(156, 39, 176), 2),
+            "Đơn thuốc & Dịch vụ",
+            TitledBorder.LEADING, TitledBorder.TOP,
+            new Font("Arial", Font.BOLD, 14), new Color(156, 39, 176)
+        ));
+        
+        // Create prescription tree
+        rootPrescriptionNode = new DefaultMutableTreeNode("Đơn thuốc & Dịch vụ");
+        prescriptionTreeModel = new DefaultTreeModel(rootPrescriptionNode);
+        prescriptionTree = new JTree(prescriptionTreeModel);
+        prescriptionTree.setFont(new Font("Arial", Font.PLAIN, 12));
+        prescriptionTree.setRowHeight(22);
+        prescriptionTree.setShowsRootHandles(true);
+        prescriptionTree.setRootVisible(false);
+        
+        JScrollPane treeScrollPane = new JScrollPane(prescriptionTree);
+        treeScrollPane.setPreferredSize(new Dimension(0, 200));
+        
+        // Create cost summary panel
+        JPanel costSummaryPanel = new JPanel(new GridBagLayout());
+        costSummaryPanel.setBorder(BorderFactory.createCompoundBorder(
+            BorderFactory.createMatteBorder(1, 0, 0, 0, Color.LIGHT_GRAY),
+            BorderFactory.createEmptyBorder(10, 15, 10, 15)
+        ));
+        costSummaryPanel.setBackground(new Color(248, 249, 250));
+        
+        GridBagConstraints gbc = new GridBagConstraints();
+        gbc.anchor = GridBagConstraints.WEST;
+        gbc.insets = new Insets(2, 0, 2, 0);
+        
+        totalMedCostLabel = new JLabel("Tổng tiền thuốc: 0 VNĐ");
+        totalMedCostLabel.setFont(new Font("Arial", Font.PLAIN, 12));
+        gbc.gridx = 0; gbc.gridy = 0;
+        costSummaryPanel.add(totalMedCostLabel, gbc);
+        
+        totalSerCostLabel = new JLabel("Tổng tiền dịch vụ: 0 VNĐ");
+        totalSerCostLabel.setFont(new Font("Arial", Font.PLAIN, 12));
+        gbc.gridy = 1;
+        costSummaryPanel.add(totalSerCostLabel, gbc);
+        
+        overallTotalCostLabel = new JLabel("TỔNG CỘNG: 0 VNĐ");
+        overallTotalCostLabel.setFont(new Font("Arial", Font.BOLD, 14));
+        overallTotalCostLabel.setForeground(new Color(244, 67, 54));
+        gbc.gridy = 2;
+        costSummaryPanel.add(overallTotalCostLabel, gbc);
+        
+        panel.add(treeScrollPane, BorderLayout.CENTER);
+        panel.add(costSummaryPanel, BorderLayout.SOUTH);
+        
+        return panel;
+    }
+    
+    private void loadImagesForCheckup() {
+        SwingUtilities.invokeLater(() -> {
+            imageFiles.clear();
+            imageListPanel.removeAll();
+            
+            // Load images from checkup media directory
+            Path mediaPath = Paths.get(CHECKUP_MEDIA_BASE_DIR, checkupId);
+            
+            if (Files.exists(mediaPath) && Files.isDirectory(mediaPath)) {
+                try {
+                    Files.list(mediaPath)
+                         .filter(path -> isImageFile(path.toString()))
+                         .forEach(path -> {
+                             File imageFile = path.toFile();
+                             imageFiles.add(imageFile);
+                             
+                             // Create thumbnail button
+                             JButton thumbnailButton = createThumbnailButton(imageFile);
+                             imageListPanel.add(thumbnailButton);
+                         });
+                } catch (IOException e) {
+                    log.error("Error loading images for checkup {}", checkupId, e);
+                }
+            }
+            
+            if (imageFiles.isEmpty()) {
+                JLabel noImagesLabel = new JLabel("Không có hình ảnh nào");
+                noImagesLabel.setFont(new Font("Arial", Font.ITALIC, 12));
+                noImagesLabel.setForeground(Color.GRAY);
+                imageListPanel.add(noImagesLabel);
+            }
+            
+            imageListPanel.revalidate();
+            imageListPanel.repaint();
+        });
+    }
+    
+    private JButton createThumbnailButton(File imageFile) {
+        JButton button = new JButton();
+        button.setPreferredSize(new Dimension(THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT));
+        button.setBorder(BorderFactory.createRaisedBevelBorder());
+        button.setFocusPainted(false);
+        button.setCursor(new Cursor(Cursor.HAND_CURSOR));
+        
+        try {
+            BufferedImage originalImage = ImageIO.read(imageFile);
+            if (originalImage != null) {
+                Image scaledImage = originalImage.getScaledInstance(
+                    THUMBNAIL_WIDTH - 4, THUMBNAIL_HEIGHT - 4, Image.SCALE_SMOOTH);
+                button.setIcon(new ImageIcon(scaledImage));
+                
+                // Add click listener to show full image
+                button.addActionListener(e -> displayFullImage(originalImage, imageFile.getName()));
+            }
+        } catch (IOException e) {
+            log.error("Error creating thumbnail for image {}", imageFile.getName(), e);
+            button.setText("Error");
+        }
+        
+        // Add hover effects
+        button.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseEntered(MouseEvent e) {
+                button.setBorder(BorderFactory.createRaisedBevelBorder());
+            }
+            
+            @Override
+            public void mouseExited(MouseEvent e) {
+                button.setBorder(BorderFactory.createLoweredBevelBorder());
+            }
+        });
+        
+        return button;
+    }
+    
+    private void displayFullImage(BufferedImage image, String imageName) {
+        currentSelectedImage = image;
+        
+        // Calculate the best fit for the preview area
+        Dimension previewSize = imagePreviewLabel.getSize();
+        if (previewSize.width <= 0 || previewSize.height <= 0) {
+            previewSize = new Dimension(400, 300); // Default size
+        }
+        
+        double scaleX = (double) previewSize.width / image.getWidth();
+        double scaleY = (double) previewSize.height / image.getHeight();
+        double scale = Math.min(scaleX, scaleY);
+        
+        int scaledWidth = (int) (image.getWidth() * scale);
+        int scaledHeight = (int) (image.getHeight() * scale);
+        
+        Image scaledImage = image.getScaledInstance(scaledWidth, scaledHeight, Image.SCALE_SMOOTH);
+        ImageIcon icon = new ImageIcon(scaledImage);
+        
+        imagePreviewLabel.setText(""); // Clear text
+        imagePreviewLabel.setIcon(icon);
+        imagePreviewLabel.setToolTipText("Hình ảnh: " + imageName + " (" + image.getWidth() + "x" + image.getHeight() + ")");
+    }
+    
+    private void updatePrescriptionTree() {
+        rootPrescriptionNode.removeAllChildren();
+        double totalMedicineCost = 0;
+        double totalServiceCost = 0;
+
+        // Add medicines
+        if (medicinePrescription != null && medicinePrescription.length > 0) {
+            DefaultMutableTreeNode medicinesNode = new DefaultMutableTreeNode("Thuốc (" + medicinePrescription.length + ")");
+            for (String[] med : medicinePrescription) {
+                if (med == null || med.length < 10) continue;
+                
+                String medDisplay = String.format("%s - SL: %s %s", med[1], med[2], med[3]);
+                DefaultMutableTreeNode medNode = new DefaultMutableTreeNode(medDisplay);
+                medNode.add(new DefaultMutableTreeNode("Liều dùng: Sáng " + med[4] + " / Trưa " + med[5] + " / Chiều " + med[6]));
+                
+                try {
+                    medNode.add(new DefaultMutableTreeNode("Đơn giá: " + df.format(Double.parseDouble(med[7])) + " VNĐ"));
+                    medNode.add(new DefaultMutableTreeNode("Thành tiền: " + df.format(Double.parseDouble(med[8])) + " VNĐ"));
+                    totalMedicineCost += Double.parseDouble(med[8]);
+                } catch (NumberFormatException e) {
+                    medNode.add(new DefaultMutableTreeNode("Đơn giá: Lỗi"));
+                    medNode.add(new DefaultMutableTreeNode("Thành tiền: Lỗi"));
+                }
+                
+                if (med[9] != null && !med[9].isEmpty()) {
+                    medNode.add(new DefaultMutableTreeNode("Ghi chú: " + med[9]));
+                }
+                medicinesNode.add(medNode);
+            }
+            rootPrescriptionNode.add(medicinesNode);
+        }
+
+        // Add services
+        if (servicePrescription != null && servicePrescription.length > 0) {
+            DefaultMutableTreeNode servicesNode = new DefaultMutableTreeNode("Dịch vụ (" + servicePrescription.length + ")");
+            for (String[] ser : servicePrescription) {
+                if (ser == null || ser.length < 6) continue;
+                
+                String serDisplay = String.format("%s - SL: %s", ser[1], ser[2]);
+                DefaultMutableTreeNode serNode = new DefaultMutableTreeNode(serDisplay);
+                
+                try {
+                    serNode.add(new DefaultMutableTreeNode("Đơn giá: " + df.format(Double.parseDouble(ser[3])) + " VNĐ"));
+                    serNode.add(new DefaultMutableTreeNode("Thành tiền: " + df.format(Double.parseDouble(ser[4])) + " VNĐ"));
+                    totalServiceCost += Double.parseDouble(ser[4]);
+                } catch (NumberFormatException e) {
+                    serNode.add(new DefaultMutableTreeNode("Đơn giá: Lỗi"));
+                    serNode.add(new DefaultMutableTreeNode("Thành tiền: Lỗi"));
+                }
+                
+                if (ser[5] != null && !ser[5].isEmpty()) {
+                    serNode.add(new DefaultMutableTreeNode("Ghi chú: " + ser[5]));
+                }
+                servicesNode.add(serNode);
+            }
+            rootPrescriptionNode.add(servicesNode);
+        }
+        
+        // Update cost labels
+        totalMedCostLabel.setText("Tổng tiền thuốc: " + df.format(totalMedicineCost) + " VNĐ");
+        totalSerCostLabel.setText("Tổng tiền dịch vụ: " + df.format(totalServiceCost) + " VNĐ");
+        overallTotalCostLabel.setText("TỔNG CỘNG: " + df.format(totalMedicineCost + totalServiceCost) + " VNĐ");
+
+        // Refresh tree
+        prescriptionTreeModel.reload();
+        
+        // Expand all nodes
+        for (int i = 0; i < prescriptionTree.getRowCount(); i++) {
+            prescriptionTree.expandRow(i);
+        }
+    }
+    
+    private boolean isImageFile(String filename) {
+        String[] extensions = {".jpg", ".jpeg", ".png", ".gif", ".bmp"};
+        String lowerFilename = filename.toLowerCase();
+        for (String ext : extensions) {
+            if (lowerFilename.endsWith(ext)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    
+    private String formatDate(String dateStr) {
+        try {
+            if (dateStr != null && dateStr.matches("\\d+")) {
+                // Timestamp
+                Date date = new Date(Long.parseLong(dateStr));
+                return new SimpleDateFormat("dd/MM/yyyy HH:mm").format(date);
+            } else if (dateStr != null && !dateStr.trim().isEmpty()) {
+                // Already formatted date
+                return dateStr;
+            }
+        } catch (NumberFormatException e) {
+            log.warn("Error formatting date: {}", dateStr, e);
+        }
+        return dateStr != null ? dateStr : "Không rõ";
+    }
+    
+    // Setters for updating data from external sources
+    public void setContent(String content) {
+        this.content = content;
+        if (contentArea != null) {
+            contentArea.setText(content);
+        }
+    }
+    
+    public void setSuggestion(String suggestion) {
+        this.suggestion = suggestion;
+        if (suggestionArea != null) {
+            suggestionArea.setText(suggestion);
+        }
+    }
+    
+    public void setConclusion(String conclusion) {
+        this.conclusion = conclusion;
+        if (conclusionArea != null) {
+            conclusionArea.setText(conclusion);
+        }
+    }
+    
+    public void setMedicinePrescription(String[][] medicinePrescription) {
+        this.medicinePrescription = medicinePrescription;
+        updatePrescriptionTree();
+    }
+    
+    public void setServicePrescription(String[][] servicePrescription) {
+        this.servicePrescription = servicePrescription;
+        updatePrescriptionTree();
+    }
+} 
\ No newline at end of file
diff --git a/src/main/java/BsK/client/ui/component/CheckUpPage/TemplateDialog/TemplateDialog.java b/src/main/java/BsK/client/ui/component/CheckUpPage/TemplateDialog/TemplateDialog.java
index 149e655..2e11051 100644
--- a/src/main/java/BsK/client/ui/component/CheckUpPage/TemplateDialog/TemplateDialog.java
+++ b/src/main/java/BsK/client/ui/component/CheckUpPage/TemplateDialog/TemplateDialog.java
@@ -35,10 +35,10 @@ import java.util.List;
 @Slf4j
 public class TemplateDialog extends JDialog {
     private MainFrame mainFrame;
-    private ResponseListener<AddTemplateRes> addTemplateResListener;
-    private ResponseListener<GetAllTemplatesRes> getAllTemplatesResListener;
-    private ResponseListener<EditTemplateRes> editTemplateResListener;
-    private ResponseListener<DeleteTemplateRes> deleteTemplateResListener;
+    private final ResponseListener<AddTemplateRes> addTemplateResListener;
+    private final ResponseListener<GetAllTemplatesRes> getAllTemplatesResListener;
+    private final ResponseListener<EditTemplateRes> editTemplateResListener;
+    private final ResponseListener<DeleteTemplateRes> deleteTemplateResListener;
     private List<Template> templates;
     
     // Left panel components
@@ -67,6 +67,16 @@ public class TemplateDialog extends JDialog {
         super(mainFrame, "Quản lý mẫu", true);
         this.mainFrame = mainFrame;
         
+        this.getAllTemplatesResListener = this::handleGetAllTemplatesResponse;
+        this.addTemplateResListener = this::handleAddTemplateResponse;
+        this.editTemplateResListener = this::handleEditTemplateResponse;
+        this.deleteTemplateResListener = this::handleDeleteTemplateResponse;
+        
+        ClientHandler.addResponseListener(GetAllTemplatesRes.class, getAllTemplatesResListener);
+        ClientHandler.addResponseListener(AddTemplateRes.class, addTemplateResListener);
+        ClientHandler.addResponseListener(EditTemplateRes.class, editTemplateResListener);
+        ClientHandler.addResponseListener(DeleteTemplateRes.class, deleteTemplateResListener);
+        
         // Ensure modal behavior and proper parent relationship
         setModalityType(Dialog.ModalityType.APPLICATION_MODAL);
         setAlwaysOnTop(false); // Don't force always on top, let modal behavior handle this
@@ -94,18 +104,10 @@ public class TemplateDialog extends JDialog {
 
             @Override
             public void windowClosed(WindowEvent e) {
-                if (addTemplateResListener != null) {
-                    ClientHandler.deleteListener(AddTemplateRes.class, addTemplateResListener);
-                }
-                if (getAllTemplatesResListener != null) {
-                    ClientHandler.deleteListener(GetAllTemplatesRes.class, getAllTemplatesResListener);
-                }
-                if (editTemplateResListener != null) {
-                    ClientHandler.deleteListener(EditTemplateRes.class, editTemplateResListener);
-                }
-                if (deleteTemplateResListener != null) {
-                    ClientHandler.deleteListener(DeleteTemplateRes.class, deleteTemplateResListener);
-                }
+                ClientHandler.deleteListener(AddTemplateRes.class, addTemplateResListener);
+                ClientHandler.deleteListener(GetAllTemplatesRes.class, getAllTemplatesResListener);
+                ClientHandler.deleteListener(EditTemplateRes.class, editTemplateResListener);
+                ClientHandler.deleteListener(DeleteTemplateRes.class, deleteTemplateResListener);
             }
         });
         
@@ -461,24 +463,9 @@ public class TemplateDialog extends JDialog {
             log.info("Template print type: {}", templatePrintType);
             log.info("Template gender: {}", templateGender);
             log.info("Template content: {}", templateContent);
-            addTemplateResListener = response -> {
-                SwingUtilities.invokeLater(() -> {
-                    loadTemplates();
-                    JOptionPane.showMessageDialog(this, response.getMessage(), response.isSuccess() ? "Success" : "Error", response.isSuccess() ? JOptionPane.INFORMATION_MESSAGE : JOptionPane.ERROR_MESSAGE);
-                    // delete listener
-            ClientHandler.deleteListener(AddTemplateRes.class, addTemplateResListener);
-                });
-            };
-            ClientHandler.addResponseListener(AddTemplateRes.class, addTemplateResListener);
 
             NetworkUtil.sendPacket(ClientHandler.ctx.channel(), new AddTemplateReq(templateName, templateTitle, templateDiagnosis, templateConclusion,
                         templateSuggestion, templateImageCount, templatePrintType, templateGender, templateContent));
-                    
-            
-            
-            
-
-            
             
         });
         
@@ -514,19 +501,19 @@ public class TemplateDialog extends JDialog {
     
     // TODO: Add methods for backend communication
     private void loadTemplates() {
-        getAllTemplatesResListener = response -> {
-            this.templates = response.getTemplates();
-            SwingUtilities.invokeLater(() -> {
-                tableModel.setRowCount(0);
-                for (Template template : templates) {
-                    tableModel.addRow(new Object[]{template.getTemplateId(), template.getTemplateName()});
-                }
-            });
-        };
-        ClientHandler.addResponseListener(GetAllTemplatesRes.class, getAllTemplatesResListener);
         NetworkUtil.sendPacket(ClientHandler.ctx.channel(), new GetAllTemplatesReq());
     }
 
+    private void handleGetAllTemplatesResponse(GetAllTemplatesRes response) {
+        this.templates = response.getTemplates();
+        SwingUtilities.invokeLater(() -> {
+            tableModel.setRowCount(0);
+            for (Template template : templates) {
+                tableModel.addRow(new Object[]{template.getTemplateId(), template.getTemplateName()});
+            }
+        });
+    }
+
     private void populateFieldsFromTemplate(Template template) {
         idField.setText(String.valueOf(template.getTemplateId()));
         genderComboBox.setSelectedItem(template.getTemplateGender());
@@ -578,21 +565,7 @@ public class TemplateDialog extends JDialog {
             diagnosisArea.getText()
         );
 
-        editTemplateResListener = response -> {
-            SwingUtilities.invokeLater(() -> {
-                JOptionPane.showMessageDialog(this, response.getMessage(), response.isSuccess() ? "Success" : "Error", response.isSuccess() ? JOptionPane.INFORMATION_MESSAGE : JOptionPane.ERROR_MESSAGE);
-                if (response.isSuccess()) {
-                    loadTemplates();
-                }
-                // delete listener
-                ClientHandler.deleteListener(EditTemplateRes.class, editTemplateResListener);
-            });
-        };
-
-        ClientHandler.addResponseListener(EditTemplateRes.class, editTemplateResListener);
         NetworkUtil.sendPacket(ClientHandler.ctx.channel(), new EditTemplateReq(template));
-
-        
     }
     
     private void deleteTemplate() {
@@ -605,23 +578,38 @@ public class TemplateDialog extends JDialog {
         if (response == JOptionPane.YES_OPTION) {
             int templateId = Integer.parseInt(idField.getText());
 
-            deleteTemplateResListener = res -> {
-                SwingUtilities.invokeLater(() -> {
-                    JOptionPane.showMessageDialog(this, res.getMessage(), res.isSuccess() ? "Success" : "Error", res.isSuccess() ? JOptionPane.INFORMATION_MESSAGE : JOptionPane.ERROR_MESSAGE);
-                    if (res.isSuccess()) {
-                        loadTemplates();
-                        clearFields();
-                    }
-                    // delete listener
-                    ClientHandler.deleteListener(DeleteTemplateRes.class, deleteTemplateResListener);
-                });
-            };
-
-            ClientHandler.addResponseListener(DeleteTemplateRes.class, deleteTemplateResListener);
             NetworkUtil.sendPacket(ClientHandler.ctx.channel(), new DeleteTemplateReq(templateId));
         }
     }
     
+    private void handleAddTemplateResponse(AddTemplateRes response) {
+        SwingUtilities.invokeLater(() -> {
+            JOptionPane.showMessageDialog(this, response.getMessage(), response.isSuccess() ? "Success" : "Error", response.isSuccess() ? JOptionPane.INFORMATION_MESSAGE : JOptionPane.ERROR_MESSAGE);
+            if (response.isSuccess()) {
+                loadTemplates();
+            }
+        });
+    }
+
+    private void handleEditTemplateResponse(EditTemplateRes response) {
+        SwingUtilities.invokeLater(() -> {
+            JOptionPane.showMessageDialog(this, response.getMessage(), response.isSuccess() ? "Success" : "Error", response.isSuccess() ? JOptionPane.INFORMATION_MESSAGE : JOptionPane.ERROR_MESSAGE);
+            if (response.isSuccess()) {
+                loadTemplates();
+            }
+        });
+    }
+
+    private void handleDeleteTemplateResponse(DeleteTemplateRes response) {
+        SwingUtilities.invokeLater(() -> {
+            JOptionPane.showMessageDialog(this, response.getMessage(), response.isSuccess() ? "Success" : "Error", response.isSuccess() ? JOptionPane.INFORMATION_MESSAGE : JOptionPane.ERROR_MESSAGE);
+            if (response.isSuccess()) {
+                loadTemplates();
+                clearFields();
+            }
+        });
+    }
+
     private void clearFields() {
         idField.setText("");
         genderComboBox.setSelectedIndex(0);
diff --git a/src/main/java/BsK/common/packet/req/UploadCheckupImageRequest.java b/src/main/java/BsK/common/packet/req/UploadCheckupImageRequest.java
new file mode 100644
index 0000000..ff1f49e
--- /dev/null
+++ b/src/main/java/BsK/common/packet/req/UploadCheckupImageRequest.java
@@ -0,0 +1,18 @@
+package BsK.common.packet.req;
+
+import BsK.common.packet.Packet;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+public class UploadCheckupImageRequest implements Packet {
+    private String checkupId;
+    private byte[] imageData;
+    private String fileName;
+
+    public UploadCheckupImageRequest(String checkupId, byte[] imageData, String fileName) {
+        this.checkupId = checkupId;
+        this.imageData = imageData;
+        this.fileName = fileName;
+    }
+} 
\ No newline at end of file
diff --git a/src/main/java/BsK/common/packet/res/UploadCheckupImageResponse.java b/src/main/java/BsK/common/packet/res/UploadCheckupImageResponse.java
new file mode 100644
index 0000000..8a860af
--- /dev/null
+++ b/src/main/java/BsK/common/packet/res/UploadCheckupImageResponse.java
@@ -0,0 +1,18 @@
+package BsK.common.packet.res;
+
+import BsK.common.packet.Packet;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+public class UploadCheckupImageResponse implements Packet {
+    private boolean success;
+    private String message;
+    private String fileName;
+
+    public UploadCheckupImageResponse(boolean success, String message, String fileName) {
+        this.success = success;
+        this.message = message;
+        this.fileName = fileName;
+    }
+} 
\ No newline at end of file
diff --git a/src/main/java/BsK/server/Server.java b/src/main/java/BsK/server/Server.java
index c2b2032..2adf7ef 100644
--- a/src/main/java/BsK/server/Server.java
+++ b/src/main/java/BsK/server/Server.java
@@ -135,7 +135,7 @@ public class Server {
                               .addLast(new HttpServerCodec())
                               .addLast(new ChunkedWriteHandler())
                               .addLast(new HttpObjectAggregator(8192))
-                              .addLast("ws", new WebSocketServerProtocolHandler("/"))
+                              .addLast("ws", new WebSocketServerProtocolHandler("/", null, true, 1048576))
                               .addLast(new ServerHandler());
                         }
                       });
diff --git a/src/main/java/BsK/server/network/handler/ServerHandler.java b/src/main/java/BsK/server/network/handler/ServerHandler.java
index cb660cb..710f3b3 100644
--- a/src/main/java/BsK/server/network/handler/ServerHandler.java
+++ b/src/main/java/BsK/server/network/handler/ServerHandler.java
@@ -18,7 +18,11 @@ import io.netty.handler.codec.http.websocketx.Utf8FrameValidator;
 import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler.HandshakeComplete;
 import io.netty.handler.timeout.IdleState;
 import io.netty.handler.timeout.IdleStateEvent;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -43,6 +47,8 @@ import static BsK.server.Server.statement;
 @Slf4j
 public class ServerHandler extends SimpleChannelInboundHandler<TextWebSocketFrame> {
 
+  private static final String IMAGE_DB_PATH = "img_db";
+
   @Override
   protected void channelRead0(ChannelHandlerContext ctx, TextWebSocketFrame frame) {
     log.debug("Received message: {}", frame.text());
@@ -1129,6 +1135,43 @@ public class ServerHandler extends SimpleChannelInboundHandler<TextWebSocketFram
             UserUtil.sendPacket(currentUser.getSessionId(), new DeleteTemplateRes(false, "Error deleting template: " + e.getMessage()));
         }
       }
+
+      if (packet instanceof UploadCheckupImageRequest request) {
+        log.info("Received UploadCheckupImageRequest for checkupId: {}", request.getCheckupId());
+
+        String checkupId = request.getCheckupId();
+        String fileName = request.getFileName();
+        byte[] imageData = request.getImageData();
+
+        if (checkupId == null || checkupId.trim().isEmpty()) {
+            UserUtil.sendPacket(currentUser.getSessionId(), new UploadCheckupImageResponse(false, "CheckupID is null or empty. Cannot save image.", fileName));
+            return;
+        }
+
+        try {
+            // 1. Define and create storage directory
+            Path storageDir = Paths.get(IMAGE_DB_PATH, checkupId.trim());
+            Files.createDirectories(storageDir); // Create dirs if they don't exist
+
+            // 2. Save the file
+            Path filePath = storageDir.resolve(fileName);
+            try (FileOutputStream fos = new FileOutputStream(filePath.toFile())) {
+                fos.write(imageData);
+            }
+            String savedPath = filePath.toString().replace("\\", "/");
+            log.info("Successfully saved image to {}", savedPath);
+
+            // 3. TODO: Store file path in database, linking it to the checkupId
+            // A proper implementation would have a 'CheckupImages' table and an INSERT query here.
+
+            // 4. Send success response
+            UserUtil.sendPacket(currentUser.getSessionId(), new UploadCheckupImageResponse(true, "Image uploaded successfully to " + savedPath, fileName));
+
+        } catch (IOException e) {
+            log.error("Failed to save uploaded image for checkupId {}: {}", checkupId, e.getMessage());
+            UserUtil.sendPacket(currentUser.getSessionId(), new UploadCheckupImageResponse(false, "Server failed to save image: " + e.getMessage(), fileName));
+        }
+      }
     }
   }
 
diff --git a/src/main/resources/database/BSK.db b/src/main/resources/database/BSK.db
index 10a32e3..215b3df 100644
Binary files a/src/main/resources/database/BSK.db and b/src/main/resources/database/BSK.db differ