[수정] 식품군 점수 주간 월간 오류 수정

src/main/java/com/backoffice/m/bf_growth/M_Bf_growthController.java

@@ -421,21 +421,25 @@ public class M_Bf_growthController extends AbstractControllerManager{
 						List<DataMap> weak_lm = scoreBO.select_weekly_list_for_graph(paramMap);
 
 						for (DataMap week : weak_lm) {
-							List<DataMap> lm = scoreBO.select_daily_total(week);
+							List<DataMap> lm = scoreBO.change_graph_to_daily_list(week);
 
 							long totalNutrition = 0;
 							long totalFood = 0;
 
 							for (DataMap dm : lm) {
-								NutrientScoreCalculation nut = new NutrientScoreCalculation(dm);
+								List<DataMap> lm2 = scoreBO.select_daily_total(dm);
+								for (DataMap dm2 : lm2) {
+									NutrientScoreCalculation nut = new NutrientScoreCalculation(dm2);
 									DataMap nut_score = nut.getScore();
-								FoodScoreCalculation food = new FoodScoreCalculation(dm);
+									FoodScoreCalculation food = new FoodScoreCalculation(dm2);
 									DataMap food_score = food.getScore();
 									totalNutrition += nut_score.getLong("totalNutrition");
 									totalFood += food_score.getLong("totalFood");
 								}
+							}
 							// 1주일 중 기록한 날짜 수
-							int day = lm.size();
+//							int day = lm.size();
+							int day = week.getInt("count");
 
 							DataMap data = new DataMap();
 							data.put("reg_dt",RenaStringUtil.getData(week, "week_str"));
@@ -443,29 +447,33 @@ public class M_Bf_growthController extends AbstractControllerManager{
 							data.put("totalFood", Math.round(totalFood/day));
 
 							weekly.add(data);
-					
 						}
 
 						// 월간 균형 판정
 						List<DataMap> month_lm = scoreBO.select_monthly_list_graph(paramMap);
 
 						for(DataMap month : month_lm) {
-							List<DataMap> lm = scoreBO.select_daily_total(month);
+							List<DataMap> lm = scoreBO.change_graph_to_daily_list(month);
+
 
 							long totalNutrition = 0;
 							long totalFood = 0;
 
 							for(DataMap dm : lm) {
-								NutrientScoreCalculation nut = new NutrientScoreCalculation(dm);
+								List<DataMap> lm2 = scoreBO.select_daily_total(dm);
+								for (DataMap dm2 : lm2) {
+									NutrientScoreCalculation nut = new NutrientScoreCalculation(dm2);
 									DataMap nut_score = nut.getScore();
-								FoodScoreCalculation food = new FoodScoreCalculation(dm);
+									FoodScoreCalculation food = new FoodScoreCalculation(dm2);
 									DataMap food_score = food.getScore();
 
 									totalNutrition += nut_score.getLong("totalNutrition");
 									totalFood += food_score.getLong("totalFood");
 								}
+							}
 							// 한달 중 기록한 날짜 수
-							int day = lm.size();
+//							int day = lm.size();
+							int day = month.getInt("count");
 
 							DataMap data = new DataMap();
 							data.put("reg_dt",RenaStringUtil.getData(month, "month_str"));