Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r2a60f0eba906f0641e22a5d7f5c7ba1750911dcd -r9bb9f9bb8b96f057b2ad8dd42c5ac4f0861c1d90
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 2a60f0eba906f0641e22a5d7f5c7ba1750911dcd)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 9bb9f9bb8b96f057b2ad8dd42c5ac4f0861c1d90)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
-* @file ModePostTreat.c
+* @file    ModePostTreat.c
 *
-* @author (last) Sean Nash
-* @date (last) 08-Oct-2020
+* @author  (last)      Quang Nguyen
+* @date    (last)      24-Aug-2021
 *
-* @author (original) Dara Navaei
-* @date (original) 05-Nov-2019
+* @author  (original)  Dara Navaei
+* @date    (original)  05-Nov-2019
 *
 ***************************************************************************/
 
@@ -218,8 +218,13 @@
     treatmentLogData.dialysateVolumeUsed_L = treatmentLogData.avgDialysateFlow_mL_min * treatmentLogData.actualTreatmentDur_sec / ( ML_PER_LITER * SEC_PER_MIN );
     treatmentLogData.avgDialysateTemperature_degC = getTreatmentAvgDialysateTemp();
 
+    // original UF Volume/Rate
+    treatmentLogData.originUFVolume_L = getUltrafiltrationVolumeOriginal();
+    treatmentLogData.originUFRate_mL_min = getUltrafiltrationRateOriginal();
+    // Target UF Volume/Rate
     treatmentLogData.targetUFVolume_L = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME );
-    treatmentLogData.targetUFRate_mL_min = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME ) * ML_PER_LITER * SEC_PER_MIN / treatmentLogData.treatmentDuration_sec;
+    treatmentLogData.targetUFRate_mL_min = treatmentLogData.targetUFVolume_L * ML_PER_LITER * SEC_PER_MIN / treatmentLogData.treatmentDuration_sec;
+    // Actual UF Volume/Rate
     if ( treatmentLogData.actualTreatmentDur_sec > 0 )
     {
         treatmentLogData.actualUFVolume_L = getUltrafiltrationVolumeCollected() / ML_PER_LITER;