From 77a6468a06f6188aa3b13a9fa1faf437cc8d75ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=AA=20Th=C3=A0nh=20=C4=90=E1=BA=A1t?=
 <91755733+lds217@users.noreply.github.com>
Date: Tue, 8 Jul 2025 01:38:27 +0700
Subject: [PATCH] [update] Revise medical invoice format to enhance clarity and
 detail, including updated patient information and service costs. Integrate
 keyboard shortcuts for improved user interaction in CheckUpPage, and
 implement font family and size selection features in TemplateDialog for
 better customization options.

---
 medical_invoice.pdf                           | Bin 96392 -> 96153 bytes
 .../java/BsK/client/ui/assets/icon/loupe.png  | Bin 0 -> 25107 bytes
 .../ui/component/CheckUpPage/CheckUpPage.java | 314 +++++++++++++++---
 .../PrintDialog/UltrasoundResult.java         |  70 ++--
 .../print_forms/medserinvoice.jrxml           | 305 +++++++----------
 .../PrintDialog/print_forms/test_print.java   |   5 +
 .../print_forms/ultrasoundresult.jrxml        |  64 ++--
 .../TemplateDialog/TemplateDialog.java        |  45 ++-
 src/main/resources/database/BSK.db            | Bin 1179648 -> 1179648 bytes
 9 files changed, 498 insertions(+), 305 deletions(-)
 create mode 100644 src/main/java/BsK/client/ui/assets/icon/loupe.png

diff --git a/medical_invoice.pdf b/medical_invoice.pdf
index 198f989ff373b5722f5251bb956d217064fbc623..acaf2f414f19009b6bb1c8ae4ac7470d95bc0ec0 100644
GIT binary patch
delta 2500
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

delta 2765
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

diff --git a/src/main/java/BsK/client/ui/assets/icon/loupe.png b/src/main/java/BsK/client/ui/assets/icon/loupe.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9a225ecda43801d33bfa7ea056799e0a5ea9451
GIT binary patch
literal 25107
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
M=&WItKJMoK0gvQio&W#<

literal 0
HcmV?d00001

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 4b7a24c..221e277 100644
--- a/src/main/java/BsK/client/ui/component/CheckUpPage/CheckUpPage.java
+++ b/src/main/java/BsK/client/ui/component/CheckUpPage/CheckUpPage.java
@@ -104,6 +104,13 @@ import java.io.ByteArrayInputStream;
 import java.io.OutputStream;
 import java.io.InputStream;
 
+// --- JasperReports Imports ---
+import net.sf.jasperreports.engine.JasperPrint;
+import net.sf.jasperreports.engine.JasperPrintManager;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.view.JasperViewer;
+// --- End JasperReports Imports ---
+
 // Add new imports
 import BsK.common.entity.PatientHistory;
 import BsK.common.packet.req.GetPatientHistoryRequest;
@@ -155,6 +162,9 @@ public class CheckUpPage extends JPanel {
     private JLabel callingStatusLabel;
     private JPanel rightContainer; // Add this field
     private List<Template> allTemplates;
+    private JButton openQueueButton;
+    private JButton addPatientButton;
+    private JButton[] actionButtons;
 
     private QueueViewPage tvQueueFrame;
     private QueueManagementPage queueManagementPage; // The new queue window
@@ -335,7 +345,7 @@ public class CheckUpPage extends JPanel {
         controlPanel.setBorder(BorderFactory.createEmptyBorder(3, 5, 3, 5)); // Reduced top/bottom from 5 to 3
         controlPanel.setBackground(Color.WHITE);
 
-        JButton openQueueButton = new JButton("Danh sách chờ");
+        openQueueButton = new JButton("<html>Danh sách chờ <font color='red'><b>(F1)</b></font></html>");
         openQueueButton.setBackground(new Color(255, 152, 0)); // Amber
         openQueueButton.setForeground(Color.WHITE);
         openQueueButton.setFocusPainted(false);
@@ -363,7 +373,7 @@ public class CheckUpPage extends JPanel {
             tvQueueFrame.setVisible(true);
         });
 
-        JButton addPatientButton = new JButton("  THÊM BN  ");
+        addPatientButton = new JButton("<html>THÊM BN <font color='red'><b>(F2)</b></font></html>");
         addPatientButton.setBackground(new Color(63, 81, 181));
         addPatientButton.setForeground(Color.WHITE);
         addPatientButton.setFocusPainted(false);
@@ -914,17 +924,18 @@ public class CheckUpPage extends JPanel {
         underlineButton.setFocusPainted(false);
         underlineButton.setToolTipText("Gạch chân (Ctrl+U)");
 
-        // Font size buttons
-        String[] sizes = {"12", "14", "16", "18", "20"};
-        JComboBox<String> sizeComboBox = new JComboBox<>(sizes);
-        sizeComboBox.setSelectedItem("16");
-        sizeComboBox.setFont(new Font("Arial", Font.PLAIN, 14));
-        sizeComboBox.setToolTipText("Cỡ chữ");
-        sizeComboBox.addActionListener(e -> {
-            String size = (String) sizeComboBox.getSelectedItem();
-            if (size != null) {
+        // Font family selector
+        String[] fontFamilies = {"Arial", "Times New Roman", "Verdana", "Courier New", "Tahoma", "Calibri"};
+        JComboBox<String> fontFamilyComboBox = new JComboBox<>(fontFamilies);
+        fontFamilyComboBox.setSelectedItem("Times New Roman"); // Match default font of notesField
+        fontFamilyComboBox.setFont(new Font("Arial", Font.PLAIN, 14));
+        fontFamilyComboBox.setToolTipText("Phông chữ");
+        fontFamilyComboBox.setPreferredSize(new Dimension(140, 25));
+        fontFamilyComboBox.addActionListener(e -> {
+            String fontFamily = (String) fontFamilyComboBox.getSelectedItem();
+            if (fontFamily != null) {
                 MutableAttributeSet attr = new SimpleAttributeSet();
-                StyleConstants.setFontSize(attr, Integer.parseInt(size));
+                StyleConstants.setFontFamily(attr, fontFamily);
                 notesField.getStyledDocument().setCharacterAttributes(
                     notesField.getSelectionStart(),
                     notesField.getSelectionEnd() - notesField.getSelectionStart(),
@@ -932,16 +943,21 @@ public class CheckUpPage extends JPanel {
             }
         });
 
-        // Add buttons to toolbar with separators and styling
-        notesToolbar.add(Box.createHorizontalStrut(5));
-        notesToolbar.add(sizeComboBox);
-        notesToolbar.addSeparator(new Dimension(10, 0));
-        notesToolbar.add(boldButton);
-        notesToolbar.addSeparator(new Dimension(5, 0));
-        notesToolbar.add(italicButton);
-        notesToolbar.addSeparator(new Dimension(5, 0));
-        notesToolbar.add(underlineButton);
-        notesToolbar.addSeparator(new Dimension(5, 0));
+        // Font size spinner
+        SpinnerModel sizeModel = new SpinnerNumberModel(20, 8, 72, 2); // Default 20, min 8, max 72, step 2
+        JSpinner sizeSpinner = new JSpinner(sizeModel);
+        sizeSpinner.setFont(new Font("Arial", Font.PLAIN, 14));
+        sizeSpinner.setToolTipText("Cỡ chữ (Cỡ chữ JasperReport = giá trị / 2)");
+        sizeSpinner.setPreferredSize(new Dimension(60, 25));
+        sizeSpinner.addChangeListener(e -> {
+            int size = (int) sizeSpinner.getValue();
+            MutableAttributeSet attr = new SimpleAttributeSet();
+            StyleConstants.setFontSize(attr, size);
+            notesField.getStyledDocument().setCharacterAttributes(
+                notesField.getSelectionStart(),
+                notesField.getSelectionEnd() - notesField.getSelectionStart(),
+                attr, false);
+        });
 
         // Color chooser button
         JButton colorButton = new JButton("Màu");
@@ -956,8 +972,20 @@ public class CheckUpPage extends JPanel {
                 notesField.setCharacterAttributes(attr, false);
             }
         });
-        notesToolbar.add(colorButton);
 
+        // Add buttons to toolbar with separators and styling
+        notesToolbar.add(Box.createHorizontalStrut(5));
+        notesToolbar.add(fontFamilyComboBox);
+        notesToolbar.addSeparator(new Dimension(5, 0));
+        notesToolbar.add(sizeSpinner);
+        notesToolbar.addSeparator(new Dimension(10, 0));
+        notesToolbar.add(boldButton);
+        notesToolbar.addSeparator(new Dimension(5, 0));
+        notesToolbar.add(italicButton);
+        notesToolbar.addSeparator(new Dimension(5, 0));
+        notesToolbar.add(underlineButton);
+        notesToolbar.addSeparator(new Dimension(10, 0));
+        notesToolbar.add(colorButton);
         notesToolbar.add(Box.createHorizontalStrut(5));
 
         // Style the toolbar buttons
@@ -1196,21 +1224,22 @@ public class CheckUpPage extends JPanel {
         rightContainer.add(newRightSplitPane, BorderLayout.CENTER);
 
         // Create a more modern action panel
-        JPanel iconPanel = new JPanel(new GridLayout(1, 5, 10, 0)); // 5 buttons, 10px horizontal gap
+        JPanel iconPanel = new JPanel(new GridLayout(2, 3, 10, 10)); // 2x3 grid with 10px gaps
         iconPanel.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 10)); // Reduced top/bottom from 10 to 5
         iconPanel.setBackground(Color.WHITE);
 
         // Define button properties
         Object[][] buttonData = {
-            {"save", "Lưu", new Color(63, 81, 181)},
             {"medicine", "Thêm thuốc", new Color(0, 150, 136)},
             {"service", "Thêm DV", new Color(255, 152, 0)},
-            {"printer", "In toa", new Color(156, 39, 176)},
-            {"ultrasound", "In kết quả", new Color(0, 172, 193)}
+            {"printer", "<html><center>In toa thuốc<br><font color='red'>(F7)</font></center></html>", new Color(156, 39, 176)},
+            {"save", "<html><center>Lưu<br><font color='red'>(F8)</font></center></html>", new Color(63, 81, 181)},
+            {"loupe", "<html><center>Lưu & Xem KQ<br><font color='red'>(F9)</font></center></html>", new Color(0, 172, 193)},
+            {"ultrasound", "<html><center>Lưu & In KQ<br><font color='red'>(F10)</font></center></html>", new Color(21, 101, 192)}
         };
 
         // Create array to store action buttons for later access
-        JButton[] actionButtons = new JButton[buttonData.length];
+        actionButtons = new JButton[buttonData.length];
 
         for (int i = 0; i < buttonData.length; i++) {
             String name = (String) buttonData[i][0];
@@ -1243,6 +1272,7 @@ public class CheckUpPage extends JPanel {
 
         // In the constructor, after creating notesField:
         setupNotesPasteHandler();
+        setupShortcuts();
     }
 
     private JButton createActionButton(String iconName, String text, Color bgColor) {
@@ -1315,20 +1345,8 @@ public class CheckUpPage extends JPanel {
                 }
 
                 String statusToSave = (String) statusComboBox.getSelectedItem();
-
                 handleSave();
-                
-                callingStatusLabel.setText("Đã lưu thành công!");
-                callingStatusLabel.setBackground(new Color(230, 255, 230));
-                callingStatusLabel.setForeground(new Color(0, 100, 0));
-                updateUpdateQueue();
-
-                // If patient is marked as "ĐÃ KHÁM", clear the selection and details immediately.
-                if ("ĐÃ KHÁM".equals(statusToSave)) {
-                    clearPatientDetails();
-                    // Visually update the queue table to remove the selection highlight.
-                    queueManagementPage.updateQueueTable(); 
-                }
+                afterSaveActions(statusToSave, "Đã lưu thành công!");
                 break;
             case "medicine":
                 medDialog = new MedicineDialog(mainFrame, this.medicinePrescription);
@@ -1359,7 +1377,8 @@ public class CheckUpPage extends JPanel {
                         ); 
                 medicineInvoice.showDirectJasperViewer(); // Use the direct JasperViewer method
                 break;
-            case "ultrasound":
+            case "ultrasound": // This case now handles "Lưu & In"
+                // Step 1: Validate conditions first.
                 if (selectedImagesForPrint.isEmpty()) {
                     JOptionPane.showMessageDialog(this,
                             "Vui lòng chọn ít nhất một hình ảnh để in kết quả.",
@@ -1373,7 +1392,8 @@ public class CheckUpPage extends JPanel {
                     return;
                 }
 
-                UltrasoundResult ultrasoundResult = new UltrasoundResult(
+                // Step 2: Attempt to create the report object BEFORE saving anything.
+                UltrasoundResult ultrasoundResultPrint = new UltrasoundResult(
                         checkupIdField.getText(),
                         customerLastNameField.getText() + " " + customerFirstNameField.getText(),
                         dobPicker.getJFormattedTextField().getText(),
@@ -1388,11 +1408,110 @@ public class CheckUpPage extends JPanel {
                         printType,
                         templateTitle
                 );
-                ultrasoundResult.showDirectJasperViewer();
+                
+                JasperPrint jasperPrintToPrint;
+                try {
+                    jasperPrintToPrint = ultrasoundResultPrint.createJasperPrint();
+                    if (jasperPrintToPrint == null) {
+                        throw new Exception("Báo cáo được tạo là null.");
+                    }
+                } catch (Exception ex) {
+                    log.error("Failed to create JasperPrint for printing", ex);
+                    JOptionPane.showMessageDialog(this, "Không thể tạo báo cáo để in: " + ex.getMessage(), "Lỗi Báo Cáo", JOptionPane.ERROR_MESSAGE);
+                    return; // HALT if report creation fails.
+                }
+
+                // Step 3: If report creation is successful, commit by saving and printing.
+                if ("ĐANG KHÁM".equals(statusComboBox.getSelectedItem())) {
+                    statusComboBox.setSelectedItem("ĐÃ KHÁM");
+                }
+                String statusToSavePrint = (String) statusComboBox.getSelectedItem();
+                handleSave();
+                afterSaveActions(statusToSavePrint, "Đã lưu. Đang gửi lệnh in...");
+
+                // Step 4: Finally, print using the pre-made object.
+                try {
+                    JasperPrintManager.printReport(jasperPrintToPrint, false);
+                } catch (JRException e) {
+                    log.error("Error printing report directly", e);
+                    JOptionPane.showMessageDialog(this, "Không thể in trực tiếp: " + e.getMessage(), "Lỗi In", JOptionPane.ERROR_MESSAGE);
+                }
+                break;
+            case "loupe": // This case now handles "Lưu & Xem"
+                // Step 1: Validate conditions first.
+                if (selectedImagesForPrint.isEmpty()) {
+                    JOptionPane.showMessageDialog(this,
+                            "Vui lòng chọn ít nhất một hình ảnh để xem kết quả.",
+                            "Chưa chọn ảnh", JOptionPane.WARNING_MESSAGE);
+                    return;
+                }
+                 if (photoNum != 0 && selectedImagesForPrint.size() > photoNum) {
+                    JOptionPane.showMessageDialog(this,
+                            "Số lượng ảnh đã chọn (" + selectedImagesForPrint.size() + ") nhiều hơn số lượng cho phép trong mẫu (" + photoNum + ").",
+                            "Quá nhiều ảnh", JOptionPane.WARNING_MESSAGE);
+                    return;
+                }
+
+                // Step 2: Attempt to create the report object BEFORE saving anything.
+                UltrasoundResult ultrasoundResultView = new UltrasoundResult(
+                        checkupIdField.getText(),
+                        customerLastNameField.getText() + " " + customerFirstNameField.getText(),
+                        dobPicker.getJFormattedTextField().getText(),
+                        (String) genderComboBox.getSelectedItem(),
+                        customerAddressField.getText() + ", " + (wardComboBox.getSelectedItem() != null ? wardComboBox.getSelectedItem().toString() : "") + ", " + (districtComboBox.getSelectedItem() != null ? districtComboBox.getSelectedItem().toString() : "") + ", " + (provinceComboBox.getSelectedItem() != null ? provinceComboBox.getSelectedItem().toString() : ""),
+                        (String) doctorComboBox.getSelectedItem(),
+                        datePicker.getJFormattedTextField().getText(),
+                        TextUtils.scaleRtfFontSize(getRtfContentAsString()),
+                        conclusionField.getText(),
+                        suggestionField.getText(),
+                        selectedImagesForPrint,
+                        printType,
+                        templateTitle
+                );
+
+                JasperPrint jasperPrintToView;
+                try {
+                    jasperPrintToView = ultrasoundResultView.createJasperPrint();
+                    if (jasperPrintToView == null) {
+                        throw new Exception("Báo cáo được tạo là null.");
+                    }
+                } catch (Exception ex) {
+                    log.error("Failed to create JasperPrint for viewing", ex);
+                    JOptionPane.showMessageDialog(this, "Không thể tạo báo cáo xem trước: " + ex.getMessage(), "Lỗi Báo Cáo", JOptionPane.ERROR_MESSAGE);
+                    return; // HALT if report creation fails.
+                }
+
+                // Step 3: If report creation is successful, commit by saving and showing the view.
+                // NO automatic status change for "Lưu & Xem"
+                String statusToSaveView = (String) statusComboBox.getSelectedItem();
+                handleSave();
+                afterSaveActions(statusToSaveView, "Đã lưu. Đang tạo bản xem trước...");
+
+                // Step 4: Finally, show the viewer with the pre-made object.
+                JasperViewer.viewReport(jasperPrintToView, false);
                 break;
         }
     }
     
+    /**
+     * Helper method to perform common actions after any save operation.
+     * @param statusToSave The patient status that was saved.
+     * @param message The message to display in the status label.
+     */
+    private void afterSaveActions(String statusToSave, String message) {
+        callingStatusLabel.setText(message);
+        callingStatusLabel.setBackground(new Color(230, 255, 230));
+        callingStatusLabel.setForeground(new Color(0, 100, 0));
+        updateUpdateQueue();
+
+        // If patient is marked as "ĐÃ KHÁM", clear the selection and details immediately.
+        if ("ĐÃ KHÁM".equals(statusToSave)) {
+            clearPatientDetails();
+            // Visually update the queue table to remove the selection highlight.
+            queueManagementPage.updateQueueTable();
+        }
+    }
+
     private void updatePrescriptionTree() {
         rootPrescriptionNode.removeAllChildren();
         double totalMedicineCost = 0;
@@ -1978,12 +2097,12 @@ public class CheckUpPage extends JPanel {
         JPanel buttonPanel = new JPanel(new GridLayout(1, 2, 5, 5));
         buttonPanel.setOpaque(false);
         
-        takePictureButton = new JButton("Chụp ảnh");
+        takePictureButton = new JButton("<html>Chụp ảnh <font color='red'><b>(F5)</b></font></html>");
         takePictureButton.setIcon(new ImageIcon("src/main/java/BsK/client/ui/assets/icon/camera.png"));
         takePictureButton.addActionListener(e -> handleTakePicture());
         takePictureButton.setEnabled(false);
         
-        recordVideoButton = new JButton("Quay video");
+        recordVideoButton = new JButton("<html>Quay video <font color='red'><b>(F6)</b></font></html>");
         recordVideoButton.setIcon(new ImageIcon("src/main/java/BsK/client/ui/assets/icon/video-camera.png"));
         recordVideoButton.addActionListener(e -> handleRecordVideo());
         recordVideoButton.setEnabled(false);
@@ -2441,7 +2560,7 @@ public class CheckUpPage extends JPanel {
                     recordingThread.setPriority(Thread.MAX_PRIORITY);
 
                     isRecording = true;
-                    recordVideoButton.setText("Dừng");
+                    recordVideoButton.setText("<html>Dừng <font color='red'><b>(F6)</b></font></html>");
                     recordVideoButton.setBackground(Color.RED);
                     recordingTimeLabel.setVisible(true);
                     recordingTimeLabel.setForeground(Color.RED);
@@ -2493,7 +2612,7 @@ public class CheckUpPage extends JPanel {
             frameConverter = null;
         }
 
-        recordVideoButton.setText("Quay video");
+        recordVideoButton.setText("<html>Quay video <font color='red'><b>(F6)</b></font></html>");
         recordVideoButton.setBackground(null);
         recordingTimeLabel.setVisible(false);
         recordingTimer.stop();
@@ -3171,6 +3290,105 @@ public class CheckUpPage extends JPanel {
             saved = true; // No patient loaded, so it's in a "saved" state.
         }
     }
+
+    /**
+     * Sets up keyboard shortcuts for the entire page.
+     */
+    private void setupShortcuts() {
+        InputMap inputMap = this.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
+        ActionMap actionMap = this.getActionMap();
+
+        // F1: Open Queue
+        inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_F1, 0), "openQueue");
+        actionMap.put("openQueue", new AbstractAction() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (openQueueButton != null && openQueueButton.isEnabled()) {
+                    openQueueButton.doClick();
+                }
+            }
+        });
+
+        // F2: Add New Patient
+        inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_F2, 0), "addPatient");
+        actionMap.put("addPatient", new AbstractAction() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (addPatientButton != null && addPatientButton.isEnabled()) {
+                    addPatientButton.doClick();
+                }
+            }
+        });
+
+        // F5: Take Picture
+        inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_F5, 0), "takePicture");
+        actionMap.put("takePicture", new AbstractAction() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (takePictureButton != null && takePictureButton.isEnabled()) {
+                    takePictureButton.doClick();
+                }
+            }
+        });
+
+        // F6: Record Video
+        inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_F6, 0), "recordVideo");
+        actionMap.put("recordVideo", new AbstractAction() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (recordVideoButton != null && recordVideoButton.isEnabled()) {
+                    recordVideoButton.doClick();
+                }
+            }
+        });
+
+        // F7: Print Invoice
+        inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_F7, 0), "printInvoice");
+        actionMap.put("printInvoice", new AbstractAction() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (actionButtons[2] != null && actionButtons[2].isEnabled()) {
+                    handleActionPanelClick("printer");
+                }
+            }
+        });
+
+        // F8: Save
+        inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_F8, 0), "saveAction");
+        actionMap.put("saveAction", new AbstractAction() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (actionButtons[3] != null && actionButtons[3].isEnabled()) {
+                    // Bypass confirmation dialog for shortcut
+                    String statusToSave = (String) statusComboBox.getSelectedItem();
+                    handleSave();
+                    afterSaveActions(statusToSave, "Đã lưu thành công (F8)");
+                }
+            }
+        });
+
+        // F9: Save and View
+        inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_F9, 0), "saveAndView");
+        actionMap.put("saveAndView", new AbstractAction() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (actionButtons[4] != null && actionButtons[4].isEnabled()) {
+                    handleActionPanelClick("loupe");
+                }
+            }
+        });
+
+        // F10: Save and Print
+        inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_F10, 0), "saveAndPrint");
+        actionMap.put("saveAndPrint", new AbstractAction() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (actionButtons[5] != null && actionButtons[5].isEnabled()) {
+                    handleActionPanelClick("ultrasound");
+                }
+            }
+        });
+    }
 }
 
 
diff --git a/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/UltrasoundResult.java b/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/UltrasoundResult.java
index 1c7c003..6281917 100644
--- a/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/UltrasoundResult.java
+++ b/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/UltrasoundResult.java
@@ -35,6 +35,7 @@ import net.sf.jasperreports.engine.JasperReport;
 import net.sf.jasperreports.engine.design.JasperDesign;
 import net.sf.jasperreports.engine.xml.JRXmlLoader;
 import net.sf.jasperreports.view.JasperViewer;
+import net.sf.jasperreports.engine.JasperPrintManager;
 // --- End JasperReports Imports ---
 
 import javax.imageio.ImageIO;
@@ -54,6 +55,9 @@ import java.util.Map;
 import java.util.HashMap;
 import java.util.Locale;
 import net.sf.jasperreports.engine.JRParameter;
+import net.sf.jasperreports.engine.JRException;
+import java.util.ArrayList;
+import org.slf4j.LoggerFactory;
 
 @Slf4j
 public class UltrasoundResult {
@@ -79,23 +83,51 @@ public class UltrasoundResult {
                             String patientAddress, String doctorName, String checkupDate,
                             String rtfContent, String conclusion, String suggestion,
                             List<File> selectedImages, String printType, String templateTitle) {
-        this.checkupId = checkupId;
-        this.patientName = patientName;
-        this.patientDOB = patientDOB;
-        this.patientGender = patientGender;
-        this.patientAddress = patientAddress;
-        this.doctorName = doctorName;
-        this.checkupDate = checkupDate;
-        this.rtfContent = rtfContent;
-        this.conclusion = conclusion;
-        this.suggestion = suggestion;
-        this.selectedImages = selectedImages;
-        this.printType = printType;
-        this.templateTitle = templateTitle;
+
+        // Defensive null checks to prevent JasperReports from crashing on null parameters
+        this.checkupId = checkupId != null ? checkupId : "";
+        this.patientName = patientName != null ? patientName : "";
+        this.patientDOB = patientDOB != null ? patientDOB : "";
+        this.patientGender = patientGender != null ? patientGender : "";
+        this.patientAddress = patientAddress != null ? patientAddress : "";
+        this.doctorName = doctorName != null ? doctorName : "";
+        this.checkupDate = checkupDate != null ? checkupDate : "";
+        this.rtfContent = rtfContent != null ? rtfContent : "";
+        this.conclusion = conclusion != null ? conclusion : "";
+        this.suggestion = suggestion != null ? suggestion : "";
+        this.selectedImages = selectedImages != null ? selectedImages : new ArrayList<>();
+        this.printType = printType != null ? printType : "";
+        this.templateTitle = templateTitle != null ? templateTitle : "";
     }
 
     public void showDirectJasperViewer() {
         try {
+            JasperPrint jasperPrint = createJasperPrint();
+            if (jasperPrint != null) {
+                JasperViewer.viewReport(jasperPrint, false);
+            }
+        } catch (Exception e) {
+            log.error("Error displaying JasperViewer for Ultrasound Result", e);
+            JOptionPane.showMessageDialog(null, "Không thể hiển thị bản xem trước: " + e.getMessage(), "Lỗi Jasper", JOptionPane.ERROR_MESSAGE);
+        }
+    }
+
+    public void printDirectly() {
+        try {
+            JasperPrint jasperPrint = createJasperPrint();
+            if (jasperPrint != null) {
+                // The 'false' argument means no print dialog will be shown.
+                JasperPrintManager.printReport(jasperPrint, false);
+            }
+        } catch (Exception e) {
+            log.error("Error printing report directly for Ultrasound Result", e);
+            JOptionPane.showMessageDialog(null, "Không thể in trực tiếp: " + e.getMessage(), "Lỗi In", JOptionPane.ERROR_MESSAGE);
+        }
+    }
+
+    public JasperPrint createJasperPrint() throws JRException, IOException {
+        String jrxmlPath = System.getProperty("user.dir") + "/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/print_forms/ultrasoundresult.jrxml";
+        try (InputStream inputStream = new FileInputStream(new File(jrxmlPath))) {
             Map<String, Object> parameters = new HashMap<>();
 
             // Set locale for date/number formatting
@@ -135,21 +167,13 @@ public class UltrasoundResult {
             }
 
             // Load and compile the report
-            String jrxmlPath = projectDir + "/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/print_forms/ultrasoundresult.jrxml";
-            InputStream inputStream = new FileInputStream(new File(jrxmlPath));
-
             JasperDesign jasperDesign = JRXmlLoader.load(inputStream);
             JasperReport jasperReport = JasperCompileManager.compileReport(jasperDesign);
 
             // Fill the report
             JasperPrint jasperPrint = JasperFillManager.fillReport(jasperReport, parameters, new JREmptyDataSource());
 
-            // View the report
-            JasperViewer.viewReport(jasperPrint, false);
-
-        } catch (Exception e) {
-            log.error("Error generating or showing JasperReport for Ultrasound", e);
-            JOptionPane.showMessageDialog(null, "Lỗi khi tạo báo cáo siêu âm: " + e.getMessage(), "Lỗi JasperReport", JOptionPane.ERROR_MESSAGE);
+            return jasperPrint;
         }
     }
 
@@ -637,6 +661,4 @@ public class UltrasoundResult {
         signatureTable.addCell(new Cell().add(signParagraph).setBorder(Border.NO_BORDER));
         return signatureTable;
     }
-
-
 } 
\ No newline at end of file
diff --git a/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/print_forms/medserinvoice.jrxml b/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/print_forms/medserinvoice.jrxml
index 1c9e9fa..c148fc2 100644
--- a/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/print_forms/medserinvoice.jrxml
+++ b/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/print_forms/medserinvoice.jrxml
@@ -79,7 +79,7 @@
 	</variable>
 	<group name="group_thuoc">
 		<groupHeader>
-			<band height="85">
+			<band height="83">
 				<printWhenExpression><![CDATA[$P{hasMedicines}]]></printWhenExpression>
 				<element kind="component" uuid="c0ec0570-9841-4438-a387-2e29436a01e7" x="8" y="18" width="539" height="65">
 					<printWhenExpression><![CDATA[$P{hasMedicines}]]></printWhenExpression>
@@ -88,9 +88,9 @@
 							<dataSourceExpression><![CDATA[$P{medicineDS}]]></dataSourceExpression>
 							<returnValue toVariable="MedicineGrandTotal" fromVariable="medTotal"/>
 						</datasetRun>
-						<column kind="single" uuid="249a6076-168a-4d8c-ba6c-92ca1d870834" width="160">
-							<columnHeader height="20" rowSpan="1" style="Table_CH">
-								<element kind="staticText" uuid="9b6682e0-0e7a-48be-baa3-932a54d0c959" x="0" y="0" width="160" height="20" fontName="Arial" hTextAlign="Center" vTextAlign="Middle">
+						<column kind="single" uuid="249a6076-168a-4d8c-ba6c-92ca1d870834" width="300">
+							<columnHeader height="15" rowSpan="1" style="Table_CH">
+								<element kind="staticText" uuid="9b6682e0-0e7a-48be-baa3-932a54d0c959" x="0" y="0" width="300" height="15" fontName="Arial" hTextAlign="Center" vTextAlign="Middle">
 									<text><![CDATA[Tên thuốc]]></text>
 									<box>
 										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -99,6 +99,7 @@
 										<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 									</box>
 								</element>
+								<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 							</columnHeader>
 							<columnFooter height="30" rowSpan="1">
 								<property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.VerticalRowLayout"/>
@@ -109,8 +110,8 @@
 									<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 								</box>
 							</columnFooter>
-							<detailCell height="30" style="Table_TD">
-								<element kind="textField" uuid="bc690d0f-bc31-4bcc-a134-ff5deb5be586" x="0" y="0" width="160" height="15" fontName="Arial" fontSize="8.0" hTextAlign="Left" vTextAlign="Top">
+							<detailCell height="29" style="Table_TD">
+								<element kind="textField" uuid="bc690d0f-bc31-4bcc-a134-ff5deb5be586" x="0" y="0" width="300" height="15" fontName="Arial" fontSize="10.0" bold="true" hTextAlign="Left" vTextAlign="Top">
 									<expression><![CDATA[$F{medName}]]></expression>
 									<box topPadding="3" leftPadding="3">
 										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -119,8 +120,8 @@
 										<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 									</box>
 								</element>
-								<element kind="textField" uuid="9b848a7f-a2e8-4360-9e6c-b5fde8d00361" x="0" y="15" width="160" height="15" fontName="Arial" fontSize="8.0" italic="true">
-									<expression><![CDATA["Ghi chú: " + $F{medNote}]]></expression>
+								<element kind="textField" uuid="9b848a7f-a2e8-4360-9e6c-b5fde8d00361" x="0" y="15" width="300" height="14" fontName="Arial" fontSize="8.0" italic="true">
+									<expression><![CDATA["Ghi chú: " + $F{medNote} +", " + $F{dosage}]]></expression>
 									<box leftPadding="3">
 										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 										<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -128,6 +129,7 @@
 										<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 									</box>
 								</element>
+								<property name="com.jaspersoft.studio.unit.height" value="px"/>
 								<box style="Table_TD">
 									<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 									<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -137,49 +139,9 @@
 							</detailCell>
 							<property name="com.jaspersoft.studio.components.table.model.column.name" value="Column1"/>
 						</column>
-						<column kind="single" uuid="f60271bc-52a8-4c6d-b0c7-6f8f4992eb76" width="90">
-							<columnHeader height="20" rowSpan="1" style="Table_CH">
-								<element kind="staticText" uuid="0e5182ab-966b-4402-a5c3-a3b2eb23259e" x="0" y="0" width="90" height="20" fontName="Arial" hTextAlign="Center" vTextAlign="Middle">
-									<text><![CDATA[Liều dùng]]></text>
-									<box>
-										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-										<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-										<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-										<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-									</box>
-								</element>
-							</columnHeader>
-							<columnFooter height="30" rowSpan="1">
-								<box>
-									<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-									<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-									<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-									<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-								</box>
-							</columnFooter>
-							<detailCell height="30" style="Table_TD">
-								<element kind="textField" uuid="797d2d36-5447-4ad1-be15-79b697389206" x="0" y="0" width="90" height="30" fontName="Arial" fontSize="8.0" hTextAlign="Center" vTextAlign="Middle">
-									<expression><![CDATA[$F{dosage}]]></expression>
-									<box topPadding="3" leftPadding="3">
-										<pen lineWidth="1.0"/>
-										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-										<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-										<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-										<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-									</box>
-								</element>
-								<box style="Table_TD">
-									<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
-									<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
-									<bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
-									<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
-								</box>
-							</detailCell>
-							<property name="com.jaspersoft.studio.components.table.model.column.name" value="Column2"/>
-						</column>
-						<column kind="single" uuid="dd7c9141-b6c3-4471-916b-43e980f65a47" width="80">
-							<columnHeader height="20" rowSpan="1" style="Table_CH">
-								<element kind="staticText" uuid="ae479f63-bbbf-4271-85e3-59bf587e90b6" x="0" y="0" width="80" height="20" fontName="Arial" hTextAlign="Center" vTextAlign="Middle">
+						<column kind="single" uuid="dd7c9141-b6c3-4471-916b-43e980f65a47" width="50">
+							<columnHeader height="15" rowSpan="1" style="Table_CH">
+								<element kind="staticText" uuid="ae479f63-bbbf-4271-85e3-59bf587e90b6" x="0" y="0" width="50" height="15" fontName="Arial" hTextAlign="Center" vTextAlign="Middle">
 									<text><![CDATA[SL]]></text>
 									<box>
 										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -197,8 +159,8 @@
 									<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 								</box>
 							</columnFooter>
-							<detailCell height="30" style="Table_TD">
-								<element kind="textField" uuid="f200da37-dcd6-40f6-aa63-558a6f9ace69" x="0" y="0" width="80" height="30" fontName="Arial" fontSize="8.0" hTextAlign="Center" vTextAlign="Middle">
+							<detailCell height="29" style="Table_TD">
+								<element kind="textField" uuid="f200da37-dcd6-40f6-aa63-558a6f9ace69" x="0" y="0" width="50" height="29" fontName="Arial" fontSize="8.0" hTextAlign="Center" vTextAlign="Middle">
 									<expression><![CDATA[$F{amount}]]></expression>
 									<box topPadding="3" leftPadding="3" bottomPadding="0" rightPadding="0">
 										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -216,9 +178,9 @@
 							</detailCell>
 							<property name="com.jaspersoft.studio.components.table.model.column.name" value="Column2"/>
 						</column>
-						<column kind="single" uuid="d0909427-1340-4ba9-950e-ba0fdedd2638" width="99">
-							<columnHeader height="20" rowSpan="1" style="Table_CH">
-								<element kind="staticText" uuid="72a37327-ff08-4bf2-98d7-224713fb08e1" x="0" y="0" width="99" height="20" fontName="Arial" hTextAlign="Center" vTextAlign="Middle">
+						<column kind="single" uuid="d0909427-1340-4ba9-950e-ba0fdedd2638" width="100">
+							<columnHeader height="15" rowSpan="1" style="Table_CH">
+								<element kind="staticText" uuid="72a37327-ff08-4bf2-98d7-224713fb08e1" x="0" y="0" width="100" height="15" fontName="Arial" hTextAlign="Center" vTextAlign="Middle">
 									<text><![CDATA[Đơn giá (VND)]]></text>
 									<box>
 										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -229,9 +191,10 @@
 								</element>
 							</columnHeader>
 							<columnFooter height="30" rowSpan="1">
-								<element kind="staticText" uuid="c9e64949-22e1-4894-b6c2-4547444cea01" x="0" y="0" width="99" height="30" fontName="Arial" fontSize="12.0" bold="true" hTextAlign="Left" vTextAlign="Top">
+								<element kind="staticText" uuid="705eed6a-2cbd-4649-8f7c-e44b3d21e331" x="0" y="0" width="100" height="30" fontName="Arial" fontSize="12.0" bold="true" hTextAlign="Right" vTextAlign="Top">
 									<text><![CDATA[Tổng tiền thuốc:]]></text>
-									<box topPadding="3" leftPadding="3"/>
+									<property name="com.jaspersoft.studio.unit.height" value="px"/>
+									<box topPadding="3" leftPadding="0"/>
 								</element>
 								<box>
 									<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -240,8 +203,8 @@
 									<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 								</box>
 							</columnFooter>
-							<detailCell height="30" style="Table_TD">
-								<element kind="textField" uuid="3b16ef7d-483a-4149-88d3-c0b8b0e35dde" x="0" y="0" width="99" height="30" fontName="Arial" fontSize="8.0" pattern="#,##0" hTextAlign="Right" vTextAlign="Middle">
+							<detailCell height="29" style="Table_TD">
+								<element kind="textField" uuid="3b16ef7d-483a-4149-88d3-c0b8b0e35dde" x="0" y="0" width="100" height="29" fontName="Arial" fontSize="8.0" pattern="#,##0" hTextAlign="Right" vTextAlign="Middle">
 									<expression><![CDATA[$F{unitPrice}]]></expression>
 									<box topPadding="3" leftPadding="3" rightPadding="3">
 										<pen lineWidth="1.0"/>
@@ -260,9 +223,9 @@
 							</detailCell>
 							<property name="com.jaspersoft.studio.components.table.model.column.name" value="Column3"/>
 						</column>
-						<column kind="single" uuid="aeb60052-ca3b-42d2-937e-3a40af79b35c" width="110">
-							<columnHeader height="20" rowSpan="1" style="Table_CH">
-								<element kind="staticText" uuid="ec36d49b-ab0f-4e85-a43f-ad8b5715edb7" x="0" y="0" width="110" height="20" fontName="Arial" hTextAlign="Center" vTextAlign="Middle">
+						<column kind="single" uuid="aeb60052-ca3b-42d2-937e-3a40af79b35c" width="89">
+							<columnHeader height="15" rowSpan="1" style="Table_CH">
+								<element kind="staticText" uuid="ec36d49b-ab0f-4e85-a43f-ad8b5715edb7" x="0" y="0" width="89" height="15" fontName="Arial" hTextAlign="Center" vTextAlign="Middle">
 									<text><![CDATA[Thành tiền (VND)]]></text>
 									<box>
 										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -273,9 +236,9 @@
 								</element>
 							</columnHeader>
 							<columnFooter height="30" rowSpan="1">
-								<element kind="textField" uuid="c4a50fa9-96a2-498f-8df1-211aa2ad308b" x="0" y="0" width="110" height="30" pattern="#,##0" bold="true" hTextAlign="Right" vTextAlign="Top">
+								<element kind="textField" uuid="c4a50fa9-96a2-498f-8df1-211aa2ad308b" x="0" y="0" width="89" height="30" pattern="#,##0" bold="true" hTextAlign="Right" vTextAlign="Top">
 									<expression><![CDATA[$V{medTotal}]]></expression>
-									<box topPadding="3" rightPadding="3">
+									<box topPadding="2" rightPadding="3">
 										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 										<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 										<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -289,8 +252,8 @@
 									<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 								</box>
 							</columnFooter>
-							<detailCell height="30" style="Table_TD">
-								<element kind="textField" uuid="02937f0a-f5d4-4549-a3ac-75615083057e" x="0" y="0" width="110" height="30" fontName="Arial" fontSize="8.0" pattern="#,##0" hTextAlign="Right" vTextAlign="Middle">
+							<detailCell height="29" style="Table_TD">
+								<element kind="textField" uuid="02937f0a-f5d4-4549-a3ac-75615083057e" x="0" y="0" width="89" height="29" fontName="Arial" fontSize="8.0" pattern="#,##0" hTextAlign="Right" vTextAlign="Middle">
 									<expression><![CDATA[$V{medRowTotal}]]></expression>
 									<box topPadding="3" leftPadding="0" rightPadding="3">
 										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -314,7 +277,7 @@
 					<property name="com.jaspersoft.studio.table.style.column_header" value="Table_CH"/>
 					<property name="com.jaspersoft.studio.table.style.detail" value="Table_TD"/>
 				</element>
-				<element kind="staticText" uuid="9117208f-15de-4a22-8c8a-a994a0c99777" x="232" y="0" width="100" height="18" fontSize="14.0" bold="true" hTextAlign="Center">
+				<element kind="staticText" uuid="9117208f-15de-4a22-8c8a-a994a0c99777" x="232" y="0" width="100" height="18" fontName="Times New Roman" fontSize="14.0" bold="true" hTextAlign="Center">
 					<printWhenExpression><![CDATA[$P{hasMedicines}]]></printWhenExpression>
 					<text><![CDATA[THUỐC]]></text>
 				</element>
@@ -323,22 +286,22 @@
 	</group>
 	<group name="group_dichvu">
 		<groupHeader>
-			<band height="95">
+			<band height="83">
 				<printWhenExpression><![CDATA[$P{hasServices}]]></printWhenExpression>
-				<element kind="staticText" uuid="5a4c9016-75d9-4a19-aa4d-7af0a0d88dbc" positionType="Float" x="235" y="4" width="100" height="18" fontSize="14.0" bold="true" hTextAlign="Center">
+				<element kind="staticText" uuid="5a4c9016-75d9-4a19-aa4d-7af0a0d88dbc" positionType="Float" x="235" y="-2" width="100" height="18" fontName="Times New Roman" fontSize="14.0" bold="true" hTextAlign="Center">
 					<printWhenExpression><![CDATA[$P{hasServices}]]></printWhenExpression>
 					<text><![CDATA[DỊCH VỤ]]></text>
 				</element>
-				<element kind="component" uuid="68c80e54-2998-4cf3-91c0-42fde9130772" positionType="Float" x="10" y="24" width="539" height="69">
+				<element kind="component" uuid="68c80e54-2998-4cf3-91c0-42fde9130772" positionType="Float" x="10" y="18" width="539" height="65">
 					<printWhenExpression><![CDATA[$P{hasServices}]]></printWhenExpression>
 					<component kind="table">
 						<datasetRun uuid="24cf5328-ecae-4c68-8955-73475b8823b4" subDataset="med_pre">
 							<dataSourceExpression><![CDATA[$P{serviceDS}]]></dataSourceExpression>
 							<returnValue toVariable="ServiceGrandTotal" fromVariable="serTotal"/>
 						</datasetRun>
-						<column kind="single" uuid="9be00b0a-9844-4037-a53e-be1970a83d48" width="240">
-							<columnHeader height="20" rowSpan="1" style="Table_CH">
-								<element kind="staticText" uuid="f3bfa0e9-452f-417c-a96b-a36de1d89c60" x="0" y="0" width="240" height="20" fontName="Arial" hTextAlign="Center" vTextAlign="Middle">
+						<column kind="single" uuid="9be00b0a-9844-4037-a53e-be1970a83d48" width="290">
+							<columnHeader height="15" rowSpan="1" style="Table_CH">
+								<element kind="staticText" uuid="f3bfa0e9-452f-417c-a96b-a36de1d89c60" x="0" y="0" width="290" height="15" fontName="Arial" hTextAlign="Center" vTextAlign="Middle">
 									<text><![CDATA[Tên dịch vụ]]></text>
 									<box>
 										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -347,6 +310,7 @@
 										<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 									</box>
 								</element>
+								<property name="com.jaspersoft.studio.unit.height" value="px"/>
 							</columnHeader>
 							<columnFooter height="30" rowSpan="1">
 								<property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.VerticalRowLayout"/>
@@ -358,7 +322,7 @@
 								</box>
 							</columnFooter>
 							<detailCell height="29" style="Table_TD">
-								<element kind="textField" uuid="a16334e1-e3e0-4c20-a22d-7ce6a546edc8" x="0" y="0" width="240" height="15" fontName="Arial" fontSize="8.0" hTextAlign="Left" vTextAlign="Top">
+								<element kind="textField" uuid="a16334e1-e3e0-4c20-a22d-7ce6a546edc8" x="0" y="0" width="290" height="15" fontName="Arial" fontSize="8.0" hTextAlign="Left" vTextAlign="Top">
 									<expression><![CDATA[$F{serName}]]></expression>
 									<box topPadding="3" leftPadding="3">
 										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -367,7 +331,7 @@
 										<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 									</box>
 								</element>
-								<element kind="textField" uuid="48a3aa97-2f44-433e-a5b3-28fbcc0b0877" x="0" y="15" width="240" height="14" fontName="Arial" fontSize="8.0" italic="true">
+								<element kind="textField" uuid="48a3aa97-2f44-433e-a5b3-28fbcc0b0877" x="0" y="15" width="290" height="14" fontName="Arial" fontSize="8.0" italic="true">
 									<expression><![CDATA["Ghi chú: " + $F{serNote}]]></expression>
 									<box leftPadding="3">
 										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -385,9 +349,9 @@
 							</detailCell>
 							<property name="com.jaspersoft.studio.components.table.model.column.name" value="Column1"/>
 						</column>
-						<column kind="single" uuid="5d4cb5ab-0637-4bc5-9aa4-51d8748d93a3" width="90">
-							<columnHeader height="20" rowSpan="1" style="Table_CH">
-								<element kind="staticText" uuid="7d80482e-8a8d-4afe-9024-2ebddcd229ba" x="0" y="0" width="90" height="20" fontName="Arial" hTextAlign="Center" vTextAlign="Middle">
+						<column kind="single" uuid="5d4cb5ab-0637-4bc5-9aa4-51d8748d93a3" width="59">
+							<columnHeader height="15" rowSpan="1" style="Table_CH">
+								<element kind="staticText" uuid="7d80482e-8a8d-4afe-9024-2ebddcd229ba" x="0" y="0" width="59" height="15" fontName="Arial" hTextAlign="Center" vTextAlign="Middle">
 									<text><![CDATA[SL]]></text>
 									<box>
 										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -406,7 +370,7 @@
 								</box>
 							</columnFooter>
 							<detailCell height="29" style="Table_TD">
-								<element kind="textField" uuid="48ad7d8f-6a79-4804-9f36-9f5c8b6ce888" x="0" y="0" width="90" height="29" fontName="Arial" fontSize="8.0" hTextAlign="Center" vTextAlign="Middle">
+								<element kind="textField" uuid="48ad7d8f-6a79-4804-9f36-9f5c8b6ce888" x="0" y="0" width="59" height="29" fontName="Arial" fontSize="8.0" hTextAlign="Center" vTextAlign="Middle">
 									<expression><![CDATA[$F{serAmount}]]></expression>
 									<box topPadding="3" leftPadding="3" bottomPadding="0" rightPadding="0">
 										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -424,9 +388,9 @@
 							</detailCell>
 							<property name="com.jaspersoft.studio.components.table.model.column.name" value="Column2"/>
 						</column>
-						<column kind="single" uuid="3327181e-4f64-4d63-82ff-0ed2b59480cc" width="109">
-							<columnHeader height="20" rowSpan="1" style="Table_CH">
-								<element kind="staticText" uuid="37981f61-4b25-40b0-8a0c-41bcc6ed32fa" x="0" y="0" width="109" height="20" fontName="Arial" hTextAlign="Center" vTextAlign="Middle">
+						<column kind="single" uuid="3327181e-4f64-4d63-82ff-0ed2b59480cc" width="110">
+							<columnHeader height="15" rowSpan="1" style="Table_CH">
+								<element kind="staticText" uuid="37981f61-4b25-40b0-8a0c-41bcc6ed32fa" x="0" y="0" width="110" height="15" fontName="Arial" hTextAlign="Center" vTextAlign="Middle">
 									<text><![CDATA[Đơn giá (VND)]]></text>
 									<box>
 										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -437,7 +401,7 @@
 								</element>
 							</columnHeader>
 							<columnFooter height="30" rowSpan="1">
-								<element kind="staticText" uuid="3b9fa332-aed6-4fa5-936b-8de4b1e1bae0" x="0" y="0" width="109" height="30" fontName="Arial" fontSize="12.0" bold="true" hTextAlign="Left" vTextAlign="Top">
+								<element kind="staticText" uuid="3b9fa332-aed6-4fa5-936b-8de4b1e1bae0" x="0" y="0" width="110" height="30" fontName="Arial" fontSize="12.0" bold="true" hTextAlign="Left" vTextAlign="Top">
 									<text><![CDATA[Tổng tiền dịch vụ:]]></text>
 									<box topPadding="3" leftPadding="3"/>
 								</element>
@@ -449,7 +413,7 @@
 								</box>
 							</columnFooter>
 							<detailCell height="29" style="Table_TD">
-								<element kind="textField" uuid="6bf24316-39cd-4805-8548-52ea9d23818e" x="0" y="0" width="109" height="29" fontName="Arial" fontSize="8.0" pattern="#,##0" hTextAlign="Right" vTextAlign="Middle">
+								<element kind="textField" uuid="6bf24316-39cd-4805-8548-52ea9d23818e" x="0" y="0" width="110" height="29" fontName="Arial" fontSize="8.0" pattern="#,##0" hTextAlign="Right" vTextAlign="Middle">
 									<expression><![CDATA[$F{serUnitPrice}]]></expression>
 									<box topPadding="3" leftPadding="3" rightPadding="3">
 										<pen lineWidth="1.0"/>
@@ -468,9 +432,9 @@
 							</detailCell>
 							<property name="com.jaspersoft.studio.components.table.model.column.name" value="Column3"/>
 						</column>
-						<column kind="single" uuid="5aca36b8-4305-428a-9311-4223d48dc96b" width="100">
-							<columnHeader height="20" rowSpan="1" style="Table_CH">
-								<element kind="staticText" uuid="51fe5f04-3e6f-4f9c-bfbe-c9aa31e5266d" x="0" y="0" width="100" height="20" fontName="Arial" hTextAlign="Center" vTextAlign="Middle">
+						<column kind="single" uuid="5aca36b8-4305-428a-9311-4223d48dc96b" width="81">
+							<columnHeader height="15" rowSpan="1" style="Table_CH">
+								<element kind="staticText" uuid="51fe5f04-3e6f-4f9c-bfbe-c9aa31e5266d" x="0" y="0" width="81" height="15" fontName="Arial" hTextAlign="Center" vTextAlign="Middle">
 									<text><![CDATA[Thành tiền (VND)]]></text>
 									<box>
 										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -481,7 +445,7 @@
 								</element>
 							</columnHeader>
 							<columnFooter height="30" rowSpan="1">
-								<element kind="textField" uuid="a0606f4b-6dad-47cd-b470-f401e298612e" x="0" y="0" width="100" height="30" pattern="#,##0" bold="true" hTextAlign="Right" vTextAlign="Top">
+								<element kind="textField" uuid="a0606f4b-6dad-47cd-b470-f401e298612e" x="0" y="0" width="81" height="30" pattern="#,##0" bold="true" hTextAlign="Right" vTextAlign="Top">
 									<expression><![CDATA[$V{serTotal}]]></expression>
 									<box topPadding="3" rightPadding="3">
 										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -498,7 +462,7 @@
 								</box>
 							</columnFooter>
 							<detailCell height="29" style="Table_TD">
-								<element kind="textField" uuid="035cfa1b-9187-4bfe-8fa1-1d149d789768" x="0" y="0" width="100" height="29" fontName="Arial" fontSize="8.0" pattern="#,##0" hTextAlign="Right" vTextAlign="Middle">
+								<element kind="textField" uuid="035cfa1b-9187-4bfe-8fa1-1d149d789768" x="0" y="0" width="81" height="29" fontName="Arial" fontSize="8.0" pattern="#,##0" hTextAlign="Right" vTextAlign="Middle">
 									<expression><![CDATA[$V{serRowTotal}]]></expression>
 									<box topPadding="3" leftPadding="0" rightPadding="3">
 										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -527,22 +491,22 @@
 	</group>
 	<group name="group_thucphambosung">
 		<groupHeader>
-			<band height="103">
+			<band height="88">
 				<printWhenExpression><![CDATA[$P{hasSupplements}]]></printWhenExpression>
-				<element kind="staticText" uuid="6d6dde35-8321-4fa0-9c3c-d958b1746883" positionType="Float" x="211" y="1" width="161" height="19" fontSize="14.0" bold="true" hTextAlign="Center">
+				<element kind="staticText" uuid="6d6dde35-8321-4fa0-9c3c-d958b1746883" positionType="Float" x="211" y="1" width="161" height="19" fontName="Times New Roman" fontSize="14.0" bold="true" hTextAlign="Center">
 					<printWhenExpression><![CDATA[$P{hasSupplements}]]></printWhenExpression>
 					<text><![CDATA[THỰC PHẨM BỔ SUNG]]></text>
 				</element>
-				<element kind="component" uuid="1e772fe4-c438-49a7-9c8d-80acc5179879" positionType="Float" x="10" y="19" width="539" height="79">
+				<element kind="component" uuid="1e772fe4-c438-49a7-9c8d-80acc5179879" positionType="Float" x="10" y="19" width="539" height="69">
 					<printWhenExpression><![CDATA[$P{hasSupplements}]]></printWhenExpression>
 					<component kind="table">
 						<datasetRun uuid="b5f5d7d0-20c6-4715-940e-fc9269e059c4" subDataset="med_pre">
 							<dataSourceExpression><![CDATA[$P{supplementDS}]]></dataSourceExpression>
 							<returnValue toVariable="SupplementGrandTotal" fromVariable="supTotal"/>
 						</datasetRun>
-						<column kind="single" uuid="c56e4696-b21a-4640-a3ca-b528622c7c86" width="160">
-							<columnHeader height="20" rowSpan="1" style="Table_CH">
-								<element kind="staticText" uuid="5ac78482-8ead-4d65-8232-92426efbcb34" stretchType="NoStretch" x="0" y="0" width="160" height="20" fontName="Arial" hTextAlign="Center" vTextAlign="Middle">
+						<column kind="single" uuid="c56e4696-b21a-4640-a3ca-b528622c7c86" width="300">
+							<columnHeader height="15" rowSpan="1" style="Table_CH">
+								<element kind="staticText" uuid="5ac78482-8ead-4d65-8232-92426efbcb34" stretchType="NoStretch" x="0" y="0" width="300" height="15" fontName="Arial" hTextAlign="Center" vTextAlign="Middle">
 									<text><![CDATA[Tên sản phẩm]]></text>
 									<property name="com.jaspersoft.studio.unit.height" value="px"/>
 									<box>
@@ -552,6 +516,7 @@
 										<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 									</box>
 								</element>
+								<property name="com.jaspersoft.studio.unit.height" value="px"/>
 							</columnHeader>
 							<columnFooter height="30" rowSpan="1">
 								<property name="com.jaspersoft.studio.layout" value="com.jaspersoft.studio.editor.layout.VerticalRowLayout"/>
@@ -563,7 +528,7 @@
 								</box>
 							</columnFooter>
 							<detailCell height="30" style="Table_TD">
-								<element kind="textField" uuid="d5ea8862-e0b9-46d9-a53c-c10aca930651" x="0" y="0" width="160" height="15" fontName="Arial" fontSize="8.0" hTextAlign="Left" vTextAlign="Top">
+								<element kind="textField" uuid="d5ea8862-e0b9-46d9-a53c-c10aca930651" x="0" y="0" width="300" height="15" fontName="Arial" fontSize="8.0" hTextAlign="Left" vTextAlign="Top">
 									<expression><![CDATA[$F{supName}]]></expression>
 									<box topPadding="3" leftPadding="3">
 										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -572,8 +537,8 @@
 										<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 									</box>
 								</element>
-								<element kind="textField" uuid="5bf931d8-5fc9-4ad0-9a88-ce5fb7874edd" x="0" y="15" width="160" height="15" fontName="Arial" fontSize="8.0" italic="true">
-									<expression><![CDATA["Ghi chú: " + $F{supNote}]]></expression>
+								<element kind="textField" uuid="5bf931d8-5fc9-4ad0-9a88-ce5fb7874edd" x="0" y="15" width="300" height="15" fontName="Arial" fontSize="8.0" italic="true">
+									<expression><![CDATA["Ghi chú: " + $F{supNote} + ", " + $F{supDosage}]]></expression>
 									<box leftPadding="3">
 										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 										<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -590,49 +555,9 @@
 							</detailCell>
 							<property name="com.jaspersoft.studio.components.table.model.column.name" value="Column1"/>
 						</column>
-						<column kind="single" uuid="ed772a4b-c595-416c-89c4-adc8f03f8bbb" width="90">
-							<columnHeader height="20" rowSpan="1" style="Table_CH">
-								<element kind="staticText" uuid="931a3eba-7d94-4d55-9584-ef03aef45f85" x="0" y="0" width="90" height="20" fontName="Arial" hTextAlign="Center" vTextAlign="Middle">
-									<text><![CDATA[Liều dùng]]></text>
-									<box>
-										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-										<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-										<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-										<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-									</box>
-								</element>
-							</columnHeader>
-							<columnFooter height="30" rowSpan="1">
-								<box>
-									<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-									<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-									<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-									<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-								</box>
-							</columnFooter>
-							<detailCell height="30" style="Table_TD">
-								<element kind="textField" uuid="76c3a08d-98e3-44ad-8422-24a953ce06d6" x="0" y="0" width="90" height="30" fontName="Arial" fontSize="8.0" hTextAlign="Center" vTextAlign="Middle">
-									<expression><![CDATA[$F{supDosage}]]></expression>
-									<box topPadding="3" leftPadding="3">
-										<pen lineWidth="1.0"/>
-										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-										<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-										<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-										<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-									</box>
-								</element>
-								<box style="Table_TD">
-									<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
-									<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
-									<bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
-									<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
-								</box>
-							</detailCell>
-							<property name="com.jaspersoft.studio.components.table.model.column.name" value="Column2"/>
-						</column>
-						<column kind="single" uuid="896672c4-8128-4e60-b52a-4469dff9bc37" width="80">
-							<columnHeader height="20" rowSpan="1" style="Table_CH">
-								<element kind="staticText" uuid="dec34657-b22a-42b0-b8f6-54c2d0b557b7" x="0" y="0" width="80" height="20" fontName="Arial" hTextAlign="Center" vTextAlign="Middle">
+						<column kind="single" uuid="896672c4-8128-4e60-b52a-4469dff9bc37" width="50">
+							<columnHeader height="15" rowSpan="1" style="Table_CH">
+								<element kind="staticText" uuid="dec34657-b22a-42b0-b8f6-54c2d0b557b7" x="0" y="0" width="50" height="15" fontName="Arial" hTextAlign="Center" vTextAlign="Middle">
 									<text><![CDATA[SL]]></text>
 									<box>
 										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -651,7 +576,7 @@
 								</box>
 							</columnFooter>
 							<detailCell height="30" style="Table_TD">
-								<element kind="textField" uuid="b0d84fb4-a5d8-4b2d-89c0-f082afe51ef3" x="0" y="0" width="80" height="30" fontName="Arial" fontSize="8.0" hTextAlign="Center" vTextAlign="Middle">
+								<element kind="textField" uuid="b0d84fb4-a5d8-4b2d-89c0-f082afe51ef3" x="0" y="0" width="50" height="30" fontName="Arial" fontSize="8.0" hTextAlign="Center" vTextAlign="Middle">
 									<expression><![CDATA[$F{supAmount}]]></expression>
 									<box topPadding="3" leftPadding="3" bottomPadding="0" rightPadding="0">
 										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -669,9 +594,9 @@
 							</detailCell>
 							<property name="com.jaspersoft.studio.components.table.model.column.name" value="Column2"/>
 						</column>
-						<column kind="single" uuid="b39552ea-7133-415f-9651-ab70891e8c3b" width="99">
-							<columnHeader height="20" rowSpan="1" style="Table_CH">
-								<element kind="staticText" uuid="6ccc7d95-8eb4-45dd-990a-405dbdd76460" x="0" y="0" width="99" height="20" fontName="Arial" hTextAlign="Center" vTextAlign="Middle">
+						<column kind="single" uuid="b39552ea-7133-415f-9651-ab70891e8c3b" width="100">
+							<columnHeader height="15" rowSpan="1" style="Table_CH">
+								<element kind="staticText" uuid="6ccc7d95-8eb4-45dd-990a-405dbdd76460" x="0" y="0" width="100" height="15" fontName="Arial" hTextAlign="Center" vTextAlign="Middle">
 									<text><![CDATA[Đơn giá (VND)]]></text>
 									<box>
 										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -682,7 +607,7 @@
 								</element>
 							</columnHeader>
 							<columnFooter height="30" rowSpan="1">
-								<element kind="staticText" uuid="9507b170-f15d-4fc1-92d0-afdff63314dc" x="0" y="0" width="99" height="30" fontName="Arial" fontSize="12.0" bold="true" hTextAlign="Left" vTextAlign="Top">
+								<element kind="staticText" uuid="9507b170-f15d-4fc1-92d0-afdff63314dc" x="0" y="0" width="100" height="30" fontName="Arial" fontSize="12.0" bold="true" hTextAlign="Left" vTextAlign="Top">
 									<text><![CDATA[Tổng tiền thuốc:]]></text>
 									<box topPadding="3" leftPadding="3"/>
 								</element>
@@ -694,7 +619,7 @@
 								</box>
 							</columnFooter>
 							<detailCell height="30" style="Table_TD">
-								<element kind="textField" uuid="b2a7a96b-2dfa-4e45-80fb-a539e558c7f7" x="0" y="0" width="99" height="30" fontName="Arial" fontSize="8.0" pattern="#,##0" hTextAlign="Right" vTextAlign="Middle">
+								<element kind="textField" uuid="b2a7a96b-2dfa-4e45-80fb-a539e558c7f7" x="0" y="0" width="100" height="30" fontName="Arial" fontSize="8.0" pattern="#,##0" hTextAlign="Right" vTextAlign="Middle">
 									<expression><![CDATA[$F{supUnitPrice}]]></expression>
 									<box topPadding="3" leftPadding="3" rightPadding="3">
 										<pen lineWidth="1.0"/>
@@ -713,9 +638,9 @@
 							</detailCell>
 							<property name="com.jaspersoft.studio.components.table.model.column.name" value="Column3"/>
 						</column>
-						<column kind="single" uuid="37250740-3d62-4dc1-800d-eb943da0388e" width="110">
-							<columnHeader height="20" rowSpan="1" style="Table_CH">
-								<element kind="staticText" uuid="5c61209b-8409-4ba2-979e-f52e49eb0b00" x="0" y="0" width="110" height="20" fontName="Arial" hTextAlign="Center" vTextAlign="Middle">
+						<column kind="single" uuid="37250740-3d62-4dc1-800d-eb943da0388e" width="89">
+							<columnHeader height="15" rowSpan="1" style="Table_CH">
+								<element kind="staticText" uuid="5c61209b-8409-4ba2-979e-f52e49eb0b00" x="0" y="0" width="89" height="15" fontName="Arial" hTextAlign="Center" vTextAlign="Middle">
 									<text><![CDATA[Thành tiền (VND)]]></text>
 									<box>
 										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -726,7 +651,7 @@
 								</element>
 							</columnHeader>
 							<columnFooter height="30" rowSpan="1">
-								<element kind="textField" uuid="f0e1b6cf-c081-4483-ab9c-a9112960858d" x="0" y="0" width="110" height="30" pattern="#,##0" bold="true" hTextAlign="Right" vTextAlign="Top">
+								<element kind="textField" uuid="f0e1b6cf-c081-4483-ab9c-a9112960858d" x="0" y="0" width="89" height="30" pattern="#,##0" bold="true" hTextAlign="Right" vTextAlign="Top">
 									<expression><![CDATA[$V{supTotal}]]></expression>
 									<box topPadding="3" rightPadding="3">
 										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -743,7 +668,7 @@
 								</box>
 							</columnFooter>
 							<detailCell height="30" style="Table_TD">
-								<element kind="textField" uuid="b46cdc11-d0af-4436-a554-b9c38613f07a" x="0" y="0" width="110" height="30" fontName="Arial" fontSize="8.0" pattern="#,##0" hTextAlign="Right" vTextAlign="Middle">
+								<element kind="textField" uuid="b46cdc11-d0af-4436-a554-b9c38613f07a" x="0" y="0" width="89" height="30" fontName="Arial" fontSize="8.0" pattern="#,##0" hTextAlign="Right" vTextAlign="Middle">
 									<expression><![CDATA[$V{supRowTotal}]]></expression>
 									<box topPadding="3" leftPadding="0" rightPadding="3">
 										<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -775,19 +700,19 @@
 		<element kind="image" uuid="c596ac6f-18d9-4cfe-a74e-58b1f7d11ecc" x="-10" y="-4" width="90" height="83">
 			<expression><![CDATA[$P{logoImage}]]></expression>
 		</element>
-		<element kind="textField" uuid="48bf4793-8d8d-427d-b739-8f34f051192f" x="80" y="-4" width="350" height="25" fontName="Arial" fontSize="18.0" bold="true">
-			<expression><![CDATA["PHÒNG KHÁM " + $P{clinicName}]]></expression>
+		<element kind="textField" uuid="48bf4793-8d8d-427d-b739-8f34f051192f" x="80" y="-4" width="350" height="25" fontName="Times New Roman" fontSize="18.0" bold="true">
+			<expression><![CDATA[$P{clinicName}]]></expression>
 		</element>
-		<element kind="staticText" uuid="d8e95ce7-3ac0-44a7-ac8f-65821b7f373c" x="80" y="20" width="150" height="15" fontName="Arial" fontSize="12.0" bold="true" hTextAlign="Left">
+		<element kind="staticText" uuid="d8e95ce7-3ac0-44a7-ac8f-65821b7f373c" x="80" y="20" width="150" height="15" fontName="Times New Roman" fontSize="12.0" bold="true" hTextAlign="Left">
 			<text><![CDATA[Địa chỉ: ]]></text>
 		</element>
-		<element kind="textField" uuid="9883203e-fd4b-4110-a4b9-2c8c257ce5fa" x="126" y="20" width="346" height="15" fontName="Arial" fontSize="12.0">
+		<element kind="textField" uuid="9883203e-fd4b-4110-a4b9-2c8c257ce5fa" x="126" y="20" width="346" height="15" fontName="Times New Roman" fontSize="12.0">
 			<expression><![CDATA[$P{clinicAddress}]]></expression>
 		</element>
-		<element kind="staticText" uuid="f00706ca-903c-4089-b3a1-33be68f6112b" x="80" y="36" width="150" height="15" fontName="Arial" fontSize="12.0" bold="true" hTextAlign="Left">
+		<element kind="staticText" uuid="f00706ca-903c-4089-b3a1-33be68f6112b" x="80" y="36" width="150" height="15" fontName="Times New Roman" fontSize="12.0" bold="true" hTextAlign="Left">
 			<text><![CDATA[SĐT:]]></text>
 		</element>
-		<element kind="textField" uuid="2af00e22-702e-42cb-a6fb-19d401a58170" x="110" y="36" width="362" height="15" fontName="Arial" fontSize="12.0">
+		<element kind="textField" uuid="2af00e22-702e-42cb-a6fb-19d401a58170" x="110" y="36" width="362" height="15" fontName="Times New Roman" fontSize="12.0">
 			<expression><![CDATA[$P{clinicPhone}]]></expression>
 		</element>
 		<element kind="component" uuid="35037abf-0984-4b9e-8a05-f8fae38d7dcc" x="476" y="21" width="79" height="48">
@@ -795,85 +720,85 @@
 				<codeExpression><![CDATA[$P{barcodeNumber}]]></codeExpression>
 			</component>
 		</element>
-		<element kind="staticText" uuid="aef24b29-b2af-4cdb-b230-d2acd3ce2892" x="472" y="10" width="80" height="25" fontName="Arial" fontSize="10.0" bold="false" hTextAlign="Center">
+		<element kind="staticText" uuid="aef24b29-b2af-4cdb-b230-d2acd3ce2892" x="472" y="10" width="80" height="25" fontName="Times New Roman" fontSize="10.0" bold="false" hTextAlign="Center">
 			<text><![CDATA[Mã khám bệnh]]></text>
 		</element>
-		<element kind="staticText" uuid="de38fb46-49af-4f48-8c33-f97680bcc7fa" x="192" y="54" width="180" height="25" fontName="Arial" fontSize="18.0" bold="true" hTextAlign="Center">
-			<text><![CDATA[TOA THUỐC]]></text>
+		<element kind="staticText" uuid="de38fb46-49af-4f48-8c33-f97680bcc7fa" x="135" y="54" width="284" height="25" fontName="Times New Roman" fontSize="18.0" bold="true" hTextAlign="Center">
+			<text><![CDATA[TOA THUỐC & DỊCH VỤ]]></text>
 		</element>
 	</title>
-	<pageHeader height="110" splitType="Stretch">
-		<element kind="staticText" uuid="68240a36-0b2b-4bc9-aee9-ab6c4ec19f7c" x="0" y="1" width="50" height="15" fontName="Arial" fontSize="10.0" bold="true" hTextAlign="Left">
+	<pageHeader height="72" splitType="Stretch">
+		<element kind="staticText" uuid="e6997cbd-6cea-4ab2-ab14-402c6487566b" x="0" y="5" width="50" height="15" fontName="Times New Roman" fontSize="10.0" bold="true" hTextAlign="Left">
 			<text><![CDATA[Họ và tên:]]></text>
 		</element>
-		<element kind="staticText" uuid="fbfab342-b9df-417d-8341-38a547f80561" x="0" y="16" width="80" height="15" fontName="Arial" fontSize="10.0" bold="true" hTextAlign="Left">
+		<element kind="staticText" uuid="3dc3cfae-fb07-4ee2-a477-9e14e1a88a55" x="0" y="18" width="80" height="15" fontName="Times New Roman" fontSize="10.0" bold="true" hTextAlign="Left">
 			<text><![CDATA[Ngày sinh:]]></text>
 		</element>
-		<element kind="staticText" uuid="5902f022-60d4-4924-88bb-c3f5bc010212" x="0" y="31" width="80" height="15" fontName="Arial" fontSize="10.0" bold="true" hTextAlign="Left">
+		<element kind="staticText" uuid="1c26d386-0d3f-4e81-80b7-19e6d99c8bb6" x="140" y="18" width="80" height="15" fontName="Times New Roman" fontSize="10.0" bold="true" hTextAlign="Left">
 			<text><![CDATA[Giới tính:]]></text>
 		</element>
-		<element kind="staticText" uuid="7c27a754-d81f-4411-be00-7ee575cc12e8" x="0" y="46" width="80" height="15" fontName="Arial" fontSize="10.0" bold="true" hTextAlign="Left">
+		<element kind="staticText" uuid="0d2b2914-3291-41e1-b026-6258b8b7c9bc" x="0" y="32" width="49" height="15" fontName="Times New Roman" bold="true" hTextAlign="Left">
 			<text><![CDATA[Địa chỉ:]]></text>
 		</element>
-		<element kind="staticText" uuid="089f23f2-b1f5-4102-89a4-b11bfa1ff468" x="320" y="1" width="50" height="15" fontName="Arial" fontSize="10.0" bold="true" hTextAlign="Left">
+		<element kind="staticText" uuid="4da3f19a-8dcb-4a94-b1c0-68ad61615197" x="274" y="4" width="50" height="15" fontName="Times New Roman" fontSize="10.0" bold="true" hTextAlign="Left">
 			<text><![CDATA[Bác sĩ:]]></text>
 		</element>
-		<element kind="staticText" uuid="f6b2d15b-04a1-44ed-b72e-bd9e364ed248" x="320" y="16" width="60" height="15" fontName="Arial" fontSize="10.0" bold="true" hTextAlign="Left">
+		<element kind="staticText" uuid="9b7c5e15-fd8b-4314-8941-863bf39db57d" x="274" y="18" width="60" height="15" fontName="Times New Roman" fontSize="10.0" bold="true" hTextAlign="Left">
 			<text><![CDATA[Ngày khám:]]></text>
 		</element>
-		<element kind="staticText" uuid="7b2f5efd-dda7-4233-8f6d-e54a425f6ef6" x="0" y="81" width="80" height="15" fontName="Arial" fontSize="10.0" bold="true" hTextAlign="Left">
-			<text><![CDATA[Chuẩn đoán:]]></text>
-		</element>
-		<element kind="staticText" uuid="23013729-cb89-46b8-b956-7be6bfd2a010" x="320" y="32" width="80" height="15" fontName="Arial" fontSize="10.0" bold="true" hTextAlign="Left">
-			<text><![CDATA[Ghi chú:]]></text>
-		</element>
-		<element kind="textField" uuid="7e27e979-69d3-475c-ad48-5b71030a6eae" x="60" y="1" width="260" height="15" fontName="Arial">
+		<element kind="textField" uuid="f2f20167-fbd0-47d5-a7ce-03d7da78f342" x="60" y="5" width="214" height="15" fontName="Times New Roman" fontSize="10.0">
 			<expression><![CDATA[$P{patientName}]]></expression>
 		</element>
-		<element kind="textField" uuid="ff99dc8c-8477-49d7-8206-344463437478" x="60" y="16" width="260" height="15" fontName="Arial">
+		<element kind="textField" uuid="46ef6929-7796-4d92-9478-8ed269d8708f" x="60" y="18" width="80" height="15" fontName="Times New Roman" fontSize="10.0">
 			<expression><![CDATA[$P{patientDOB}]]></expression>
 		</element>
-		<element kind="textField" uuid="19536fc9-be78-46dc-8891-a7c1e6108498" x="60" y="32" width="260" height="15" fontName="Arial">
+		<element kind="textField" uuid="2f307864-3cbc-4110-8d5a-34d78080a316" x="184" y="18" width="46" height="15" fontName="Times New Roman" fontSize="10.0">
 			<expression><![CDATA[$P{patientGender}]]></expression>
 		</element>
-		<element kind="textField" uuid="a942834e-78fb-4975-ba71-331948e92d65" x="60" y="47" width="260" height="33" fontName="Arial">
+		<element kind="textField" uuid="3e0c0023-37b8-490a-b839-ba0a50fb1629" x="60" y="32" width="214" height="15" fontName="Times New Roman" fontSize="10.0">
 			<expression><![CDATA[$P{patientAddress}]]></expression>
 		</element>
-		<element kind="textField" uuid="4154fffa-29ed-4d89-ba1f-4bb490626135" x="380" y="1" width="173" height="15" fontName="Arial">
+		<element kind="textField" uuid="7ed16435-adca-4e26-aae4-4acad15ed344" x="330" y="4" width="122" height="15" fontName="Times New Roman" fontSize="10.0">
 			<expression><![CDATA[$P{doctorName}]]></expression>
 		</element>
-		<element kind="textField" uuid="2c951dbb-1809-4aef-b3f9-1325579449b7" x="380" y="16" width="173" height="15" fontName="Arial">
+		<element kind="textField" uuid="4a444f9a-544f-4ce5-b812-5704bc2bbfce" x="330" y="18" width="124" height="15" fontName="Times New Roman" fontSize="10.0">
 			<expression><![CDATA[$P{checkupDate}]]></expression>
 		</element>
-		<element kind="textField" uuid="85f77798-f7e7-4bb0-b32f-d0cba62f3664" x="64" y="81" width="482" height="26" fontName="Arial">
+		<element kind="staticText" uuid="c089f2a4-115e-4739-a0c7-7aa1e98b5c6a" x="0" y="46" width="59" height="16" fontName="Times New Roman" fontSize="10.0" bold="true" hTextAlign="Left">
+			<text><![CDATA[Chuẩn đoán:]]></text>
+		</element>
+		<element kind="textField" uuid="d44e5d8d-1ebd-45e3-a8bd-941e1c2a1392" x="60" y="46" width="214" height="26" fontName="Times New Roman" fontSize="10.0">
 			<expression><![CDATA[$P{patientDiagnos}]]></expression>
 		</element>
-		<element kind="textField" uuid="3d2ad8af-d76e-4191-8c49-38535da8bda1" x="380" y="32" width="173" height="28" fontName="Arial">
+		<element kind="staticText" uuid="7890cf52-9226-4382-a90c-82c8477341d7" x="274" y="32" width="59" height="16" fontName="Times New Roman" fontSize="10.0" bold="true" hTextAlign="Left">
+			<text><![CDATA[Ghi chú:]]></text>
+		</element>
+		<element kind="textField" uuid="941f1796-cbf9-4888-97bd-9a5d3fe369d8" x="330" y="32" width="190" height="26" fontName="Times New Roman" fontSize="10.0">
 			<expression><![CDATA[$P{checkupNote}]]></expression>
 		</element>
 	</pageHeader>
 	<pageFooter height="22" splitType="Stretch">
-		<element kind="textField" uuid="6bf56eff-9df3-4dbc-a46f-ed2169078f76" x="300" y="1" width="252" height="19" pattern="MMMMM dd, yyyy" hTextAlign="Right" vTextAlign="Bottom">
+		<element kind="textField" uuid="6bf56eff-9df3-4dbc-a46f-ed2169078f76" x="300" y="1" width="252" height="19" fontName="Times New Roman" pattern="MMMMM dd, yyyy" hTextAlign="Right" vTextAlign="Bottom">
 			<expression><![CDATA[new java.text.SimpleDateFormat("dd/MM/yyyy HH:mm").format(new java.util.Date()) + " | Trang " + $V{PAGE_NUMBER}]]></expression>
 		</element>
 	</pageFooter>
-	<summary height="149" splitType="Stretch">
-		<element kind="staticText" uuid="f6d652a5-b593-4ee5-96a2-a4886beb7483" x="240" y="15" width="280" height="30" fontName="Arial" fontSize="16.0" bold="true">
+	<summary height="128" splitType="Stretch">
+		<element kind="staticText" uuid="f6d652a5-b593-4ee5-96a2-a4886beb7483" x="240" y="15" width="280" height="30" fontName="Times New Roman" fontSize="16.0" bold="true">
 			<text><![CDATA[Tổng cộng thanh toán:]]></text>
 		</element>
-		<element kind="textField" uuid="f53358c4-1118-484a-968d-cf3fa2f55f3c" x="446" y="15" width="100" height="30" fontName="Arial" fontSize="16.0" evaluationTime="Report" pattern="#,##0" bold="true" hTextAlign="Right">
+		<element kind="textField" uuid="f53358c4-1118-484a-968d-cf3fa2f55f3c" x="446" y="15" width="100" height="30" fontName="Times New Roman" fontSize="16.0" evaluationTime="Report" pattern="#,##0" bold="true" hTextAlign="Right">
 			<expression><![CDATA[$V{MedicineGrandTotal}.add($V{ServiceGrandTotal}).add($V{SupplementGrandTotal})]]></expression>
 		</element>
 		<element kind="line" uuid="cc682c03-bd3f-480a-a69c-a7c56e855a7d" x="110" y="6" width="450" height="1">
 			<pen lineWidth="1.0"/>
 		</element>
-		<element kind="staticText" uuid="4884d0d3-eb98-4fd9-865c-a0d39f14ddce" x="376" y="37" width="70" height="15" fontName="Arial" fontSize="10.0" bold="true" hTextAlign="Left">
+		<element kind="staticText" uuid="4884d0d3-eb98-4fd9-865c-a0d39f14ddce" x="376" y="37" width="70" height="15" fontName="Times New Roman" fontSize="10.0" bold="true" hTextAlign="Left">
 			<text><![CDATA[Bác sĩ ghi toa:]]></text>
 		</element>
-		<element kind="textField" uuid="7430fd89-6565-41e6-a25a-619a9ab8f788" x="323" y="116" width="176" height="15" fontName="Arial" hTextAlign="Center">
+		<element kind="textField" uuid="7430fd89-6565-41e6-a25a-619a9ab8f788" x="323" y="97" width="176" height="15" fontName="Times New Roman" fontSize="12.0" bold="true" hTextAlign="Center">
 			<expression><![CDATA[$P{doctorName}]]></expression>
 		</element>
-		<element kind="textField" uuid="0324ca00-fa26-42c4-a87b-4bac3fa6db7c" x="285" y="127" width="252" height="19" pattern="MMMMM dd, yyyy" hTextAlign="Center" vTextAlign="Bottom">
+		<element kind="textField" uuid="0324ca00-fa26-42c4-a87b-4bac3fa6db7c" x="285" y="108" width="252" height="19" fontName="Times New Roman" pattern="MMMMM dd, yyyy" hTextAlign="Center" vTextAlign="Bottom">
 			<expression><![CDATA[new java.text.SimpleDateFormat("'Đức Hoà, ngày ' dd ' tháng ' MM ' năm ' yyyy", new java.util.Locale("vi", "VN")).format(new java.util.Date())]]></expression>
 		</element>
 	</summary>
diff --git a/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/print_forms/test_print.java b/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/print_forms/test_print.java
index 54e2e1c..8fa4ae0 100644
--- a/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/print_forms/test_print.java
+++ b/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/print_forms/test_print.java
@@ -57,6 +57,11 @@ public class test_print {
             parameters.put("serviceDS", serviceDS);
             parameters.put("supplementDS", supplementDS);
             
+            // Add boolean flags to control table visibility based on data presence
+            parameters.put("hasMedicines", !medicines.isEmpty());
+            parameters.put("hasServices", !services.isEmpty());
+            parameters.put("hasSupplements", !supplements.isEmpty());
+
             // Set locale to Vietnamese for number formatting
             parameters.put(JRParameter.REPORT_LOCALE, new Locale("vi", "VN"));
 
diff --git a/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/print_forms/ultrasoundresult.jrxml b/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/print_forms/ultrasoundresult.jrxml
index 97d14de..2e6d1c7 100644
--- a/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/print_forms/ultrasoundresult.jrxml
+++ b/src/main/java/BsK/client/ui/component/CheckUpPage/PrintDialog/print_forms/ultrasoundresult.jrxml
@@ -46,112 +46,114 @@
 	<pageHeader splitType="Stretch"/>
 	<columnHeader splitType="Stretch"/>
 	<detail>
-		<band height="527" splitType="Stretch">
+		<band height="540" splitType="Stretch">
 			<element kind="frame" uuid="2b7ec588-953c-4145-87b7-1d861c272fe0" x="0" y="0" width="400" height="525">
 				<element kind="image" uuid="fd80ab38-4cae-409b-84b9-356220d2b1e5" x="0" y="-5" width="70" height="64">
 					<expression><![CDATA[$P{logoImage}]]></expression>
 				</element>
-				<element kind="textField" uuid="eb56d4c8-2a0d-45fa-89a2-ad6528f9a99b" x="70" y="0" width="300" height="20" fontName="Arial" fontSize="14.0" bold="true">
-					<expression><![CDATA["PHÒNG KHÁM " + $P{clinicName}]]></expression>
+				<element kind="textField" uuid="eb56d4c8-2a0d-45fa-89a2-ad6528f9a99b" x="70" y="0" width="267" height="20" fontName="Times New Roman" fontSize="14.0" bold="true">
+					<expression><![CDATA[$P{clinicName}]]></expression>
 				</element>
-				<element kind="staticText" uuid="2677daaf-d0fb-40ad-afaa-513efa16055c" x="70" y="20" width="150" height="15" fontName="Arial" fontSize="8.0" bold="true" hTextAlign="Left">
+				<element kind="staticText" uuid="2677daaf-d0fb-40ad-afaa-513efa16055c" x="70" y="20" width="150" height="15" fontName="Times New Roman" fontSize="10.0" bold="true" hTextAlign="Left">
 					<text><![CDATA[Địa chỉ: ]]></text>
 				</element>
-				<element kind="textField" uuid="796d9ffd-6d2e-4ae3-bdfb-b08183d7d9c0" x="100" y="20" width="270" height="15" fontName="Arial" fontSize="8.0">
+				<element kind="textField" uuid="796d9ffd-6d2e-4ae3-bdfb-b08183d7d9c0" x="106" y="20" width="231" height="15" fontName="Times New Roman" fontSize="10.0">
 					<expression><![CDATA[$P{clinicAddress}]]></expression>
 				</element>
-				<element kind="staticText" uuid="1a1405ee-b3e4-4e98-ac08-6818bc29e902" x="70" y="36" width="150" height="15" fontName="Arial" fontSize="8.0" bold="true" hTextAlign="Left">
+				<element kind="staticText" uuid="1a1405ee-b3e4-4e98-ac08-6818bc29e902" x="70" y="36" width="150" height="15" fontName="Times New Roman" fontSize="10.0" bold="true" hTextAlign="Left">
 					<text><![CDATA[SĐT:]]></text>
 				</element>
-				<element kind="textField" uuid="260bb33d-1d11-4178-aceb-3fbf8fcb4b45" x="100" y="36" width="270" height="15" fontName="Arial" fontSize="8.0">
+				<element kind="textField" uuid="260bb33d-1d11-4178-aceb-3fbf8fcb4b45" x="106" y="36" width="231" height="15" fontName="Times New Roman" fontSize="8.0">
 					<expression><![CDATA[$P{clinicPhone}]]></expression>
 				</element>
 				<element kind="staticText" uuid="6f89a93f-2d10-4506-baa5-226bdd047b17" x="0" y="59" width="100" height="30" forecolor="#FF0905" fontName="Times New Roman" fontSize="15.0" bold="true">
 					<text><![CDATA[I.Thông tin]]></text>
 				</element>
-				<element kind="staticText" uuid="b8dfca43-cf97-49e5-b58d-4667143dba62" x="0" y="79" width="50" height="15" fontName="Arial" fontSize="8.0" bold="true" hTextAlign="Left">
+				<element kind="staticText" uuid="b8dfca43-cf97-49e5-b58d-4667143dba62" x="0" y="79" width="50" height="15" fontName="Times New Roman" fontSize="10.0" bold="true" hTextAlign="Left">
 					<text><![CDATA[Họ và tên:]]></text>
 				</element>
-				<element kind="staticText" uuid="0a9ca0c8-f2bd-4ade-a025-a6d79c13613f" x="1" y="94" width="80" height="15" fontName="Arial" fontSize="8.0" bold="true" hTextAlign="Left">
+				<element kind="staticText" uuid="0a9ca0c8-f2bd-4ade-a025-a6d79c13613f" x="1" y="94" width="80" height="15" fontName="Times New Roman" fontSize="10.0" bold="true" hTextAlign="Left">
 					<text><![CDATA[Ngày sinh:]]></text>
 				</element>
-				<element kind="staticText" uuid="21917ab8-ae07-44c8-ba4e-bc6c4c54b440" x="148" y="94" width="80" height="15" fontName="Arial" fontSize="8.0" bold="true" hTextAlign="Left">
+				<element kind="staticText" uuid="21917ab8-ae07-44c8-ba4e-bc6c4c54b440" x="140" y="94" width="80" height="15" fontName="Times New Roman" fontSize="10.0" bold="true" hTextAlign="Left">
 					<text><![CDATA[Giới tính:]]></text>
 				</element>
-				<element kind="staticText" uuid="bcbb614e-7a4d-48a3-83c2-198e4fb62c5f" x="1" y="109" width="80" height="15" fontName="Arial" fontSize="8.0" bold="true" hTextAlign="Left">
+				<element kind="staticText" uuid="bcbb614e-7a4d-48a3-83c2-198e4fb62c5f" x="1" y="109" width="49" height="15" fontName="Times New Roman" bold="true" hTextAlign="Left">
 					<text><![CDATA[Địa chỉ:]]></text>
 				</element>
-				<element kind="staticText" uuid="45fe4be1-9e21-459b-aeee-2efc8354f372" x="221" y="80" width="50" height="15" fontName="Arial" fontSize="8.0" bold="true" hTextAlign="Left">
+				<element kind="staticText" uuid="45fe4be1-9e21-459b-aeee-2efc8354f372" x="221" y="80" width="50" height="15" fontName="Times New Roman" fontSize="10.0" bold="true" hTextAlign="Left">
 					<text><![CDATA[Bác sĩ:]]></text>
 				</element>
-				<element kind="staticText" uuid="f2ff4b17-63cc-4e8c-a3b0-2523f534f21a" x="221" y="94" width="60" height="15" fontName="Arial" fontSize="8.0" bold="true" hTextAlign="Left">
+				<element kind="staticText" uuid="f2ff4b17-63cc-4e8c-a3b0-2523f534f21a" x="221" y="94" width="60" height="15" fontName="Times New Roman" fontSize="10.0" bold="true" hTextAlign="Left">
 					<text><![CDATA[Ngày khám:]]></text>
 				</element>
-				<element kind="textField" uuid="1511f53a-b282-41b1-b233-612b6106c07a" x="50" y="79" width="180" height="15" fontName="Arial" fontSize="8.0">
+				<element kind="textField" uuid="1511f53a-b282-41b1-b233-612b6106c07a" x="60" y="79" width="161" height="15" fontName="Times New Roman" fontSize="10.0">
 					<expression><![CDATA[$P{patientName}]]></expression>
 				</element>
-				<element kind="textField" uuid="5bdac267-523d-4931-926b-76233ce9b84d" x="50" y="94" width="98" height="15" fontName="Arial" fontSize="8.0">
+				<element kind="textField" uuid="5bdac267-523d-4931-926b-76233ce9b84d" x="60" y="94" width="80" height="15" fontName="Times New Roman" fontSize="10.0">
 					<expression><![CDATA[$P{patientDOB}]]></expression>
 				</element>
-				<element kind="textField" uuid="f4df20b4-920c-491e-882b-6e0733cb4866" x="186" y="94" width="44" height="15" fontName="Arial" fontSize="8.0">
+				<element kind="textField" uuid="f4df20b4-920c-491e-882b-6e0733cb4866" x="184" y="94" width="36" height="15" fontName="Times New Roman" fontSize="10.0">
 					<expression><![CDATA[$P{patientGender}]]></expression>
 				</element>
-				<element kind="textField" uuid="3b8ac40e-85aa-4ab8-8445-64bcddb8b267" x="50" y="110" width="200" height="20" fontName="Arial" fontSize="8.0">
+				<element kind="textField" uuid="3b8ac40e-85aa-4ab8-8445-64bcddb8b267" x="60" y="109" width="200" height="15" fontName="Times New Roman" fontSize="10.0">
 					<expression><![CDATA[$P{patientAddress}]]></expression>
 				</element>
-				<element kind="textField" uuid="db40cdb0-2850-4d66-8430-addc54f90321" x="266" y="80" width="134" height="15" fontName="Arial" fontSize="8.0">
+				<element kind="textField" uuid="db40cdb0-2850-4d66-8430-addc54f90321" x="277" y="80" width="122" height="15" fontName="Times New Roman" fontSize="10.0">
 					<expression><![CDATA[$P{doctorName}]]></expression>
 				</element>
-				<element kind="textField" uuid="eb9cf54a-3b50-43c5-8696-cfc1e21bddfe" x="266" y="94" width="134" height="15" fontName="Arial" fontSize="8.0">
+				<element kind="textField" uuid="eb9cf54a-3b50-43c5-8696-cfc1e21bddfe" x="276" y="94" width="124" height="15" fontName="Times New Roman" fontSize="10.0">
 					<expression><![CDATA[$P{checkupDate}]]></expression>
 				</element>
-				<element kind="staticText" uuid="9f7de81c-4c38-41a2-9fea-a165eff19431" x="1" y="130" width="49" height="15" fontName="Arial" fontSize="8.0" bold="true" hTextAlign="Left">
+				<element kind="staticText" uuid="9f7de81c-4c38-41a2-9fea-a165eff19431" x="1" y="124" width="59" height="16" fontName="Times New Roman" fontSize="10.0" bold="true" hTextAlign="Left">
 					<text><![CDATA[Chuẩn đoán:]]></text>
 				</element>
-				<element kind="textField" uuid="5ae67e13-7a79-437f-bfb8-c720d896720d" x="51" y="130" width="349" height="26" fontName="Arial" fontSize="8.0">
+				<element kind="textField" uuid="5ae67e13-7a79-437f-bfb8-c720d896720d" x="60" y="124" width="340" height="26" fontName="Times New Roman" fontSize="10.0">
 					<expression><![CDATA[$P{patientDiagnos}]]></expression>
 				</element>
-				<element kind="staticText" uuid="b1fa845a-48da-4e45-82b8-8b9d972650f6" x="0" y="156" width="100" height="30" forecolor="#FF0905" fontName="Times New Roman" fontSize="15.0" bold="true">
+				<element kind="staticText" uuid="b1fa845a-48da-4e45-82b8-8b9d972650f6" x="0" y="146" width="100" height="30" forecolor="#FF0905" fontName="Times New Roman" fontSize="15.0" bold="true">
 					<text><![CDATA[II.Nội dung]]></text>
 				</element>
-				<element kind="textField" uuid="6d652a25-b701-45bd-91ba-750842650004" x="0" y="176" width="400" height="348" markup="rtf" fontName="Times New Roman" fontSize="10.0">
+				<element kind="textField" uuid="6d652a25-b701-45bd-91ba-750842650004" x="0" y="164" width="400" height="376" markup="rtf" fontName="Times New Roman" fontSize="10.0">
 					<expression><![CDATA[$P{checkupNote}]]></expression>
 				</element>
 			</element>
-			<element kind="frame" uuid="a72ffc70-007e-43af-a566-b34e6e07b312" x="400" y="0" width="400" height="526">
+			<element kind="frame" uuid="a72ffc70-007e-43af-a566-b34e6e07b312" x="400" y="0" width="400" height="540">
 				<element kind="staticText" uuid="246a04b0-2565-4987-b7f3-dd369703035c" x="0" y="340" width="100" height="30" forecolor="#FF0905" fontName="Times New Roman" fontSize="15.0" bold="true">
 					<text><![CDATA[III.Kết luận]]></text>
 				</element>
 				<element kind="staticText" uuid="c53ef0ab-a702-47fc-9b7c-24307a495b30" x="0" y="430" width="100" height="30" forecolor="#FF0905" fontName="Times New Roman" fontSize="15.0" bold="true">
 					<text><![CDATA[Đề nghị:]]></text>
 				</element>
-				<element kind="staticText" uuid="a38b1187-ddb8-4410-9b52-dc041f894b7b" x="247" y="430" width="96" height="15" fontName="Arial" fontSize="10.0" bold="true" hTextAlign="Center">
+				<element kind="staticText" uuid="a38b1187-ddb8-4410-9b52-dc041f894b7b" x="247" y="442" width="96" height="15" fontName="Times New Roman" fontSize="10.0" bold="true" hTextAlign="Center">
 					<text><![CDATA[Bác sĩ siêu âm]]></text>
 				</element>
-				<element kind="textField" uuid="b548d99d-bedf-4e90-b13b-bdbc763aa974" x="230" y="496" width="132" height="15" fontName="Arial" hTextAlign="Center">
+				<element kind="textField" uuid="b548d99d-bedf-4e90-b13b-bdbc763aa974" x="200" y="516" width="200" height="15" fontName="Times New Roman" fontSize="12.0" bold="true" hTextAlign="Center">
 					<expression><![CDATA[$P{doctorName}]]></expression>
 				</element>
-				<element kind="textField" uuid="8bca58ab-0958-40fe-8e51-2a39a9d379a5" x="200" y="506" width="200" height="19" pattern="MMMMM dd, yyyy" hTextAlign="Center" vTextAlign="Bottom">
+				<element kind="textField" uuid="8bca58ab-0958-40fe-8e51-2a39a9d379a5" x="200" y="521" width="200" height="19" fontName="Times New Roman" pattern="MMMMM dd, yyyy" hTextAlign="Center" vTextAlign="Bottom">
 					<expression><![CDATA[new java.text.SimpleDateFormat("'Đức Hoà, ngày ' dd ' tháng ' MM ' năm ' yyyy", new java.util.Locale("vi", "VN")).format(new java.util.Date())]]></expression>
 				</element>
-				<element kind="staticText" uuid="c062ce0e-80cb-4e67-a5d9-d85e769c6c4e" x="0" y="511" width="110" height="14" forecolor="#FF0905" fontName="Times New Roman" fontSize="10.0" bold="true">
+				<element kind="staticText" uuid="c062ce0e-80cb-4e67-a5d9-d85e769c6c4e" x="0" y="525" width="110" height="14" forecolor="#FF0905" fontName="Times New Roman" fontSize="10.0" bold="true">
 					<text><![CDATA[Tái khám:]]></text>
 				</element>
 				<element kind="textField" uuid="e90ad772-4425-482d-9e75-f2bc66b9084d" x="0" y="358" width="400" height="70" fontName="Times New Roman" fontSize="10.0">
 					<expression><![CDATA[$P{checkupConclusion}]]></expression>
 				</element>
-				<element kind="component" uuid="cb28d811-1328-45dc-9461-cfbb88b7eeae" x="-59" y="12" width="60" height="40">
+				<element kind="component" uuid="cb28d811-1328-45dc-9461-cfbb88b7eeae" x="-63" y="13" width="60" height="40">
+					<printWhenExpression><![CDATA[$P{barcodeNumber} != null && !$P{barcodeNumber}.isEmpty()]]></printWhenExpression>
 					<component kind="barcode4j:Code128">
 						<codeExpression><![CDATA[$P{barcodeNumber}]]></codeExpression>
 					</component>
 				</element>
-				<element kind="staticText" uuid="6a7d5f66-d7cc-481f-9fff-8ece0789b3b4" x="-60" y="2" width="61" height="17" fontName="Arial" fontSize="10.0" bold="false" hTextAlign="Center">
+				<element kind="staticText" uuid="6a7d5f66-d7cc-481f-9fff-8ece0789b3b4" x="-63" y="2" width="61" height="17" fontName="Times New Roman" fontSize="10.0" bold="false" hTextAlign="Center">
+					<printWhenExpression><![CDATA[$P{barcodeNumber} != null && !$P{barcodeNumber}.isEmpty()]]></printWhenExpression>
 					<text><![CDATA[Mã khám bệnh]]></text>
 				</element>
 				<element kind="textField" uuid="d63165c2-19e2-43ad-8a3f-004e00bffdfe" x="0" y="450" width="230" height="55" fontName="Times New Roman" fontSize="10.0">
 					<expression><![CDATA[$P{checkupSuggestion}]]></expression>
 				</element>
-				<element kind="textField" uuid="cece8e5b-67db-4019-b52a-bf73abae535e" x="46" y="514" width="150" height="15" fontName="Times New Roman" fontSize="8.0">
+				<element kind="textField" uuid="cece8e5b-67db-4019-b52a-bf73abae535e" x="48" y="525" width="150" height="15" fontName="Times New Roman" fontSize="10.0">
 					<expression><![CDATA[$P{reCheckupDate}]]></expression>
 				</element>
 				<element kind="frame" uuid="2f301804-acfa-4b6f-9f52-236c04fd1197" x="0" y="0" width="400" height="344">
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 2e11051..44adf6c 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
@@ -31,6 +31,9 @@ import BsK.client.network.handler.ClientHandler;
 import BsK.client.network.handler.ResponseListener;
 import java.io.StringReader;
 import java.util.List;
+import javax.swing.SpinnerModel;
+import javax.swing.SpinnerNumberModel;
+import javax.swing.JColorChooser;
 
 @Slf4j
 public class TemplateDialog extends JDialog {
@@ -348,18 +351,18 @@ public class TemplateDialog extends JDialog {
         contentToolbar.setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3));
         contentToolbar.setBackground(new Color(245, 245, 245));
 
-        // Font size combobox
-        String[] sizes = {"12", "14", "16", "18", "20", "24"};
-        JComboBox<String> sizeComboBox = new JComboBox<>(sizes);
-        sizeComboBox.setSelectedItem("16");
-        sizeComboBox.setFont(new Font("Arial", Font.PLAIN, 12));
-        sizeComboBox.setToolTipText("Cỡ chữ");
-        sizeComboBox.setPreferredSize(new Dimension(60, 25));
-        sizeComboBox.addActionListener(e -> {
-            String size = (String) sizeComboBox.getSelectedItem();
-            if (size != null) {
+        // Font family selector
+        String[] fontFamilies = {"Arial", "Times New Roman", "Verdana", "Courier New", "Tahoma", "Calibri"};
+        JComboBox<String> fontFamilyComboBox = new JComboBox<>(fontFamilies);
+        fontFamilyComboBox.setSelectedItem("Times New Roman");
+        fontFamilyComboBox.setFont(new Font("Arial", Font.PLAIN, 12));
+        fontFamilyComboBox.setToolTipText("Phông chữ");
+        fontFamilyComboBox.setPreferredSize(new Dimension(120, 25));
+        fontFamilyComboBox.addActionListener(e -> {
+            String fontFamily = (String) fontFamilyComboBox.getSelectedItem();
+            if (fontFamily != null) {
                 MutableAttributeSet attr = new SimpleAttributeSet();
-                StyleConstants.setFontSize(attr, Integer.parseInt(size));
+                StyleConstants.setFontFamily(attr, fontFamily);
                 contentRTFField.getStyledDocument().setCharacterAttributes(
                     contentRTFField.getSelectionStart(),
                     contentRTFField.getSelectionEnd() - contentRTFField.getSelectionStart(),
@@ -367,6 +370,22 @@ public class TemplateDialog extends JDialog {
             }
         });
 
+        // Font size spinner
+        SpinnerModel sizeModel = new SpinnerNumberModel(20, 8, 72, 2); // Default 20, min 8, max 72, step 2
+        JSpinner sizeSpinner = new JSpinner(sizeModel);
+        sizeSpinner.setFont(new Font("Arial", Font.PLAIN, 12));
+        sizeSpinner.setToolTipText("Cỡ chữ (Cỡ chữ JasperReport = giá trị / 2)");
+        sizeSpinner.setPreferredSize(new Dimension(60, 25));
+        sizeSpinner.addChangeListener(e -> {
+            int size = (int) sizeSpinner.getValue();
+            MutableAttributeSet attr = new SimpleAttributeSet();
+            StyleConstants.setFontSize(attr, size);
+            contentRTFField.getStyledDocument().setCharacterAttributes(
+                contentRTFField.getSelectionStart(),
+                contentRTFField.getSelectionEnd() - contentRTFField.getSelectionStart(),
+                attr, false);
+        });
+        
         // Style buttons
         JButton boldButton = new JButton(new StyledEditorKit.BoldAction());
         boldButton.setText("B");
@@ -406,7 +425,9 @@ public class TemplateDialog extends JDialog {
 
         // Add components to toolbar with spacing
         contentToolbar.add(Box.createHorizontalStrut(3));
-        contentToolbar.add(sizeComboBox);
+        contentToolbar.add(fontFamilyComboBox);
+        contentToolbar.addSeparator(new Dimension(5, 0));
+        contentToolbar.add(sizeSpinner);
         contentToolbar.addSeparator(new Dimension(8, 0));
         contentToolbar.add(boldButton);
         contentToolbar.addSeparator(new Dimension(3, 0));
diff --git a/src/main/resources/database/BSK.db b/src/main/resources/database/BSK.db
index e4928c297f3d857722726fc6b27c84da26102ec1..e72b6ec256643b4ff0ca5441998be31e127dfc9a 100644
GIT binary patch
delta 1469
zcmaJ=L2MgE6rI^!+q>SK9Z&7lww%~m9MiO^<20MZwNXT9KnX&WAOcb))R2;b!Xb)W
zp@0O9>#d*{)Q~;Qp%;2ULdb?jMp#hg6e0>-C?TSC1FBRc4j|krRS``^n6=Z!&LUR(
z_Dlc0`S1U)*=%+=n;o7D!R7ax2OZ0x^W>3*iO~e?FMg32ZVjsUfT$V(U%?qQul|Ui
zQVkr%pQ=WYbWN(<9>2LT=HrrW=DDNk4xg++_MlJ@q3*8k-gsA%y_&#rBgdyECZ}F~
zerkGrasq!0_RNn(2ObXmr#>cgLW4fG+tNup>qgC&$DW44S_AFHug69Qyl0hf(Jk~9
zqUbf{2-1~*lvdVgMJ8##oa~n&fYKo1IH<Loo%#Lh!R<__?WCE=hfE_sjJmhdE;fs1
zK30ekK~J+B#|~S$7|70l5;FG|WR%*LdSgtw4<)xU)*_<j8--TX*O1vPMAVMnhLk1h
zsm~NQ3xQ)1FM1AN!XK#^RnYhN3|c_*NXI(LDC@|JGHkF#Wi*@?*>ZryhqgD41@82j
zktYs6{^a4I@FRAf<G|9$eLiXD=}-&YKbx`>a$Vt;KE_Lp#*S^@mR>vUtfTe+rNiCg
z0ozzkzBxU2zwHC|?n==xB+z@%&d{L<j0pgMW;z{#fq`(3UDHrKVdn)0eCLBLcX}xT
zQ$bcw#7h8g;NS5Q{tn;3>v#oU!xxL>rSq6xOu(iNP4Kw{b`@fBpc>n`U^PaayQ`7+
z2-Vmo`rqA1Kn9M1XAl@13{D0YgUBE;xEW*yg#j_B44A=F+DH)31+?P+#&t|ymOgYo
zB%UY*u9IhYoQrX)13<{f<HSg5^zP3j&gngL;W8<z)8iTUiw{1uv`Y4t&i+cyar}9Z
zqVb<dFV3lgbzb5hZ6XGV(#<vEr=B&k3+nX3W%3zaTqT6I{zfEv{Th)`hgh?lvE=m7
z6*9!>eO0$crF)lh69_rY$>b8`k5}cztE8XRy>)eGT{k}UCSOxVn}Fe}_EE00ZFkgc
zUuP_#Ka|PeJM640aD(1nBfofZxqWpz8Qj`QPgk`|?}K&hSj^`Y0%64Q0#Nuea8?{g
z)r{if%kJCKD^jO;M_d#Qaf1DrU-G5$I(ZBF-ERZY+PtC4wceg>BBy6HT3IDJrzb79
x89MhDDO#Pjm2Tc4@9_f4gBg12E;)g7Ex2}U+!{%vvn%9JOBpTs?vX$Ee*q|kaybA1

delta 1153
zcmaKqOGs2v7{|}KFYldm&pDn(OC9IsGxIUySV^vo3MV2nvY<toH5CSlxR9XN!1P>%
z=8Z1prWS2vrjmg!HMmkpY9nY=x)Ev-8EFW%P_i?VqQgKJejM)q|Gmz~35SE>aInt-
z2k#f|kq1Fd&)uO=s}FkPuYEyJJ}m(%i2(YEc9Ti^f-I8=JwT!)5@-GnB9s$js4Yhb
z5M$tEL#2wmkbl^bk8!{s*ir4@Sse(dk|4C4?F@Bvo<G{z)!q>*!^qp;R@@k(gP<Hj
zEj^*OURG>r@uf6bH!ZBb+8?0CnYM!vr3R=)@waWQjrMoC2iNI;^yBy!9>pfUp!f1Y
z=MZbyg6i`S1W?<91p#`IQ4_5qh3krgTr+%8hY^Vean7oo#qXjTyJMwHs&jBn;K@l1
zgK+<IhfxtjxL`fhj(O-d>{(Tki=f7(m<PMll$Ds9RJzinWRP>C5?_hsopwLOc52rb
za5t`_b%f$MJWhM?5bnoE=os$i7aP`FT^^M$2WX<>-^Np$k%Sv}TJ|;X-QV2ga%T9o
zf&fNZ*8HLjKVUXFVbyhSrhzsTc2;m-OK&W%_jPW~w3Q8Z*?(<Usal(HEk!JB=vy1R
zBy&2e*aaE17iT(VlN**w^cAp~U2d4y=ntgT%1_ToK3YkJx1Ox_0sw4EtvDAxC=fkB
z6wEO<+?7wKfl3pAF40-~o-WV{nxJ3k2u;M<si)LT_+W0ODydmg@+lz9%cxLRl+-^}
zXzCQRrPPT8bbHAMIRZ!INF14?aI!cmN8{Ky$yl9(IfO$w+18SeWxvF;`aJq>8`YjE
zMe24dZ-yNbP2U95tgZ>>f>5w}zp?>AJOPna{gL?viO&_Z+CQ_$ia9>bWDiD<fG$n}
zWllauy7e4!%63&dr`4#7>aZG7L;T&n5v{2Ob_J5iW<+EFp?El#-Nfe44=iT({brNq
k%rryR{35$2Ci@mbf}`MaDzYAcNS66+fnBt6me~*SFRlOx&j0`b