예방접종 표시 오류 수정

.idea/workspace.xml

@@ -9,10 +9,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="추천홈메이드이유식 수정">
+    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="추천홈메이드이유식 &gt; 팝업 &gt; 연관식품 삭제">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_bf_homemade_popup.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_bf_homemade_popup.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_bf_ingredient_popup.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_bf_ingredient_popup.ftl" 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" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -187,7 +188,8 @@
       <workItem from="1648430275073" duration="49000" />
       <workItem from="1648430348136" duration="702000" />
       <workItem from="1648431787209" duration="14235000" />
-      <workItem from="1648451792083" duration="3270000" />
+      <workItem from="1648451792083" duration="3736000" />
+      <workItem from="1648554891169" duration="4212000" />
     </task>
     <task id="LOCAL-00001" summary="최초 커밋">
       <created>1645354476031</created>
@@ -245,7 +247,14 @@
       <option name="project" value="LOCAL" />
       <updated>1648453690193</updated>
     </task>
-    <option name="localTasksCounter" value="9" />
+    <task id="LOCAL-00009" summary="추천홈메이드이유식 &gt; 팝업 &gt; 연관식품 삭제">
+      <created>1648455408468</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1648455408468</updated>
+    </task>
+    <option name="localTasksCounter" value="10" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -273,6 +282,7 @@
     <MESSAGE value="한글파일명 음악파일 업로드이슈 수정" />
     <MESSAGE value="이유식레시피, 시판이유식 자동검색 적용" />
     <MESSAGE value="추천홈메이드이유식 수정" />
-    <option name="LAST_COMMIT_MESSAGE" value="추천홈메이드이유식 수정" />
+    <MESSAGE value="추천홈메이드이유식 &gt; 팝업 &gt; 연관식품 삭제" />
+    <option name="LAST_COMMIT_MESSAGE" value="추천홈메이드이유식 &gt; 팝업 &gt; 연관식품 삭제" />
   </component>
 </project>

src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml

@@ -399,16 +399,16 @@
 							   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
+				   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 tv on tn1.db_dvs_no = tv.dv_no
-					WHERE tn1.dn_no = x.dn_no
+					 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
 				 (

src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml

@@ -182,11 +182,12 @@
 					 where tn1.dn_no = b.dn_no
 					)
 				when c.cd_no = 'BF_NU_TP_7' THEN
-					(select
-						 tv.dv_disease
-					 from tbl_bf_daily_nutrition_7 tn1
-							  inner join tbl_db_vac tv on tn1.db_dvs_no = tv.dv_no
-					 where tn1.dn_no = b.dn_no
+					(
+					    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
 					)
 				when c.cd_no = 'BF_NU_TP_9' THEN
 					(select

src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl

@@ -50,7 +50,7 @@
         <div class="timeline_content">
           <#assign pre_date = ''>
           <!-- 날짜별 박스 -->
-          <div class="big_day_div">
+          <div class="big_day_div" style="padding-bottom:100px">
             <#list model['time_list'] as item>
 
             <#if item['reg_date'] != pre_date>