diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 06e5545..b427870 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,9 +9,10 @@
-
+
+
@@ -255,14 +256,7 @@
-
-
-
- 1649334044809
-
-
-
- 1649334044809
+
1649339670142
@@ -600,7 +594,14 @@
1652106845798
-
+
+ 1652323538975
+
+
+
+ 1652323538976
+
+
@@ -620,7 +621,6 @@
-
@@ -645,6 +645,7 @@
-
+
+
\ No newline at end of file
diff --git a/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml b/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
index 2a24abc..0c48276 100644
--- a/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
+++ b/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
@@ -386,7 +386,7 @@
(
SELECT ifnull(concat(ifnull(tn.prd_nm,''), ' ', eat_qty, 'ml'),'')
FROM tbl_bf_daily_nutrition_2 tn1
- LEFT OUTER JOIN tbl_db_nutrient tn ON tn1.db_dn_no = tn.dn_no
+ LEFT OUTER JOIN tbl_db_nutrient tn ON tn1.db_dn_no = tn.dn_no and tn1.milk_tp = 87
WHERE tn1.dn_no = x.dn_no
)
WHEN cis_1.cd_no = 'BF_NU_TP_3' THEN
diff --git a/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml b/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml
index 4312c2c..97de0a3 100644
--- a/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml
+++ b/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml
@@ -237,7 +237,7 @@
when c.cd_no = 'BF_NU_TP_2' THEN
(select ifnull(concat(ifnull(tn.prd_nm,''), ' ', eat_qty, 'ml'),'')
from tbl_bf_daily_nutrition_2 tn1
- left outer join tbl_db_nutrient tn ON tn1.db_dn_no = tn.dn_no
+ left outer join tbl_db_nutrient tn ON tn1.db_dn_no = tn.dn_no and tn1.milk_tp = 87
WHERE tn1.dn_no = b.dn_no
)
when c.cd_no = 'BF_NU_TP_3' THEN