diff --git a/src/main/java/com/backoffice/logic/NutrientScoreCalculation.java b/src/main/java/com/backoffice/logic/NutrientScoreCalculation.java index aa6b561..a482b41 100644 --- a/src/main/java/com/backoffice/logic/NutrientScoreCalculation.java +++ b/src/main/java/com/backoffice/logic/NutrientScoreCalculation.java @@ -122,13 +122,13 @@ public class NutrientScoreCalculation { public static void main(String[] args) { DataMap data = new DataMap(); - data.put("month", 24); + data.put("month", 11); data.put("enerc", 855.44); data.put("chotdf", 110.99); data.put("procnp", 27.25); data.put("fat", 32.7); data.put("sugar", 53.8); - data.put("fibtg", 0.68); + data.put("fibtg", 40.68); data.put("na", 227.31); data.put("vitaminb1", 0.45); data.put("vitaminb2", 1.18); @@ -398,8 +398,8 @@ public class NutrientScoreCalculation { * @return */ private double getFibtgValue(double x, double from, double to) { - // 12개월 미만 아이에게는 식이섬유 판정 없음 - if(this.label<3) return 0; + // 12개월 미만 아이에게는 식이섬유 판정 없음 + if(this.label<2) return 0; double result = 0; if(from*0.5>x) @@ -412,7 +412,6 @@ public class NutrientScoreCalculation { result = -100/(to*1.5-to)*x + 100/(to*1.5-to)*to*1.5; else if(to*1.5 -
+