[수정]영양로직 일부 수정

src/main/java/com/backoffice/logic/FoodScoreCalculation.java

@@ -12,7 +12,7 @@ import com.renastudio.creative.web.util.RenaStringUtil;
 public class FoodScoreCalculation {
 	
 	// 나이 라벨링
-	private int label; 
+	private int label;
 	
 	private DataMap scoreMap;
 	
@@ -69,15 +69,15 @@ public class FoodScoreCalculation {
 	
 	public static void main(String[] args) {
 		DataMap food = new DataMap();
-		food.put("month",6);
+		food.put("month",11);
 		food.put("dqi_food_1",0); //모유 계산 X
 		food.put("dqi_food_2",0); //분유 + 유제품
 		food.put("dqi_food_3",0); // 2번과 더해져 계산
 		food.put("dqi_food_4",0); //통곡물
-		food.put("dqi_food_5",28.57); //정제된 곡물
-		food.put("dqi_food_6",9.52); //단백질
-		food.put("dqi_food_7",9.52); //채소류
-		food.put("dqi_food_8",9.52); //과일류
+		food.put("dqi_food_5",29); //정제된 곡물
+		food.put("dqi_food_6",10); //단백질
+		food.put("dqi_food_7",10); //채소류
+		food.put("dqi_food_8",10); //과일류
 		food.put("dqi_food_9",0); //100%과일주스
 		food.put("dqi_food_10",0); //당함유 음료
 		food.put("dqi_food_11",0); //당첨가 제품
@@ -491,7 +491,7 @@ public class FoodScoreCalculation {
 		}else
 			return 0;
 	}
-	
+
 	public DataMap getIntakeComparedToTheRecommendedAmount() {
 		DataMap result = new DataMap();
 		if(label < 1) {
@@ -519,7 +519,12 @@ public class FoodScoreCalculation {
 		}
 		return result;
 	}
-	
+
+	/*
+		긍정 식품군 섭취량 취합 함수
+		label이 0이면 (모유, 분유) 총점 15점
+		label이 0이 아니면 (모유, 분유) 총점
+	 */
 	private double gethealthyFood() {
 		if (label == 0) {
 			// (1모유, 2분유)
@@ -527,8 +532,9 @@ public class FoodScoreCalculation {
 			return t/15*100;
 		} else {
 			// (1모유, 2분유), 4통곡물, 6단백질식품, 7채소류, 8과일류
-			return scoreMap.getDouble("dqi_food_1")+scoreMap.getDouble("dqi_food_2")+scoreMap.getDouble("dqi_food_4")+
+			double t = scoreMap.getDouble("dqi_food_1")+scoreMap.getDouble("dqi_food_2")+scoreMap.getDouble("dqi_food_4")+
 					scoreMap.getDouble("dqi_food_6")+scoreMap.getDouble("dqi_food_7")+scoreMap.getDouble("dqi_food_8");
+			return t;
 		}
 	}
 	private double getUnhealthyFood() {

src/main/java/com/backoffice/logic/NutrientScoreCalculation.java

@@ -122,25 +122,44 @@ public class NutrientScoreCalculation {
 	
 	public static void main(String[] args) {
 		DataMap data = new DataMap();
+		// 아기 개월
 		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", 40.68);
-		data.put("na", 227.31);
-		data.put("vitaminb1", 0.45);
-		data.put("vitaminb2", 1.18);
-		data.put("niacin", 4.98);
-		data.put("ca", 552.66);
-		data.put("k", 465.39);
-		data.put("fe", 402.9);
-		data.put("vitamina", 372.76);
-		data.put("vitaminc", 64.33);
-		data.put("vitamind", 7.02);
-		data.put("vitamine", 5.68);
-		data.put("zn", 4.73);
+		// 에너지
+		data.put("enerc", 120.381);
+		// 탄수화물
+		data.put("chotdf", 24.401);
+		// 단백질
+		data.put("procnp", 4.36);
+		// 지방
+		data.put("fat", 0.22476);
+		// 총당류
+		data.put("sugar", 1.08);
+		// 총식이섬유
+		data.put("fibtg", 0.4381);
+		// 나트륨
+		data.put("na", 7.14286);
+		// 비타민b1
+		data.put("vitaminb1", 0.0904762);
+		// 비타민b2
+		data.put("vitaminb2", 0.05114);
+		// 니아신
+		data.put("niacin", 0);
+		// 칼슘
+		data.put("ca", 4.095238);
+		// 칼륨
+		data.put("k", 130.4762);
+		// 철
+		data.put("fe", 0.4819048);
+		// 비타민a
+		data.put("vitamina", 0);
+		// 비타민c
+		data.put("vitaminc", 4.28571);
+		// 비타민d
+		data.put("vitamind", 0);
+		// 비타민e
+		data.put("vitamine", 0);
+		// 아연
+		data.put("zn", 0.13143);
 		
 		NutrientScoreCalculation cal = new NutrientScoreCalculation(data);
 		DataMap score = cal.getScore();
@@ -174,7 +193,7 @@ public class NutrientScoreCalculation {
 		result.put("k", 2);
 		result.put("vitaminc", 0);
 		DataMap sortMap = cal.NutrientSortingForRecord(result);
-		
+
 	}
 	
 	public NutrientScoreCalculation(DataMap nutrient){