diff --git a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBO.java b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBO.java index 5cc786e..a9837d0 100644 --- a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBO.java +++ b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBO.java @@ -23,6 +23,7 @@ public interface M_Bf_daily_nutritionBO { public abstract DataMap select_bf_last_sleep_status(DataMap paramMap) throws Exception; public abstract DataMap select_bf_last_bedpan_status(DataMap paramMap) throws Exception; + public abstract List select_lm_vac_list(DataMap paramMap) throws Exception; public abstract List select_db_vac_list(DataMap paramMap) throws Exception; public abstract List select_daily_image_list(DataMap paramMap) throws Exception; @@ -57,5 +58,5 @@ public interface M_Bf_daily_nutritionBO { public abstract List select_memo_master(DataMap paramMap) throws Exception; public abstract List select_memo_list(DataMap paramMap) throws Exception; - + } diff --git a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBOImpl.java b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBOImpl.java index 93d2da8..3745929 100644 --- a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBOImpl.java +++ b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionBOImpl.java @@ -65,6 +65,19 @@ public class M_Bf_daily_nutritionBOImpl extends AbstractBOManager implements M_B return lm; } + public List select_lm_vac_list(DataMap paramMap) throws Exception{ + List lm = null; + + try { + generalDAO.setNamespace(SQLMAP_NAMESPACE); + lm = generalDAO.select_to_list("select_db_vac_list_by_b_no", paramMap); + } catch (SQLException e) { + throw e; + } + + return lm; + } + public List select_db_vac_list(DataMap paramMap) throws Exception{ List lm = null; @@ -77,7 +90,7 @@ public class M_Bf_daily_nutritionBOImpl extends AbstractBOManager implements M_B return lm; } - + public DataMap select_bf_daily_nutrition_by_dn_no(DataMap paramMap) throws Exception{ DataMap rm = null; diff --git a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionController.java b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionController.java index 9fd279c..22a6255 100644 --- a/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionController.java +++ b/src/main/java/com/backoffice/m/bf_daily_nutrition/M_Bf_daily_nutritionController.java @@ -213,8 +213,13 @@ public class M_Bf_daily_nutritionController extends AbstractControllerManager{ List lm_memo_lst= bf_daily_nutritionBO.select_memo_list(paramMap); DataMap.putToModel(model, "lm_memo_lst", lm_memo_lst); - + if( nutirition_cd_no.replace("BF_NU_TP_","").equals("7")) { + String[] list_checked = M_Util.null2Str(rm.get("vac_dvs_no"), "").split(","); + paramMap.put("list_checked", list_checked); + List lm_vac_lst= bf_daily_nutritionBO.select_lm_vac_list(paramMap); + DataMap.putToModel(model, "lm_vac_lst", lm_vac_lst); + } if(RenaStringUtil.isNullOrEmpty(nutirition_cd_no) == false) { redirect_url = "m/bf_daily_nutrition/view_bf_daily_nutrition_" + nutirition_cd_no.replace("BF_NU_TP_", ""); }else { 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 219b7b1..9d0480d 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 @@ -169,6 +169,7 @@ ,x.m ,x.d ,x.db_dvs_no + ,x.vac_dvs_no ,dv.dv_disease AS disease ,dv.dv_type AS type FROM tbl_bf_daily_nutrition_7 x @@ -1258,7 +1259,8 @@ ,d ,memo ,db_dvs_no - ,db_dv_no + ,db_dv_no + ,vac_dvs_no ,label ) VALUES ( STR_TO_DATE(concat(#reg_date#,' ', #reg_time#) ,'%Y.%m.%d %l:%i %p') @@ -1278,6 +1280,7 @@ ,#d# ,#memo# ,#db_dvs_no# + ,#vac_dvs_no# ,#label# ) @@ -1592,6 +1595,24 @@ group by dvs_no , dv_no , round , dv_disease , dv_type + + + @@ -194,14 +195,23 @@ }, submit : function(){ var memo = $("#memoArr").val(); + var vac = ""; $(".memo_btn>button").each( function(idx, ele) { memo += (memo == "" ? "":",") + ele.textContent ; }); if( $.trim($("#txtMemo").val()) !="") memo = $("#txtMemo").val() + (memo == "" ? "":","+memo) ; + debugger; + // 예방접종 + $(".vac_btn>button").each( function(idx, ele) { + vac += (vac == "" ? "":",") + ele.dataset.vac ; + }); + + $("#reg_date").val($("#nowdate").text()); $("#reg_time").val($("#nowtime").text()); $("#memoArr").val(memo); + $("#vac_dvs_no").val(vac); $('#frmInsert').submit(); }, memoPopupClose :function(){ @@ -248,7 +258,7 @@ appendMemo: function(memo) { var chk = false; $(".memo_btn>button").each( function(idx, ele) { - if( ele.text == memo) { + if( ele.textContent == memo) { chk = true; return; } diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_7.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_7.ftl index bdd54cb..9f3108e 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_7.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_7.ftl @@ -19,14 +19,23 @@

예방접종명을 선택해주세요.