From 8c7e48201a4347d50ecbd8d1b2f3589a0a3e9bc4 Mon Sep 17 00:00:00 2001
From: isol2011 <soi2011@naver.com>
Date: Mon, 18 Jul 2022 11:54:48 +0900
Subject: [PATCH] =?UTF-8?q?[=EC=88=98=EC=A0=95]=20=EC=98=81=EC=96=91?=
 =?UTF-8?q?=EC=A0=90=EC=88=98=20=EC=97=90=EB=84=88=EC=A7=80=20=EC=8B=A0?=
 =?UTF-8?q?=ED=98=B8=EB=93=B1=20=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20=EB=A1=9C?=
 =?UTF-8?q?=EC=A7=81=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logic/NutrientScoreCalculation.java        | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/backoffice/logic/NutrientScoreCalculation.java b/src/main/java/com/backoffice/logic/NutrientScoreCalculation.java
index 810f2d5..6d26139 100644
--- a/src/main/java/com/backoffice/logic/NutrientScoreCalculation.java
+++ b/src/main/java/com/backoffice/logic/NutrientScoreCalculation.java
@@ -753,7 +753,21 @@ public class NutrientScoreCalculation {
 		totalAvg = Math.round(totalAvg/3);
 		return (long)totalAvg;
 	}
-	
+
+	private String getLightEnerc(double x, double crtr) {
+		double from = crtr - crtr/100*15;
+		double to = crtr + crtr/100*15;
+
+		if(x<from)
+			return Lights.yellow.name();
+		else if(from<=x && x<=to)
+			return Lights.green.name();
+		else if(x>to)
+			return Lights.red.name();
+		else
+			return "";
+	}
+
 	private String getLight(double x, double from, double to) {
 		if(x<from)
 			return Lights.yellow.name();
@@ -797,7 +811,7 @@ public class NutrientScoreCalculation {
 			result.put("vitamine", null);
 			result.put("zn", null);
 		}else {
-			result.put("enerc", getLight(enerc, ARR_INTAKE_FROM[enerc_idx][label], ARR_INTAKE_TO[enerc_idx][label]));
+			result.put("enerc", getLightEnerc(enerc, ARR_INTAKE_FROM[enerc_idx][label]));
 			result.put("chotdf", getLight(chotdf, ARR_INTAKE_FROM[chotdf_idx][label], ARR_INTAKE_TO[chotdf_idx][label]));
 			result.put("procnp", getLight(procnp, ARR_INTAKE_FROM[procnp_idx][label], ARR_INTAKE_TO[procnp_idx][label]));
 			result.put("fat", getLight(fat, ARR_INTAKE_FROM[fat_idx][label], ARR_INTAKE_TO[fat_idx][label]));