Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp
===================================================================
diff -u -r1c18f738693756ca1f0342c2cc158e32bc28f90b -r7b34653589ba6e4f4705fb4026fcd9319c41c352
--- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp	(.../MPostTreatmentAdjustTreatmentLogResponse.cpp)	(revision 1c18f738693756ca1f0342c2cc158e32bc28f90b)
+++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp	(.../MPostTreatmentAdjustTreatmentLogResponse.cpp)	(revision 7b34653589ba6e4f4705fb4026fcd9319c41c352)
@@ -65,37 +65,40 @@
     int index = 0; // message data start position
     if (GetValue(vByteArray, index, _data.mAccepted                     ))
     if (GetValue(vByteArray, index, _data.mReason                       ))
-    if (GetValue(vByteArray, index, _data.mBloodFlowRate                ))
-    if (GetValue(vByteArray, index, _data.mDialysateFlowRate            ))
-    if (GetValue(vByteArray, index, _data.mTreatmentDuration            ))
-    if (GetValue(vByteArray, index, _data.mActualTreatmentDuration      ))
-    if (GetValue(vByteArray, index, _data.mAcidConcentrateType          ))
-    if (GetValue(vByteArray, index, _data.mBicarbonateConcentrateType   ))
-    if (GetValue(vByteArray, index, _data.mPotassiumConcentration       ))
-    if (GetValue(vByteArray, index, _data.mCalciumConcentration         ))
-    if (GetValue(vByteArray, index, _data.mBicarbonateConcentration     ))
-    if (GetValue(vByteArray, index, _data.mSodiumConcentration          ))
-    if (GetValue(vByteArray, index, _data.mDialysateTemperature         ))
-    if (GetValue(vByteArray, index, _data.mDialyzerType                 ))
-    if (GetValue(vByteArray, index, _data.mTreatmentStartEpoch          ))
-    if (GetValue(vByteArray, index, _data.mTreatmentEndEpoch            ))
-    if (GetValue(vByteArray, index, _data.mAverageBloodFlow             ))
-    if (GetValue(vByteArray, index, _data.mAverageDialysateFlow         ))
-    if (GetValue(vByteArray, index, _data.mDialysateVolumeUsed          ))
-    if (GetValue(vByteArray, index, _data.mAverageDialysateTemp         ))
-    if (GetValue(vByteArray, index, _data.mTargetUFVolume               ))
-    if (GetValue(vByteArray, index, _data.mActualUFVolume               ))
-    if (GetValue(vByteArray, index, _data.mTargetUFRate                 ))
-    if (GetValue(vByteArray, index, _data.mActualUFRate                 ))
-    if (GetValue(vByteArray, index, _data.mSalineBolusVolume            ))
-    if (GetValue(vByteArray, index, _data.mHeparinBolusVolume           ))
-    if (GetValue(vByteArray, index, _data.mHeparinDispenseRate          ))
-    if (GetValue(vByteArray, index, _data.mHeparinStop                  ))
-    if (GetValue(vByteArray, index, _data.mHeparinDeliveredVolume       ))
-    if (GetValue(vByteArray, index, _data.mAverageArterialPressure      ))
-    if (GetValue(vByteArray, index, _data.mAverageVenousPressure        ))
-    if (GetValue(vByteArray, index, _data.mDeviceID                     ))
-    if (GetValue(vByteArray, index, _data.mWaterSampleTestResult        ))
+    if (GetValue(vByteArray, index, _data.mBloodFlowRate                )) // U32 bloodFlowRate_mL_min;                   ///< Blood flow rate (in mL/min)
+    if (GetValue(vByteArray, index, _data.mDialysateFlowRate            )) // U32 dialysateFlowRate_mL_min;               ///< Dialysate flow rate (in mL/min)
+    if (GetValue(vByteArray, index, _data.mTreatmentDuration            )) // U32 treatmentDuration_sec;                  ///< Selected treatment duration (in sec)
+    if (GetValue(vByteArray, index, _data.mActualTreatmentDuration      )) // U32 actualTreatmentDur_sec;                 ///< Actual treatment duration (in sec)
+    if (GetValue(vByteArray, index, _data.mAcidConcentrateType          )) // U32 acidConcentrate;                        ///< Acid concentrate option
+    if (GetValue(vByteArray, index, _data.mBicarbonateConcentrateType   )) // U32 bicarbConcentrate;                      ///< Bicarbonate concentrate option
+    if (GetValue(vByteArray, index, _data.mPotassiumConcentration       )) // U32 potassiumConcentration;                 ///< Potassium concentration value in mEq/L.
+    if (GetValue(vByteArray, index, _data.mCalciumConcentration         )) // U32 calciumConcentration;                   ///< Calcium concentration value in mEq/L.
+    if (GetValue(vByteArray, index, _data.mBicarbonateConcentration     )) // U32 bicarbonateConcentration;               ///< Bicarbonate concentration value in mEq/L.
+    if (GetValue(vByteArray, index, _data.mSodiumConcentration          )) // U32 sodiumConcentration;                    ///< Sodium concentration value in mEq/L.
+    if (GetValue(vByteArray, index, _data.mDialysateTemperature         )) // F32 dialysateTemperature_degC;              ///< Dialysate temperature (in deg C)
+    if (GetValue(vByteArray, index, _data.mDialyzerType                 )) // U32 dialyzerType;                           ///< Dialyzer type option
+    if (GetValue(vByteArray, index, _data.mTreatmentStartEpoch          )) // U32 treatmentStartDateAndTime;              ///< Treatment start date and time in epoch time (in seconds)
+    if (GetValue(vByteArray, index, _data.mTreatmentEndEpoch            )) // U32 treatmentEndDateAndTime;                ///< Treatment end date and time in epoch time (in seconds)
+    if (GetValue(vByteArray, index, _data.mAverageBloodFlow             )) // F32 avgBloodFlow_mL_min;                    ///< Average blood flow rate during treatment (in mL/min)
+    if (GetValue(vByteArray, index, _data.mAverageDialysateFlow         )) // F32 avgDialysateFlow_mL_min;                ///< Average dialysate flow rate during treatment (in mL/min)
+    if (GetValue(vByteArray, index, _data.mDialysateVolumeUsed          )) // F32 dialysateVolumeUsed_L;                  ///< Dialysate volume used during treatment (in L)
+    if (GetValue(vByteArray, index, _data.mAverageDialysateTemp         )) // F32 avgDialysateTemperature_degC;           ///< Average dialysate temperature (in deg C)
+    if (GetValue(vByteArray, index, _data.mOriginUFVolume               )) // F32 originUFVolume_L;                       ///< Origin ultrafiltration volume (in L)
+    if (GetValue(vByteArray, index, _data.mTargetUFVolume               )) // F32 targetUFVolume_L;                       ///< Target ultrafiltration volume (in L)
+    if (GetValue(vByteArray, index, _data.mActualUFVolume               )) // F32 actualUFVolume_L;                       ///< Actual ultrafiltration volume (in L)
+    if (GetValue(vByteArray, index, _data.mOriginUFRate                 )) // F32 originUFRate_mL_min;                    ///< Origin ultrafiltration rate (in mL/min)
+    if (GetValue(vByteArray, index, _data.mTargetUFRate                 )) // F32 targetUFRate_mL_min;                    ///< Target ultrafiltration rate (in mL/min)
+    if (GetValue(vByteArray, index, _data.mActualUFRate                 )) // F32 actualUFRate_mL_min;                    ///< Actual ultrafiltration rate (in mL/min)
+    if (GetValue(vByteArray, index, _data.mSalineBolusVolume            )) // U32 salineBolusVolume_mL;                   ///< Saline bolus volume (in mL)
+    if (GetValue(vByteArray, index, _data.mHeparinBolusVolume           )) // F32 heparinBolusVolume_mL;                  ///< Heparin bolus volume (in mL)
+    if (GetValue(vByteArray, index, _data.mHeparinDispenseRate          )) // F32 heparinDispenseRate_mL_hr;              ///< Heparin dispense rate (in mL/hr)
+    if (GetValue(vByteArray, index, _data.mHeparinStop                  )) // U32 heparinPreStop_min;                     ///< Heparin pre-stop time (in min)
+    if (GetValue(vByteArray, index, _data.mHeparinDeliveredVolume       )) // F32 heparinDeliveredVolume_mL;              ///< Heparin delivered volume (in mL)
+    if (GetValue(vByteArray, index, _data.mHeparinType                  )) // U32 heparinType;                            ///< Heparin type option
+    if (GetValue(vByteArray, index, _data.mAverageArterialPressure      )) // F32 avgArterialPressure_mmHg;               ///< Average arterial pressure (in mmHg)
+    if (GetValue(vByteArray, index, _data.mAverageVenousPressure        )) // F32 avgVenousPressure_mmHg;                 ///< Average venous pressure (in mmHg)
+    if (GetValue(vByteArray, index, _data.mDeviceID                     )) // U32 deviceID;                               ///< Serial number or UID
+    if (GetValue(vByteArray, index, _data.mWaterSampleTestResult        )) // U32 waterSampleTestResult;                  ///< Pass or fail
          return true ;
     else { if(vIndex) *vIndex = index; return false; }
     else { if(vIndex) *vIndex = index; return false; }
@@ -130,6 +133,9 @@
     else { if(vIndex) *vIndex = index; return false; }
     else { if(vIndex) *vIndex = index; return false; }
     else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
 }
 
 /*!
@@ -160,21 +166,23 @@
     data.mAverageDialysateFlow          = _data.mAverageDialysateFlow       .value;
     data.mDialysateVolumeUsed           = _data.mDialysateVolumeUsed        .value;
     data.mAverageDialysateTemp          = _data.mAverageDialysateTemp       .value;
+    data.mOriginUFVolume                = _data.mOriginUFVolume             .value;
     data.mTargetUFVolume                = _data.mTargetUFVolume             .value;
     data.mActualUFVolume                = _data.mActualUFVolume             .value;
+    data.mOriginUFRate                  = _data.mOriginUFRate               .value;
     data.mTargetUFRate                  = _data.mTargetUFRate               .value;
     data.mActualUFRate                  = _data.mActualUFRate               .value;
     data.mSalineBolusVolume             = _data.mSalineBolusVolume          .value;
     data.mHeparinBolusVolume            = _data.mHeparinBolusVolume         .value;
     data.mHeparinDispenseRate           = _data.mHeparinDispenseRate        .value;
     data.mHeparinStop                   = _data.mHeparinStop                .value;
     data.mHeparinDeliveredVolume        = _data.mHeparinDeliveredVolume     .value;
+    data.mHeparinType                   = _data.mHeparinType                .value;
     data.mAverageArterialPressure       = _data.mAverageArterialPressure    .value;
     data.mAverageVenousPressure         = _data.mAverageVenousPressure      .value;
     data.mDeviceID                      = _data.mDeviceID                   .value;
     data.mWaterSampleTestResult         = _data.mWaterSampleTestResult      .value;
 
-    data.mHeparinType                   = _data.mHeparinType                .value;
     data.mHeparinConcentration          = _data.mHeparinConcentration       .value;
 
     return data;