From 9024d62cc46ddcc95c9df20ec633d867003daf3d 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: Sat, 12 Jul 2025 00:28:28 +0700
Subject: [PATCH] [fix]: changed height and weight to be associated with
 checkup not customer so that we can track it in history

---
 .../server/network/handler/ServerHandler.java |  25 +++++++++---------
 src/main/resources/database/BSK.db            | Bin 1187840 -> 1196032 bytes
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/main/java/BsK/server/network/handler/ServerHandler.java b/src/main/java/BsK/server/network/handler/ServerHandler.java
index 1818139..bbc065c 100644
--- a/src/main/java/BsK/server/network/handler/ServerHandler.java
+++ b/src/main/java/BsK/server/network/handler/ServerHandler.java
@@ -110,7 +110,7 @@ public class ServerHandler extends SimpleChannelInboundHandler<TextWebSocketFram
           ResultSet rs = statement.executeQuery(
                   "select a.checkup_id, a.checkup_date, c.customer_last_name, c.customer_first_name,\n" +
                           "d.doctor_first_name, d.doctor_last_name, a.suggestion, a.diagnosis, a.notes, a.status, a.customer_id, \n" +
-                          "c.customer_number, c.customer_address, c.customer_weight, c.customer_height, c.customer_gender, c.customer_dob, a.checkup_type, a.conclusion, a.reCheckupDate, c.cccd_ddcn\n" +
+                          "c.customer_number, c.customer_address, a.customer_weight, a.customer_height, c.customer_gender, c.customer_dob, a.checkup_type, a.conclusion, a.reCheckupDate, c.cccd_ddcn\n" +
                           "from checkup as a\n" +
                           "join customer as c on a.customer_id = c.customer_id\n" +
                           "join Doctor D on a.doctor_id = D.doctor_id\n" +
@@ -178,7 +178,7 @@ public class ServerHandler extends SimpleChannelInboundHandler<TextWebSocketFram
           ResultSet rs = statement.executeQuery(
                   "select a.checkup_id, a.checkup_date, c.customer_last_name, c.customer_first_name,\n" +
                           "d.doctor_first_name, d.doctor_last_name, a.suggestion, a.diagnosis, a.notes, a.status, a.customer_id, \n" +
-                          "c.customer_number, c.customer_address, c.customer_weight, c.customer_height, c.customer_gender, c.customer_dob, a.checkup_type, a.conclusion, a.reCheckupDate, c.cccd_ddcn\n" +
+                          "c.customer_number, c.customer_address, a.customer_weight, a.customer_height, c.customer_gender, c.customer_dob, a.checkup_type, a.conclusion, a.reCheckupDate, c.cccd_ddcn\n" +
                           "from checkup as a\n" +
                           "join customer as c on a.customer_id = c.customer_id\n" +
                           "join Doctor D on a.doctor_id = D.doctor_id\n" +
@@ -725,9 +725,8 @@ public class ServerHandler extends SimpleChannelInboundHandler<TextWebSocketFram
           String customerSql = """
             INSERT INTO Customer (
                 customer_id, customer_first_name, customer_last_name, customer_dob,
-                customer_gender, customer_address, customer_number,
-                customer_weight, customer_height, cccd_ddcn
-            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                customer_gender, customer_address, customer_number, cccd_ddcn
+            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
             ON CONFLICT(customer_id) DO UPDATE SET
                 customer_first_name = excluded.customer_first_name,
                 customer_last_name = excluded.customer_last_name,
@@ -735,8 +734,6 @@ public class ServerHandler extends SimpleChannelInboundHandler<TextWebSocketFram
                 customer_gender = excluded.customer_gender,
                 customer_address = excluded.customer_address,
                 customer_number = excluded.customer_number,
-                customer_weight = excluded.customer_weight,
-                customer_height = excluded.customer_height,
                 cccd_ddcn = excluded.cccd_ddcn
             """;
           
@@ -748,9 +745,7 @@ public class ServerHandler extends SimpleChannelInboundHandler<TextWebSocketFram
           customerStmt.setString(5, saveCheckupRequest.getCustomerGender());
           customerStmt.setString(6, saveCheckupRequest.getCustomerAddress());
           customerStmt.setString(7, saveCheckupRequest.getCustomerNumber());
-          customerStmt.setDouble(8, saveCheckupRequest.getCustomerWeight());
-          customerStmt.setDouble(9, saveCheckupRequest.getCustomerHeight());
-          customerStmt.setString(10, saveCheckupRequest.getCustomerCccdDdcn());
+          customerStmt.setString(8, saveCheckupRequest.getCustomerCccdDdcn());
           customerStmt.executeUpdate();
           log.info("Customer saved successfully");
           // 2. Generate prescription_id if we have medicine prescriptions
@@ -773,8 +768,8 @@ public class ServerHandler extends SimpleChannelInboundHandler<TextWebSocketFram
           String checkupSql = """
             INSERT INTO Checkup (
                 checkup_id, customer_id, doctor_id, checkup_date,
-                suggestion, diagnosis, prescription_id, notes, status, checkup_type, conclusion, reCheckupDate
-            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                suggestion, diagnosis, prescription_id, notes, status, checkup_type, conclusion, reCheckupDate, customer_weight, customer_height
+            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
             ON CONFLICT(checkup_id) DO UPDATE SET
                 suggestion = excluded.suggestion,
                 diagnosis = excluded.diagnosis,
@@ -783,7 +778,9 @@ public class ServerHandler extends SimpleChannelInboundHandler<TextWebSocketFram
                 status = excluded.status,
                 checkup_type = excluded.checkup_type,
                 conclusion = excluded.conclusion,
-                reCheckupDate = excluded.reCheckupDate
+                reCheckupDate = excluded.reCheckupDate,
+                customer_weight = excluded.customer_weight,
+                customer_height = excluded.customer_height
             """;
           
           PreparedStatement checkupStmt = conn.prepareStatement(checkupSql);
@@ -799,6 +796,8 @@ public class ServerHandler extends SimpleChannelInboundHandler<TextWebSocketFram
           checkupStmt.setString(10, saveCheckupRequest.getCheckupType());
           checkupStmt.setString(11, saveCheckupRequest.getConclusion());
           checkupStmt.setLong(12, saveCheckupRequest.getReCheckupDate());
+          checkupStmt.setDouble(13, saveCheckupRequest.getCustomerWeight());
+          checkupStmt.setDouble(14, saveCheckupRequest.getCustomerHeight());
           checkupStmt.executeUpdate();
           log.info("Prescription ID generated or edited: {}", prescriptionId);
           log.info("Checkup saved successfully");
diff --git a/src/main/resources/database/BSK.db b/src/main/resources/database/BSK.db
index d30d4966bcb870f52b10c16e2c2236602250a8e3..de9fbbe0021df63cdd2586330b42749d8a62e1ac 100644
GIT binary patch
delta 2897
zcmeHJeQZ-z6u<Aiy|%CG>+5~5uU%WawhT7rC@Y&dA`so$&LKEJh8T6WrF}BPzEZlN
zMjf;hjD`eqV_q<r;Gd!qbdiP-42eoW3_(6rh=hFwSO8t4hz6YA+b@`4O#H*Yc*(DM
zr@wQ4_uO+%?tL2$wrtq2XsZKW1b~{3Q2_v8FuvS2tDd^}argrle@IY;T|!dWC!7$v
z24Q%mAWM}@4dw4!m+0wI;-T1@P@=0>gOauL0y7u~<?m3UYx{bwdV#S~fu3lhCthNx
zWSqqajgDhvYUMg5PL?tk0`fxE!O2>BnVH9whTj8(H-(wTL&k{F$nP11z8$>qtcC}&
z!~zdk1?qW#c<0jc<tz_eHW&V{0@TZ(tz&rqTke*gNVC!v=~U2|bFMvF!UKoQN}lSu
zpkB(m1X_pp??w&fi|t{C&>rZic7b|lp7v+ymz^#4FrBACm8VEIW$9*DOId>AflXqe
zrwY@q8BczZ>UKA_M!L{f<<EVxwPcxD$7~0}N5*#kVClH_b8R!bpV>ZGHgrW`IQG|+
zc4D)3g2JFN7>p7O7DI!f#n54J7<!CS3<Cy_VZ;#9+6hz1kmM3>lp=kUdq_81bAydC
z<MfKR!$KIjeNC2>$$%@yQA|4kuk)nK0O)jT`*HZby7f9dWl2e;*ny&$<uV-T_t@l|
zL*_J`liqm^E~Di2dZNHF-rE)SUWYNtl9IVx@FJP0=Y!Kb$6$(*eYzaCUWO@H;MCyv
zFrXg31kYHKoHi%C3V@Whm|Eu<I9rWefQK!~N)2(K80B__^xknOQI@2a&B^!4;Ff&)
z+sn{SiAkx1kR0=HAyVBq3T>+C2PmrVT!d%Sy`#{DMQZ7sh}R2K{^I6uo`W^2@FUDv
zk~AgNlN2gygp`(yX109rJiL0J+dyoN+XReJ!$|1?{d@YDzKR>?c5$21_958G&6{Qw
zJva^QCICPxi)&x!tDEcfJ?NcNr)g*kwze#^5FZLuI0c^1b_n-p#|c<tULa=~vNm5_
zS~v--<p<`Q3lxqax}>RuGS8Rp!Yuq9-Y?rs5?P1|dGS`VF*qpQ@eS1ALQE5Kg@}-9
z77MZQB)p<7y#%3p>@<|**Ni!*hTA70efej&7LS6R$0V-Q3K_o67Ztuc1$U7_J4zHp
zH_6oi_5tG!{s`D-7%WZcpXOS14o!;Xn03?;g1+sR<a8z{Re_W7<H=zu3U7}(2frrC
zu<A2oP*B5Tu(ph*?+tiv`u{fI@_(J|pWwu&l*pKjEOP)D%MH`Ge)c!!06u}2(*2vQ
zk7}*e)%2D%iOA|sC4b=O&+n-gRqlTx*w_|yw>35`3A(3}`k8t+exkVxBNU4y6k->i
zf*n(ykMwmW+|j;xT<K1Pkne(3Jz^6pk#lmoI%*fo(A9~C?2Ak99$4I>wGK4npPCx#
z4L`|nU>>%dPHds$yi9S(J-i#u8L2}ZBYV)~B{zEaa+NL`jfG;dXg4~Zk<p(S7QHy?
z(QhunJ9RkdE$wLAA5GePX2^QM_YVo+Ow8!RNe`QKRX?+fR`hDdq()t$gl<j>=wwDj
zL%*01eN9A1GbZ%P6`j}?e5#H37dBc|h0bRzkL6c$-$~D!Qn$oQy;JITr@wm4DOwi%
zn_j%o$-vY`5EC67wp)lmAn0H8c;k{{uD;o5V%QP5E0s^P@S)J5MB<6iY9*4$X7WOJ
zLRq84Zz-WiM$G8!H3zM)PWRiyjhgb@@dW7H*9oBS-EQQB|G#cGd<NKX2kw5g;gjIr
L&4#a|sW;nSg$KB+

delta 1499
zcmZuxYfKzf6ux)v?#|5a%-lV*Y?kHWvaDDsQrK*3DSsM5ZELKSS`{@ypgaW2OCF&Z
z5O!B=V$#^gA2;!b{^}oWOe#$_zG7n$>#y2k8oS!Cm8ST>7L$f(G}bdarL56OzRB)A
z_nz;3=YD6VrXHO-yZ3k@qzR#=gb)=$5ucoRC`Qw#Tiy%lm-svv{6jv&6MTFYTH3iQ
z7-2h<`nM8QHM>Hrkk)r~v>hH92)H>5(p~*+!~KH}&BKam{m9U8e{aX2OHrAhK0VYi
z$S`-FdiTIn9lZlRt-~F&e^*Hj`54JQo}2s~<ATww-`2aeTiWm}RA2UpSGf7Qc_c1z
z5)PLKB$<W-Wi(bSMl`eA9Enp-LWPz7jrHF&vokLi8;ui;6j$X$Uee93(&`wmB|H+?
zWTzsuYmyWE8_Z@PR_5!v`5g4V%1N2Ei>?#yH_T?=j_of_Se1nByxIMq8RoOThoh*W
zJ>-koC$fQK+&l;^<5&k+%W61~T`uS5fe(&58uC<ZIDg-0($9K+qC`F??{<DXo1a<X
z%*~!m%Bx4^Rf>=h4B<dH5iW#`P!KA@jqo5egpM!}JSDGs9hprf{7=u%?m6|O+N5li
z%Ux^E4B6+HX9Kj6)i5G`DIJsgq`nh%1*v@*C}g5)2~<b~x#1*~vQ|Gy%8{U7Ec^m1
zqU;Lz#k=2wo1@lRE503nL<kYTuRuxB-0`|6_LMxf_gwt(L_o&`DrE=#kc2QM7`q8G
zV*gdB6Z~7y#Mdj}^ZGnC%K_Y!W$C^IQ5qE&zk@S5WKp+{xl~qpm+a001bHr*q8g%d
z8McY@*J0cuiOC~9)i1PlM#bV~DApfPY@ShzN5p@GJyLY5XuSdFvud>6vQ5y41fu!|
zME@nF$Yo3ESg*3-3e-x`ZTAv*yb-5OFtXmRu{5mRQ{d5=!-}hHr=KS##K1CarZwX9
zHJHh*vxvu!Fq<l3<q3<ImmwhDUV@aETY-?*lx&vDO6;k1DT`O3LW)MMOtWHV8t#Yq
z1T|t--y;<~DeEW)7U9>TkgCh&L}mRr6Z!({mk)WqP*1u_l_AHQse%mjsN%u`D54<^
zKEL}b;z)#ZL|a@b6z!viwo3lW-fOl(OG&<6;JP(D-UoAfkv)mMD8MNtWNG7Mj<$ex
zRRf8{<{WkP=$I6$E296W=nkxgoX-%ArHSj7v)LHb@>tq^TkTZ0C~L~6N>XXZPsc|L
z5@UwlF|_Hljy_GHPY=_edx9vIy_3d<0biT6IMIM{>K$}j*N`=weGDDfPDS4j@JDt&
zQjOOjKtVr6M*lM<oscNb86L~~DI6Y7A?e?kiD}(h$C)@v9oU(9(U5`9jig7j@4v~a
zS3IAAQ)2QWd~?Qhc->5$B*uMOsXB?`npNL)>=8LIy#-$t71A3p+<K@dH5oMHu73de
Cf_+H<