diff --git a/src/main/java/com/backoffice/logic/NutrientScoreCalculation.java b/src/main/java/com/backoffice/logic/NutrientScoreCalculation.java index 6d26139..8ffef37 100644 --- a/src/main/java/com/backoffice/logic/NutrientScoreCalculation.java +++ b/src/main/java/com/backoffice/logic/NutrientScoreCalculation.java @@ -783,7 +783,7 @@ public class NutrientScoreCalculation { if(x<=from) return Lights.green.name(); else if(x>from) - return Lights.yellow.name(); + return Lights.red.name(); else return ""; } @@ -817,7 +817,7 @@ public class NutrientScoreCalculation { result.put("fat", getLight(fat, ARR_INTAKE_FROM[fat_idx][label], ARR_INTAKE_TO[fat_idx][label])); result.put("sugar", getLight(sugar, ARR_INTAKE_FROM[sugar_idx][label])); // 12개월 미만 식이섬유는 기준 없음 - if(label<2) + if(label<=2) result.put("fibtg", Lights.red.name()); else result.put("fibtg", getLight(fibtg, ARR_INTAKE_FROM[fibtg_idx][label], ARR_INTAKE_TO[fibtg_idx][label])); diff --git a/src/main/resources/sqlmap/m/bf_growth/com.backoffice.m.bf_growth.xml b/src/main/resources/sqlmap/m/bf_growth/com.backoffice.m.bf_growth.xml index 3b85967..3a0e29a 100644 --- a/src/main/resources/sqlmap/m/bf_growth/com.backoffice.m.bf_growth.xml +++ b/src/main/resources/sqlmap/m/bf_growth/com.backoffice.m.bf_growth.xml @@ -396,7 +396,7 @@ select date_format(date_add(fb.birthday,interval dvs.start_label month),'%Y. %m. %d') recmnd_from_dt , date_format(date_add(date_add(fb.birthday, interval dvs.end_label month), interval -1 day),'%Y. %m. %d') recmnd_to_dt , date_format(date_add(fb.birthday,interval dvs.start_label month),'%Y년 %m월') recmnd_month - , concat (dvs.round, ' 차 ', dv_disease ) as dv_disease + , concat (dvs.round, ' 차 ', dv_disease, ' [', dv.dv_type, ']' ) as dv_disease , dvs.round from tbl_db_vac_schedule dvs inner join tbl_db_vac dv @@ -411,7 +411,7 @@ select date_format(date_add(fb.birthday,interval dvs.start_label month),'%Y. %m. %d') recmnd_from_dt , date_format(date_add(date_add(fb.birthday, interval dvs.end_label month), interval -1 day),'%Y. %m. %d') recmnd_to_dt , date_format(date_add(fb.birthday,interval dvs.start_label month),'%Y년 %m월') recmnd_month - , concat (dvs.round, ' 차 ', dv_disease ) as dv_disease + , concat (dvs.round, ' 차 ', dv_disease, ' [', dv.dv_type, ']') as dv_disease , dvs.round from tbl_db_vac_schedule dvs inner join tbl_db_vac dv 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 f90db59..700652e 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 @@ -3,6 +3,7 @@