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 42c00e2..978adfe 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 @@ -273,6 +273,7 @@ ,x.brs ,x.blq ,x.brq + ,ifnull(x.blq,0) + ifnull(x.brq,0) as eat_qty FROM tbl_bf_daily_nutrition_14 x WHERE 1 = 1 AND x.dn_no = #dn_no# diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_10.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_10.ftl index 8215695..84de786 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_10.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_10.ftl @@ -5,4 +5,9 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_12.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_12.ftl index 90e1e51..0c6bd8d 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_12.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_12.ftl @@ -1,3 +1,8 @@ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_13.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_13.ftl index ef29dc0..b44d41c 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_13.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_13.ftl @@ -1,5 +1,8 @@ - - + diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_14.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_14.ftl index ef29dc0..285b3ad 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_14.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_14.ftl @@ -1,5 +1,8 @@ - - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_15.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_15.ftl index b227478..acbc6ff 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_15.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nu_tp_15.ftl @@ -1,4 +1,8 @@ - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bottom.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bottom.ftl index 34a0ff3..64d325a 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bottom.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bottom.ftl @@ -131,11 +131,7 @@ - - - - - + @@ -437,12 +433,8 @@ str = "0"+str; } return str; - }; + }; - - - - <#include "/m/bf_daily_nutrition/include_bottom.ftl"> \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_13.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_13.ftl index c5dadf6..eeb75ba 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_13.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_13.ftl @@ -1,22 +1,25 @@ <#include "/m/bf_daily_nutrition/include_top.ftl"> - -
성취 종류
+ +왼쪽
+분
+초
+수유시작
+ 00:00 +오른쪽
+ +분
+초
+섭취량
+총 <#if model['rm']['eat_qty']?exists > ${model['rm']['eat_qty']!} <#else>0#if> ml
+총량 입력
+ + +왼쪽
+ +오른쪽
+ +폐기 D-Day
+