From f351917f622878727b12fe83bfee4b56309bba35 Mon Sep 17 00:00:00 2001
From: snut97 <snut97@hmit.co.kr>
Date: Fri, 13 May 2022 18:41:49 +0900
Subject: [PATCH] =?UTF-8?q?=ED=99=88/=EB=A9=94=EB=AA=A8=EB=A6=AC=20>=20?=
 =?UTF-8?q?=EC=98=88=EB=B0=A9=EC=A0=91=EC=A2=85=20=EB=B3=B5=EC=88=98?=
 =?UTF-8?q?=EA=B0=9C=20=EB=B3=B4=EC=9D=B4=EB=8F=84=EB=A1=9D=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                             | 3 +++
 .idea/workspace.xml                                        | 7 ++++---
 .../com.backoffice.m.bf_daily_nutrition.xml                | 6 +-----
 .../sqlmap/m/memory/com.backoffice.m.memory.memory.xml     | 6 +-----
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6a0cd8c..b97d4e9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -12,4 +12,7 @@
     </option>
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+  <component name="ProjectType">
+    <option name="id" value="jpab" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 81f7a20..370d906 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,10 +9,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="기록정보 홈화면 표시오류 수정-2">
+    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="1. D-Day 없을경우 링크 되도록 수정&#10;2. 간식기록제품 홈정보 표시오류 수정">
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -257,6 +256,8 @@
       <workItem from="1652060536329" duration="3124000" />
       <workItem from="1652100883750" duration="5459000" />
       <workItem from="1652321382844" duration="8153000" />
+      <workItem from="1652418151986" duration="203000" />
+      <workItem from="1652431636439" duration="2013000" />
     </task>
     <task id="LOCAL-00023" summary="홈&gt;홈메이드 추천 이유식 퍼블리싱작업-1">
       <created>1649607799069</created>
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 11498e4..a1fda88 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
@@ -431,11 +431,7 @@
 					 )
 					 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
+						 ufn_get_dv_disease(x.dn_no)
 					 )
 					 WHEN cis_1.cd_no = 'BF_NU_TP_9' THEN
 					 (
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 3a7a237..0e7c49f 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
@@ -277,11 +277,7 @@
 								)
 							when c.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 = b.dn_no
+									ufn_get_dv_disease(b.dn_no)
 								)
 							when c.cd_no = 'BF_NU_TP_9' THEN
 								(select concat(