From e0fade425e77469b595f58fcf98cec500d5633d4 Mon Sep 17 00:00:00 2001
From: kyebyungha <kbh@exciform.com>
Date: Fri, 6 May 2022 17:55:11 +0900
Subject: [PATCH] =?UTF-8?q?=EC=83=81=EC=84=B8=20=EB=82=B4=EC=9A=A9?=
 =?UTF-8?q?=EC=9D=84=20=EC=9E=85=EB=A0=A5=ED=95=98=EC=A7=80=20=EC=95=8A?=
 =?UTF-8?q?=EC=9D=80=20=EA=B2=BD=EC=9A=B0=20=EC=A0=9C=EC=99=B8=20=ED=99=88?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=ED=91=9C=EC=8B=9C=20=EC=95=88=EB=90=98?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../M_Bf_daily_nutritionBO.java               |   1 +
 .../M_Bf_daily_nutritionBOImpl.java           |  20 ++
 .../M_Bf_daily_nutritionController.java       |   2 +-
 .../com.backoffice.m.bf_daily_nutrition.xml   | 278 ++++++++++--------
 4 files changed, 174 insertions(+), 127 deletions(-)

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 87d27b8..5cc786e 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
@@ -26,6 +26,7 @@ public interface M_Bf_daily_nutritionBO {
 	public abstract List<DataMap> select_db_vac_list(DataMap paramMap) throws Exception;
 	public abstract List<DataMap> select_daily_image_list(DataMap paramMap) throws Exception;
 	
+	public abstract Object new_bf_daily_nutrition(DataMap paramMap) throws Exception;	
 	public abstract Object insert_bf_daily_nutrition(DataMap paramMap) throws Exception;	
 	public abstract int update_bf_daily_nutrition(DataMap paramMap) throws Exception;
 	public abstract int insert_bf_daily_nutrition_memo(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 d8f5a0e..93d2da8 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
@@ -181,6 +181,26 @@ public class M_Bf_daily_nutritionBOImpl extends AbstractBOManager implements M_B
 		return lm;
 	}
 	 
+	public Object new_bf_daily_nutrition(DataMap paramMap) throws Exception{
+		Object resultObj = null;
+		
+		try {		
+			generalDAO.setNamespace(SQLMAP_NAMESPACE);
+			generalDAO.startTransaction();
+			
+			resultObj = generalDAO.insert("insert_bf_daily_nutrition", paramMap);
+			paramMap.put("dn_no", resultObj);
+			
+			generalDAO.commitTransaction();
+		} catch (SQLException e) {
+			throw e;
+		}finally{
+			generalDAO.endTransaction();
+		}
+		
+		return resultObj;
+	}	
+		 
 
 	public Object insert_bf_daily_nutrition(DataMap paramMap) throws Exception{
 		Object resultObj = 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 df4539a..9fd279c 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
@@ -338,7 +338,7 @@ public class M_Bf_daily_nutritionController extends AbstractControllerManager{
 					String dn_no = RenaStringUtil.getData(paramMap, "dn_no");
 					
 					if(RenaStringUtil.isNullOrEmpty(RenaStringUtil.getData(paramMap, "dn_no")) == true){						
-						dn_no = String.valueOf(bf_daily_nutritionBO.insert_bf_daily_nutrition(paramMap));
+						dn_no = String.valueOf(bf_daily_nutritionBO.new_bf_daily_nutrition(paramMap));
 						paramMap.put("dn_no", dn_no); 
 	                    paramMap.put("ERROR_MSG", "저장되었습니다");
 					}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 8e6cd82..46f3697 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
@@ -369,133 +369,159 @@
     </select>
 
 	<select id="select_bf_daily_nutrition_list_by_day" resultClass="dataMap" parameterClass="dataMap">
-		SELECT x.*
-			,(select group_concat(tm.memo) from tbl_bf_daily_nutrition_memo tm where tm.dn_no = x.dn_no) as memo
-			,ifnull(append_300_img_file, append_src_img_file)  as file_seq
-			,cis_1.title AS nutirition_cd_no_title
-			,(select color_cd from tbl_code_item ts where ts.val_1 = cis_1.cd_no) as color_cd
-			,CASE
-				 WHEN cis_1.cd_no = 'BF_NU_TP_1' THEN
-				 (
-				     SELECT ifnull(concat(ifnull(eat_qty,0), 'ml'),'') FROM tbl_bf_daily_nutrition_1 tn1 WHERE tn1.dn_no = x.dn_no
-				 )
-				 WHEN cis_1.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
-					 WHERE   tn1.dn_no = x.dn_no
-				 )
-				 WHEN cis_1.cd_no = 'BF_NU_TP_3' THEN
-				 (
-					SELECT ifnull(concat(ifnull(tn.prd_nm, ''),' ', tn1.eat_qty, 'ml 섭취'),'')
-					FROM tbl_bf_daily_nutrition_3 tn1 left outer join tbl_db_nutrient tn on tn1.db_dn_no = tn.dn_no WHERE tn1.dn_no = x.dn_no
-				 )
-				 WHEN cis_1.cd_no = 'BF_NU_TP_5' THEN
-				 ( SELECT
-					   concat(
-							   (case when sleep_tp = 15 then '낮잠' when sleep_tp = 16 then '밤잠' end),
-							   ' ',
-							   ifnull(concat( (ifnull(sleep_h,0) - ifnull(sleep_s_h,0)), '시 ', (ifnull(sleep_m,0) - ifnull(sleep_s_m,0)), '분'), '')
-						   )
-				   FROM    tbl_bf_daily_nutrition_5 tn1
-				   WHERE   tn1.dn_no = x.dn_no
-				 )
-				 WHEN cis_1.cd_no = 'BF_NU_TP_6' THEN
-				 ( SELECT
-					   concat(
-							   (case when rest_tp = 19 then '대변량' when rest_tp = 20 then '소변량' end),
-							   ' ',
-							   ifnull(tn2.title,'')
-						   )
-				   FROM    tbl_bf_daily_nutrition_6 tn1
-				   INNER JOIN tbl_code_item_str tn2 on tn2.cg_cd = 'BF_FECES_QTY' and tn1.rest_qty = tn2.val_1
-				   WHERE   tn1.dn_no            = x.dn_no
-				 )
-				 WHEN cis_1.cd_no = 'BF_NU_TP_7' THEN
- 				 (
-					 SELECT ifnull(tv.dv_disease,'')
-					 FROM    tbl_bf_daily_nutrition_7 tn1
-					 INNER JOIN tbl_db_vac_schedule tn2 on tn1.db_dvs_no = tn2.dvs_no
-					 INNER JOIN tbl_db_vac tv on      tn2.dv_no = tv.dv_no
-					 WHERE   tn1.dn_no             = x.dn_no
-				 )
-				 WHEN cis_1.cd_no = 'BF_NU_TP_9' THEN
-				 (
-					SELECT
-						concat(
-								case
-									when tn1.db_dhb_tp = 'sf' then ifnull(tb.name, '')
-									when tn1.db_dhb_tp = 'bf' then ifnull(tc.name, '')
-									end
-								,
-								tn1.eat_qty, 'ml 섭취'
-							)
-					FROM tbl_bf_daily_nutrition_9 tn1
-					LEFT OUTER JOIN tbl_db_home_sf tb on tn1.db_dhb_no = tb.dhb_no
-					LEFT OUTER JOIN tbl_db_home_bf tc on tn1.db_dhb_no = tc.dhb_no
-					WHERE tn1.dn_no = x.dn_no
-				 )
-				 WHEN cis_1.cd_no = 'BF_NU_TP_10' THEN
-				 (
-					 SELECT
-						 concat(
-								 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 섭취' )
-					 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
-					 WHERE   tn1.dn_no         = x.dn_no
-				 )
-				 WHEN cis_1.cd_no = 'BF_NU_TP_11' THEN
- 				 (
-					SELECT ifnull(concat(ifnull(hosp_nm,''), ' 의사:', doctor_nm, ', 증상: ', checkup),'') FROM tbl_bf_daily_nutrition_11 tn1 WHERE tn1.dn_no = x.dn_no
-				 )
-				 WHEN cis_1.cd_no = 'BF_NU_TP_12' THEN
-				 (
-					SELECT ifnull(daily_life, '') FROM tbl_bf_daily_nutrition_12 tn1 WHERE tn1.dn_no = x.dn_no
-				 )
-				 WHEN cis_1.cd_no = 'BF_NU_TP_13' THEN
- 				 (
-					SELECT achievement FROM tbl_bf_daily_nutrition_13 tn1 WHERE tn1.dn_no = x.dn_no
-				 )
-				 WHEN cis_1.cd_no = 'BF_NU_TP_14' THEN
-				 (
-					SELECT ifnull(concat(ifnull(blq + brq,0), 'ml'),'') FROM tbl_bf_daily_nutrition_14 tn1 WHERE tn1.dn_no = x.dn_no
-				 )
-				 WHEN cis_1.cd_no = 'BF_NU_TP_15' THEN
-				 (
-					SELECT concat(ifnull(etc_symptom,''), ' ', ifnull(temperature,'')) FROM tbl_bf_daily_nutrition_15 tn1 WHERE tn1.dn_no = x.dn_no
-				 )
-		END AS time_val
-		FROM
-		(
-			SELECT
-				 x.dn_no
-				,x.smc_no
-				,DATE_FORMAT(x.baseday, '%Y.%m.%d') AS baseday
-				,x.append_src_img_file
-				,x.append_300_img_file
-				,x.nutirition_cd_no
-				,x.reg_dt
-				,x.mod_dt
+		select z.* from (
+			SELECT x.*
+				,(select group_concat(tm.memo) from tbl_bf_daily_nutrition_memo tm where tm.dn_no = x.dn_no) as memo
+				,ifnull(append_300_img_file, append_src_img_file)  as file_seq
+				,cis_1.title AS nutirition_cd_no_title
+				,(select color_cd from tbl_code_item ts where ts.val_1 = cis_1.cd_no) as color_cd
 				,CASE
-					WHEN TIMESTAMPDIFF(MINUTE, x.reg_dt, NOW()) <![CDATA[<=]]> 0 THEN '방금 전'
-					WHEN TIMESTAMPDIFF(MINUTE, x.reg_dt, NOW()) <![CDATA[<]]> 60 THEN CONCAT(TIMESTAMPDIFF(MINUTE, x.reg_dt, NOW()), '분 전')
-					WHEN TIMESTAMPDIFF(HOUR, x.reg_dt, NOW()) <![CDATA[<]]> 24 THEN CONCAT(TIMESTAMPDIFF(HOUR, x.reg_dt, NOW()), '시간 전')
-					WHEN TIMESTAMPDIFF(DAY, x.reg_dt, NOW()) <![CDATA[<]]> 30 THEN CONCAT(TIMESTAMPDIFF(DAY, x.reg_dt, NOW()), '일 전')
-					ELSE CONCAT(TIMESTAMPDIFF(MONTH, x.reg_dt, NOW()), '달 전')
-				END AS ago
-			FROM tbl_bf_daily_nutrition x
-			WHERE 1 =1
-				AND x.smc_no = #smc_no#
-				AND x.baseday = #base_dt#
-			    AND x.nutirition_cd_no != ''
-		) x
-		LEFT JOIN tbl_code_item_str cis_1 ON cis_1.cd_no = x.nutirition_cd_no
-		ORDER BY dn_no DESC
+					 WHEN cis_1.cd_no = 'BF_NU_TP_1' THEN
+					 (
+					     SELECT ifnull(concat(ifnull(eat_qty,0), 'ml'),'') FROM tbl_bf_daily_nutrition_1 tn1 
+					     INNER JOIN tbl_db_nutrient tn on tn1.dn_no = tn.dn_no 
+					     WHERE tn1.dn_no = x.dn_no
+					 )
+					 WHEN cis_1.cd_no = 'BF_NU_TP_2' THEN
+					 (
+						 SELECT ifnull(concat(ifnull(tn.prd_nm,''), ' ', eat_qty, 'ml'),'')
+						 FROM  tbl_bf_daily_nutrition_2 tn1
+						 INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
+						 WHERE   tn1.dn_no = x.dn_no
+					 )
+					 WHEN cis_1.cd_no = 'BF_NU_TP_3' THEN
+					 (
+						SELECT ifnull(concat(ifnull(tn.prd_nm, ''),' ', tn1.eat_qty, 'ml 섭취'),'')
+						FROM tbl_bf_daily_nutrition_3 tn1 
+						INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no 
+						WHERE tn1.dn_no = x.dn_no
+					 )
+					 WHEN cis_1.cd_no = 'BF_NU_TP_5' THEN
+					 ( SELECT
+						   concat(
+								   (case when sleep_tp = 15 then '낮잠' when sleep_tp = 16 then '밤잠' end),
+								   ' ',
+								   ifnull(concat( (ifnull(sleep_h,0) - ifnull(sleep_s_h,0)), '시 ', (ifnull(sleep_m,0) - ifnull(sleep_s_m,0)), '분'), '')
+							   )
+					   FROM    tbl_bf_daily_nutrition_5 tn1 
+					   INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no 
+					   WHERE   tn1.dn_no = x.dn_no
+					 )
+					 WHEN cis_1.cd_no = 'BF_NU_TP_6' THEN
+					 ( SELECT
+						   concat(
+								   (case when rest_tp = 19 then '대변량' when rest_tp = 20 then '소변량' end),
+								   ' ',
+								   ifnull(tn2.title,'')
+							   )
+					   FROM    tbl_bf_daily_nutrition_6 tn1
+					   INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
+					   INNER JOIN tbl_code_item_str tn2 on tn2.cg_cd = 'BF_FECES_QTY' and tn1.rest_qty = tn2.val_1
+					   WHERE   tn1.dn_no            = x.dn_no
+					 )
+					 WHEN cis_1.cd_no = 'BF_NU_TP_7' THEN
+	 				 (
+						 SELECT ifnull(tv.dv_disease,'')
+						 FROM    tbl_bf_daily_nutrition_7 tn1
+						 INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
+						 INNER JOIN tbl_db_vac_schedule tn2 on tn1.db_dvs_no = tn2.dvs_no
+						 INNER JOIN tbl_db_vac tv on      tn2.dv_no = tv.dv_no
+						 WHERE   tn1.dn_no             = x.dn_no
+					 )
+					 WHEN cis_1.cd_no = 'BF_NU_TP_9' THEN
+					 (
+						SELECT
+							concat(
+									case
+										when tn1.db_dhb_tp = 'sf' then ifnull(tb.name, '')
+										when tn1.db_dhb_tp = 'bf' then ifnull(tc.name, '')
+										end
+									,
+									tn1.eat_qty, 'ml 섭취'
+								)
+						FROM tbl_bf_daily_nutrition_9 tn1
+						INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
+						LEFT OUTER JOIN tbl_db_home_sf tb on tn1.db_dhb_no = tb.dhb_no
+						LEFT OUTER JOIN tbl_db_home_bf tc on tn1.db_dhb_no = tc.dhb_no
+						WHERE tn1.dn_no = x.dn_no
+					 )
+					 WHEN cis_1.cd_no = 'BF_NU_TP_10' THEN
+					 (
+						 SELECT
+							 concat(
+									 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 섭취' )
+						 FROM    tbl_bf_daily_nutrition_10 tn1
+						 INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
+						 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
+						 WHERE   tn1.dn_no         = x.dn_no
+					 )
+					 WHEN cis_1.cd_no = 'BF_NU_TP_11' THEN
+	 				 (
+						SELECT ifnull(concat(ifnull(hosp_nm,''), ' 의사:', doctor_nm, ', 증상: ', checkup),'') 
+						FROM tbl_bf_daily_nutrition_11 tn1 
+						INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
+						WHERE tn1.dn_no = x.dn_no
+					 )
+					 WHEN cis_1.cd_no = 'BF_NU_TP_12' THEN
+					 (
+						SELECT ifnull(daily_life, '') 
+						FROM tbl_bf_daily_nutrition_12 tn1 
+						INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
+						WHERE tn1.dn_no = x.dn_no
+					 )
+					 WHEN cis_1.cd_no = 'BF_NU_TP_13' THEN
+	 				 (
+						SELECT achievement 
+						FROM tbl_bf_daily_nutrition_13 tn1 
+						INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
+						WHERE tn1.dn_no = x.dn_no
+					 )
+					 WHEN cis_1.cd_no = 'BF_NU_TP_14' THEN
+					 (
+						SELECT ifnull(concat(ifnull(blq + brq,0), 'ml'),'') 
+						FROM tbl_bf_daily_nutrition_14 tn1 
+						INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
+						WHERE tn1.dn_no = x.dn_no
+					 )
+					 WHEN cis_1.cd_no = 'BF_NU_TP_15' THEN
+					 (
+						SELECT concat(ifnull(etc_symptom,''), ' ', ifnull(temperature,'')) 
+						FROM tbl_bf_daily_nutrition_15 tn1 
+						INNER JOIN tbl_db_nutrient tn ON tn1.dn_no = tn.dn_no
+						WHERE tn1.dn_no = x.dn_no
+					 )
+			END AS time_val
+			FROM
+			(
+				SELECT
+					 x.dn_no
+					,x.smc_no
+					,DATE_FORMAT(x.baseday, '%Y.%m.%d') AS baseday
+					,x.append_src_img_file
+					,x.append_300_img_file
+					,x.nutirition_cd_no
+					,x.reg_dt
+					,x.mod_dt
+					,CASE
+						WHEN TIMESTAMPDIFF(MINUTE, x.reg_dt, NOW()) <![CDATA[<=]]> 0 THEN '방금 전'
+						WHEN TIMESTAMPDIFF(MINUTE, x.reg_dt, NOW()) <![CDATA[<]]> 60 THEN CONCAT(TIMESTAMPDIFF(MINUTE, x.reg_dt, NOW()), '분 전')
+						WHEN TIMESTAMPDIFF(HOUR, x.reg_dt, NOW()) <![CDATA[<]]> 24 THEN CONCAT(TIMESTAMPDIFF(HOUR, x.reg_dt, NOW()), '시간 전')
+						WHEN TIMESTAMPDIFF(DAY, x.reg_dt, NOW()) <![CDATA[<]]> 30 THEN CONCAT(TIMESTAMPDIFF(DAY, x.reg_dt, NOW()), '일 전')
+						ELSE CONCAT(TIMESTAMPDIFF(MONTH, x.reg_dt, NOW()), '달 전')
+					END AS ago
+				FROM tbl_bf_daily_nutrition x
+				WHERE 1 =1
+					AND x.smc_no = #smc_no#
+					AND x.baseday = #base_dt#
+				    AND x.nutirition_cd_no != ''
+			) x
+			LEFT JOIN tbl_code_item_str cis_1 ON cis_1.cd_no = x.nutirition_cd_no
+			ORDER BY dn_no DESC ) z
+	where z.time_val is not null	
 	</select>
 
     <select id="select_bf_daily_nutrition_list_count" resultClass="Integer" parameterClass="dataMap">