diff --git a/running/pdf/healthyReport.pdf b/running/pdf/healthyReport.pdf index bd2295f14..c453e40d5 100644 Binary files a/running/pdf/healthyReport.pdf and b/running/pdf/healthyReport.pdf differ diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/utils/NutritionalUtils.java b/stdiet-custom/src/main/java/com/stdiet/custom/utils/NutritionalUtils.java index b253bcf45..25ece5aaf 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/utils/NutritionalUtils.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/utils/NutritionalUtils.java @@ -1,6 +1,7 @@ package com.stdiet.custom.utils; import com.stdiet.common.utils.HealthyUtils; +import com.stdiet.common.utils.NumberUtils; import com.stdiet.custom.domain.SysCustomerHealthy; import com.stdiet.custom.dto.response.NutritionalCalories; @@ -19,7 +20,7 @@ public class NutritionalUtils { nutritionalCalories.setTall(sysCustomerHealthy.getTall()); nutritionalCalories.setWeight(sysCustomerHealthy.getWeight().doubleValue()); nutritionalCalories.setStandardWeight(HealthyUtils.calculateStandardWeight(nutritionalCalories.getTall())); - double overHeight = nutritionalCalories.getWeight() - nutritionalCalories.getStandardWeight(); + double overHeight = NumberUtils.getNumberByRoundHalfUp(nutritionalCalories.getWeight() - nutritionalCalories.getStandardWeight(),1).doubleValue(); overHeight = overHeight > 0 ? overHeight : 0; nutritionalCalories.setOverWeight(overHeight); nutritionalCalories.setMetabolizeHeat(HealthyUtils.calculateMetabolizeHeat(nutritionalCalories.getAge(), nutritionalCalories.getTall(), nutritionalCalories.getWeight()).intValue()); diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml index e2c08582a..6cd8b80df 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml @@ -69,6 +69,28 @@ LEFT JOIN (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'conditioning_project') AS cp ON cp.dict_value = o.conditioning_project_id + + + + + ( + + + order_type = #{type} + + + order_count_type = #{type} + + + order_money_type = #{type} + + + ) + + + + +