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 a1fda88..fac85e6 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 @@ -401,7 +401,7 @@ when tn1.db_dn_tp = 'sf' then ifnull(tc.prd_nm, '') end ,' ' - ,tn1.eat_qty, 'ml 섭취' + ,tn1.eat_qty, 'g(ml) 섭취' ) FROM tbl_bf_daily_nutrition_3 tn1 LEFT OUTER JOIN tbl_db_nutrient tb ON tn1.db_dn_no = tb.dn_no @@ -442,7 +442,7 @@ when tn1.db_dhb_tp = 'bf' then ifnull(tc.name, '') end , - tn1.eat_qty, 'ml 섭취' + tn1.eat_qty, 'g(ml) 섭취' ) FROM tbl_bf_daily_nutrition_9 tn1 LEFT OUTER JOIN tbl_db_home_sf tb on tn1.db_dhb_no = tb.dhb_no @@ -456,7 +456,7 @@ case when tn1.db_dbc_tp = 'sf' then ifnull(tb.prd_nm, '') when tn1.db_dbc_tp = 'bf' then ifnull(tc.prd_nm, '') - end , tn1.eat_qty, 'ml 섭취' ) + end , tn1.eat_qty, 'g(ml) 섭취' ) FROM tbl_bf_daily_nutrition_10 tn1 LEFT OUTER JOIN tbl_db_sf_commerce tb on tn1.db_dbc_no = tb.dbc_no LEFT OUTER JOIN tbl_db_bf_commerce tc on tn1.db_dbc_no = tc.dbc_no @@ -1036,10 +1036,10 @@ - + INSERT tbl_bf_daily_nutrition_2 - ( - reg_dt + ( + reg_dt ,dn_no ,smc_no ,baseday @@ -1049,32 +1049,40 @@ ,fed_rs ,emo_pre ,emo_post - + ,db_dn_no ,lacto ,eat_qty ,bm ,bs ,rem + ,weight ) VALUES ( - STR_TO_DATE(concat(#reg_date#,' ', #reg_time#) ,'%Y.%m.%d %l:%i %p') - ,#dn_no# - ,#smc_no# + STR_TO_DATE(concat(#reg_date#,' ', #reg_time#) ,'%Y.%m.%d %l:%i %p') + ,#dn_no# + ,#smc_no# ,#baseday# ,#birthday# - ,#afterbirthday# + ,#afterbirthday# ,#milk_tp# ,#fed_rs# ,#emo_pre# ,#emo_post# - + ,#db_dn_no# ,#lacto# ,#eat_qty# ,#bm# ,#bs# ,#rem# + + ,#eat_qty#/(SELECT srv from tbl_db_nutrient where dn_no=(#db_dn_no#)) + + + ,#eat_qty#/100 + ) + @@ -1388,8 +1396,8 @@ ,allergy_cd_no ,db_dbc_no ,db_dbc_tp - ,eat_qty ,weight + ,eat_qty ) VALUES ( STR_TO_DATE(concat(#reg_date#,' ', #reg_time#) ,'%Y.%m.%d %l:%i %p') ,#dn_no# @@ -1408,8 +1416,8 @@ ,#allergy_cd_no# ,#db_dbc_no# ,#db_dbc_tp# - ,#eat_qty# - ,#weight# + ,((#eat_qty#)/(SELECT srv from tbl_db_bf_commerce where dbc_no=(#db_dbc_no#))) + ,#eat_qty# ) 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 577bb68..80408cf 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 @@ -256,7 +256,7 @@ when tn1.db_dn_tp = 'sf' then ifnull(tc.prd_nm, '') end , ' ' - , tn1.eat_qty, 'ml 섭취' + , tn1.eat_qty, 'g(ml) 섭취' ) from tbl_bf_daily_nutrition_3 tn1 left outer join tbl_db_nutrient tb on tn1.db_dn_no = tb.dn_no @@ -286,7 +286,7 @@ when tn1.db_dhb_tp = 'bf' then ifnull(tc.name, '') end , - tn1.eat_qty, 'ml 섭취' + tn1.eat_qty, 'g(ml) 섭취' ) from tbl_bf_daily_nutrition_9 tn1 left outer join tbl_db_home_sf tb on tn1.db_dhb_no = tb.dhb_no @@ -299,7 +299,7 @@ case when tn1.db_dbc_tp = 'sf' then ifnull(tb.prd_nm, '') when tn1.db_dbc_tp = 'bf' then ifnull(tc.prd_nm, '') - end, tn1.eat_qty, 'ml 섭취') + end, tn1.eat_qty, 'g(ml) 섭취') FROM tbl_bf_daily_nutrition_10 tn1 LEFT OUTER JOIN tbl_db_sf_commerce tb on tn1.db_dbc_no = tb.dbc_no LEFT OUTER JOIN tbl_db_bf_commerce tc on tn1.db_dbc_no = tc.dbc_no