From f99f3339420272d21620e1827623f619702baa41 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: Mon, 4 Aug 2025 21:35:17 +0700
Subject: [PATCH] [update] Modify SQL queries in ServerHandler to include
 password retrieval for user data and adjust service deletion flag
 representation. Update ultrasound report orientation from Landscape to
 Portrait for improved printing layout. Update binary database file.

---
 database/BSK.db-wal                           | Bin 358472 -> 412032 bytes
 .../server/network/handler/ServerHandler.java |  11 ++++++-----
 .../ultrasoundresult_potrait.jrxml            |   2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/database/BSK.db-wal b/database/BSK.db-wal
index 60f8df39434916a474ed1006dd58d0bc94b6f650..5379235f9d785aa9f0ebea7aacc5554dceabfce4 100644
GIT binary patch
delta 735
zcmX@{L9}7AWJ3#M3sVbo3(FQ(kBZ3~5(GFZ9)0XLUGVPY_69SSVtz)G$!qun7%iu-
zHD~qa=qOR~m;SpWX8VHgEM9ypPo4f>o!lswyxsCMQ#>QbGD-8Jy8l{sZ(s0*DV2YE
zZ8)nPuO&Al10$z10}~S?ugT<(+A`B~SeRWn`lqZ|eCp(x``Zm7ST_PKnVu!W94AuX
z^=GS<&X32u3=9m6%v%_kw{RVsm?*pbrwDU5v+4{_W+_&nVGO*yf@>WWMH`h_IXF0k
z8)f|&Ie8gpl$Ht@Fq>}w7tFMfb8<mE>vUgb<~7r|7c&b?-(1GJXZqSQRyCf2#3HVk
zoJ@n5v`mBPh2^a2%v)WOrf)pQls{Q(BOgcD?;0=mReR?`{cZ~OyA{aqc9TyR@NyLJ
zPVP|=soR0<Ln|a7nj(B?p4*|ei97!V)Q6@J9~u^$il1>;$%FWCJp=Q4xDVTy)n@o1
z`Oq7O4~@6~4`y0`(~E-0UW@^8u=vyX_2Z?!!9iwFf0}{)X^rqFbMWlq^N(5HBKy-C
z$)9Eje@YoDb!t7n+zIuk8N{DSerjv9v*pww{#?btybA8mMxZ}~k^C8o!=EPj{fQct
U0?kaK(`(9EW5DsrxRx;&07*gVy#N3J

delta 19
acmZpeEP3LCXhREQ3sVbo3(FQ(j|u=zg$E4)

diff --git a/src/main/java/BsK/server/network/handler/ServerHandler.java b/src/main/java/BsK/server/network/handler/ServerHandler.java
index c2dc02b..8575195 100644
--- a/src/main/java/BsK/server/network/handler/ServerHandler.java
+++ b/src/main/java/BsK/server/network/handler/ServerHandler.java
@@ -1750,7 +1750,7 @@ public class ServerHandler extends SimpleChannelInboundHandler<TextWebSocketFram
   private void getAllUser(int sessionId) {
     log.debug("Fetching all users for session: {}", sessionId);
     // SỬA LỖI BẢO MẬT: Đã loại bỏ cột 'password' khỏi câu truy vấn
-    String sql = "SELECT user_id, user_name, last_name, first_name, role_name, deleted FROM User ORDER BY user_id";
+    String sql = "SELECT user_id, user_name, last_name, password, first_name, role_name, deleted FROM User ORDER BY user_id";
     
     // SỬA LỖI QUAN TRỌNG: Sử dụng try-with-resources để quản lý tài nguyên an toàn
     try (Connection conn = DatabaseManager.getConnection();
@@ -1762,13 +1762,14 @@ public class ServerHandler extends SimpleChannelInboundHandler<TextWebSocketFram
         while (rs.next()) {
             String userId = rs.getString("user_id");
             String userName = rs.getString("user_name");
+            String password = rs.getString("password");
             String lastName = rs.getString("last_name");
             String firstName = rs.getString("first_name");
             String role = rs.getString("role_name");
             String deleted = String.valueOf(rs.getBoolean("deleted")); // Lấy giá trị boolean an toàn
 
             // Mật khẩu đã được cố ý loại bỏ khỏi câu truy vấn để bảo mật
-            String result = String.join("|", userId, userName, lastName, firstName, role, deleted);
+            String result = String.join("|", userId, userName, lastName, firstName, password, role, deleted);
             resultList.add(result);
         }
 
@@ -1794,7 +1795,7 @@ public class ServerHandler extends SimpleChannelInboundHandler<TextWebSocketFram
    */
   private void getSerInfo(int sessionId) {
     log.debug("Fetching all services for session: {}", sessionId);
-    String sql = "SELECT service_id, service_name, service_cost, deleted FROM Service ORDER BY service_id";
+    String sql = "SELECT service_id, service_name, service_cost, deleted FROM Service";
 
     // SỬA LỖI QUAN TRỌNG: Sử dụng try-with-resources để quản lý tài nguyên an toàn
     try (Connection conn = DatabaseManager.getConnection();
@@ -1808,7 +1809,7 @@ public class ServerHandler extends SimpleChannelInboundHandler<TextWebSocketFram
             String serName = rs.getString("service_name");
             String serPrice = rs.getString("service_cost");
             // Lấy giá trị boolean một cách an toàn và chuyển thành String
-            String deleted = String.valueOf(rs.getBoolean("deleted")); 
+            String deleted = rs.getBoolean("deleted") ? "1" : "0";
 
             String result = String.join("|", serId, serName, serPrice, deleted);
             resultList.add(result);
@@ -1819,7 +1820,7 @@ public class ServerHandler extends SimpleChannelInboundHandler<TextWebSocketFram
         for (int i = 0; i < resultString.length; i++) {
             resultArray[i] = resultString[i].split("\\|");
         }
-
+        log.debug("service info: {}", resultArray);
         UserUtil.sendPacket(sessionId, new GetSerInfoResponse(resultArray));
 
     } catch (SQLException e) {
diff --git a/src/main/resources/print_forms/ultrasoundresult_potrait.jrxml b/src/main/resources/print_forms/ultrasoundresult_potrait.jrxml
index a83a87a..f8aece4 100644
--- a/src/main/resources/print_forms/ultrasoundresult_potrait.jrxml
+++ b/src/main/resources/print_forms/ultrasoundresult_potrait.jrxml
@@ -1,5 +1,5 @@
 <!-- Created with Jaspersoft Studio version 7.0.3.final using JasperReports Library version 7.0.3-41034ca841d452f3305ba55b9042260aaa1ab5dd  -->
-<jasperReport name="Blank_A4_Potrait" language="java" columnCount="1" pageWidth="595" pageHeight="842" orientation="Landscape" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="e7f9ca7e-f0db-48b0-bef9-93be21b3b0a3">
+<jasperReport name="Blank_A4_Potrait" language="java" columnCount="1" pageWidth="595" pageHeight="842" orientation="Portrait" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="e7f9ca7e-f0db-48b0-bef9-93be21b3b0a3">
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
 	<parameter name="checkupNote" class="java.lang.String"/>
 	<parameter name="checkupDate" class="java.lang.String"/>