건강검진, 예방접종-지난 날짜 아래로, 회색 배경 + 해당 날짜 하이라이트

src/main/java/com/backoffice/m/bf_growth/M_Bf_growthBO.java

@@ -14,11 +14,13 @@ public interface M_Bf_growthBO {
 	public abstract DataMap select_bf_growth_vac_baseday(DataMap paramMap) throws Exception;	
 	public abstract DataMap select_bf_growth_vac_by_label(DataMap paramMap) throws Exception;	
 	public abstract List<DataMap> select_bf_health_checkup_list(DataMap paramMap) throws Exception;
+	public abstract List<DataMap> select_bf_health_checkup_list_prvs(DataMap paramMap) throws Exception;
 	public abstract List<DataMap> select_bf_vac_schedule_list(DataMap paramMap) throws Exception;
-	
+	public abstract List<DataMap> select_bf_vac_schedule_list_prvs(DataMap paramMap) throws Exception;
+
 	public abstract List<DataMap> select_bf_growth_sleep_statistics(DataMap paramMap) throws Exception;
 	public abstract List<DataMap> select_bf_growth_sleep_list(DataMap paramMap) throws Exception;
-	
+
 	public abstract List<DataMap> select_bf_growth_rest_statistics(DataMap paramMap) throws Exception;
 	public abstract List<DataMap> select_bf_growth_rest_by_rest_tp_limit2(DataMap paramMap) throws Exception;
 	public abstract List<DataMap> select_bf_growth_rest_list(DataMap paramMap) throws Exception;

src/main/java/com/backoffice/m/bf_growth/M_Bf_growthBOImpl.java

@@ -71,7 +71,6 @@ public class M_Bf_growthBOImpl extends AbstractBOManager implements M_Bf_growthB
 		} catch (SQLException e) {	throw e; }		
 		return lm;
 	}
-
 	
 	
 	public List<DataMap> select_bf_growth_rest_statistics(DataMap paramMap) throws Exception{
@@ -128,6 +127,16 @@ public class M_Bf_growthBOImpl extends AbstractBOManager implements M_Bf_growthB
 		} catch (SQLException e) {	throw e; }		
 		return lm;
 	}
+
+	public List<DataMap> select_bf_health_checkup_list_prvs(DataMap paramMap) throws Exception{
+		List<DataMap> lm = null;
+		try {
+			generalDAO.setNamespace(SQLMAP_NAMESPACE);
+			lm = generalDAO.select_to_list("select_bf_health_checkup_list_prvs", paramMap);
+		} catch (SQLException e) {	throw e; }
+		return lm;
+	}
+
 	public List<DataMap> select_bf_vac_schedule_list(DataMap paramMap) throws Exception{
 		List<DataMap> lm = null;
 		try {
@@ -135,8 +144,17 @@ public class M_Bf_growthBOImpl extends AbstractBOManager implements M_Bf_growthB
 			lm = generalDAO.select_to_list("select_bf_vac_schedule_list", paramMap);
 		} catch (SQLException e) {	throw e; }		
 		return lm;
-	} 
+	}
-	
+
+	public List<DataMap> select_bf_vac_schedule_list_prvs(DataMap paramMap) throws Exception{
+		List<DataMap> lm = null;
+		try {
+			generalDAO.setNamespace(SQLMAP_NAMESPACE);
+			lm = generalDAO.select_to_list("select_bf_vac_schedule_list_prvs", paramMap);
+		} catch (SQLException e) {	throw e; }
+		return lm;
+	}
+
 	public DataMap select_bf_health_noti_count (DataMap paramMap) throws Exception{
 		DataMap rm = null;		
 		try {		

src/main/java/com/backoffice/m/bf_growth/M_Bf_growthController.java

@@ -612,12 +612,15 @@ public class M_Bf_growthController extends AbstractControllerManager{
 				DataMap rm_child = init_child(model, request, paramMap);
 				paramMap.put("smc_no", rm_child.get("smc_no"));
 				List<DataMap> lm_health_checkup = bf_growthBO.select_bf_health_checkup_list(paramMap); //smc_no
+				List<DataMap> lm_health_chekcup_prvs = bf_growthBO.select_bf_health_checkup_list_prvs(paramMap);
+
 				DataMap rm_vac_noti = bf_growthBO.select_bf_vac_noti_count(paramMap);
 				DataMap rm_health_noti = bf_growthBO.select_bf_health_noti_count(paramMap);
 				DataMap.putToModel(model, "rm_vac_noti", rm_vac_noti);
 				DataMap.putToModel(model, "rm_health_noti", rm_health_noti);
 				DataMap.putToModel(model, "rm_child", rm_child);
 				DataMap.putToModel(model, "rm_health_checkup", lm_health_checkup);
+				DataMap.putToModel(model, "rm_health_chekcup_prvs", lm_health_chekcup_prvs);
 			}
 		}catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();}
 		
@@ -626,7 +629,7 @@ public class M_Bf_growthController extends AbstractControllerManager{
 		return redirect_url;
 		
 	}
-	
+
 	@RequestMapping(value="vac_schedule")	
 	public String vac_schedule(@ModelAttribute("model") ModelMap model, HttpServletRequest  request, HttpServletResponse response
     		, RedirectAttributes ra) {
@@ -643,13 +646,15 @@ public class M_Bf_growthController extends AbstractControllerManager{
 				DataMap rm_child = init_child(model, request, paramMap);
 				paramMap.put("smc_no", rm_child.get("smc_no"));
 				List<DataMap> lm_vac_schedule = bf_growthBO.select_bf_vac_schedule_list(paramMap); //smc_no
+				List<DataMap> lm_vac_schedule_prvs = bf_growthBO.select_bf_vac_schedule_list_prvs(paramMap);
+
 				DataMap rm_health_noti = bf_growthBO.select_bf_health_noti_count(paramMap);
 				DataMap rm_vac_noti = bf_growthBO.select_bf_vac_noti_count(paramMap);
 				DataMap.putToModel(model, "rm_vac_noti", rm_vac_noti);
 				DataMap.putToModel(model, "rm_health_noti", rm_health_noti);
 				DataMap.putToModel(model, "rm_child", rm_child);
-				DataMap.putToModel(model, "rm_vac_schedule", lm_vac_schedule); 
+				DataMap.putToModel(model, "rm_vac_schedule", lm_vac_schedule);
-				
+				DataMap.putToModel(model, "rm_vac_schedule_prvs", lm_vac_schedule_prvs);
 			}
 		}catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();}
 		

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

@@ -355,24 +355,44 @@
     </select>
     
      <select id="select_bf_health_checkup_list" resultClass="dataMap" parameterClass="dataMap">
-	    	 select date_format(date_add(fb.birthday,interval ch.from month),'%Y. %m. %d') recmnd_from_dt 
+		 select date_format(date_add(fb.birthday,interval ch.from month),'%Y. %m. %d') recmnd_from_dt
-		 		, date_format(date_add(fb.birthday,interval ch.to month),'%Y. %m. %d') recmnd_to_dt
+			  , date_format(date_add(fb.birthday,interval ch.to month),'%Y. %m. %d') recmnd_to_dt
-		 		, date_format(date_add(fb.birthday,interval ch.from month),'%Y년 %m월') recmnd_month 
+			  , date_format(date_add(fb.birthday,interval ch.from month),'%Y년 %m월') recmnd_month
-		 		, ch.from * 30 as from_dt
+			  , ch.from * 30 as from_dt
-		 		, ch.to * 30 as to_dt
+			  , ch.to * 30 as to_dt
-		 		, ch.*
+			  , ch.*
-		 		, ci.title  
+			  , ci.title
-		 	from  tbl_db_health_checkup ch 
+		 from  tbl_db_health_checkup ch
-		   left join  tbl_bf_family_baby fb
+				   left join  tbl_bf_family_baby fb
-		        on fb.smc_no = #smc_no#
+							  on fb.smc_no = #smc_no#
-		   left join  tbl_code_item ci
+				   left join  tbl_code_item ci
-		        on ci.val_1  = ch.health_tp 
+							  on ci.val_1  = ch.health_tp
-		        and ci.cg_cd ='BF_HEALTH_TP'
+								  and ci.cg_cd ='BF_HEALTH_TP'
-		   where smc_no = #smc_no#
+		 where smc_no = #smc_no#
-		   order by recmnd_from_dt 
+		   and date_add(fb.birthday,interval ch.from month) >= now()
-  	</select> 
+		 order by recmnd_from_dt
-    
+  	</select>
-    <select id="select_bf_vac_schedule_list" resultClass="dataMap" parameterClass="dataMap">
+
+	<select id="select_bf_health_checkup_list_prvs" resultClass="dataMap" parameterClass="dataMap">
+		select date_format(date_add(fb.birthday,interval ch.from month),'%Y. %m. %d') recmnd_from_dt
+			, date_format(date_add(fb.birthday,interval ch.to month),'%Y. %m. %d') recmnd_to_dt
+			, date_format(date_add(fb.birthday,interval ch.from month),'%Y년 %m월') recmnd_month
+			, ch.from * 30 as from_dt
+			, ch.to * 30 as to_dt
+			, ch.*
+			, ci.title
+		from  tbl_db_health_checkup ch
+			left join  tbl_bf_family_baby fb
+				on fb.smc_no = #smc_no#
+			left join  tbl_code_item ci
+				on ci.val_1  = ch.health_tp
+					and ci.cg_cd ='BF_HEALTH_TP'
+		where smc_no = #smc_no#
+		and now() > date_add(fb.birthday,interval ch.to month)
+		order by recmnd_from_dt desc
+	</select>
+
+	<select id="select_bf_vac_schedule_list" resultClass="dataMap" parameterClass="dataMap">
         select  date_format(date_add(fb.birthday,interval dvs.start_label month),'%Y. %m. %d') recmnd_from_dt 
  		, date_format(date_add(fb.birthday,interval dvs.end_label month),'%Y. %m. %d') recmnd_to_dt
  		, date_format(date_add(fb.birthday,interval dvs.start_label month),'%Y년 %m월') recmnd_month 
@@ -383,8 +403,24 @@
         on dvs.dv_no = dv.dv_no
       left join  tbl_bf_family_baby fb
         on fb.smc_no = #smc_no#
+	   where date_add(fb.birthday,interval dvs.start_label month) >= now()
        order by  recmnd_from_dt , dvs.dv_no, dvs.round 
     </select>
+
+	<select id="select_bf_vac_schedule_list_prvs" resultClass="dataMap" parameterClass="dataMap">
+		select  date_format(date_add(fb.birthday,interval dvs.start_label month),'%Y. %m. %d') recmnd_from_dt
+			 , date_format(date_add(fb.birthday,interval dvs.end_label month),'%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
+			 , dvs.round
+		from  tbl_db_vac_schedule  dvs
+				  inner join tbl_db_vac dv
+							 on dvs.dv_no = dv.dv_no
+				  left join  tbl_bf_family_baby fb
+							 on fb.smc_no = #smc_no#
+		where now() > date_add(fb.birthday,interval dvs.end_label month)
+		order by  recmnd_from_dt , dvs.dv_no, dvs.round
+	</select>
     
     <select id="select_bf_health_noti_count" resultClass="dataMap" parameterClass="dataMap">
     	select 			

src/main/webapp/WEB-INF/views/ftl/m/bf_growth/health_checkup.ftl

@@ -10,6 +10,18 @@
     <script src="${URL_STATIC_ROOT}/m/js/design.js"></script>
     
 <body>
+    <script>
+        $(document).on("click", "#extend_btn", function() {
+            $(".pre_cont").toggle("fast", function() {
+                if($(this).is(':hidden')) {
+                    $("#prev_icon").text("▼");
+                }
+                else {
+                    $("#prev_icon").text("▲");
+                }
+            });
+        });
+    </script>
 
     <!-- wrap -->
     <div class="wrap wrap_nutrition">
@@ -85,8 +97,38 @@
 	                            </div>
 	                          </div>  
                             </#list>
-                         </#if> 
+                         </#if>
+                        <div class="prev_title" id="extend_btn">
+                            <div id="prev_icon" style="margin-right: 5px;">
+                                ▼
+                            </div>
+                            지난 건강검진
+                        </div>
+                        <div class="pre_cont" style="display: none;">
+                            <#if model['rm_health_chekcup_prvs']? has_content>
+                                <#list model['rm_health_chekcup_prvs'] as item>
+                                    <div class="list">
+                                        <!-- 날짜 -->
+                                        <div class="date">${item['recmnd_month']!}</div>
+                                        <!-- content -->
+                                        <div class="content">
+                                            <div class="title">${item['degree']!} ${item['title']!} (생후 ${item['from_dt']!} ~ ${item['to_dt']!}일)</div>
+                                            <div class="box">
+                                                <div class="box_title">검진 항목</div>
+                                                <div class="box_content">${item['checkup_contents']!}</div>
+                                            </div>
+                                            <div class="box">
+                                                <div class="box_title">권장일</div>
+                                                <div class="box_content">${item['recmnd_from_dt']!}~${item['recmnd_to_dt']!}</div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </#list>
+                            </#if>
+                        </div>
                     </div>
+
+
                    </div>
 		       </div>
           </div>
@@ -99,6 +141,9 @@
 	
 <#include "/m/bf_coach/include_return_url.ftl">
 
+    <script>
+
+    </script>
 </body>
  
 <#include "/m/include/index_bottom.ftl"> 

src/main/webapp/WEB-INF/views/ftl/m/bf_growth/vac_schedule.ftl

@@ -10,6 +10,18 @@
     <script src="${URL_STATIC_ROOT}/m/js/design.js"></script>
     
 <body>
+    <script>
+        $(document).on("click", "#extend_btn", function() {
+            $(".pre_cont").toggle("fast", function() {
+                if($(this).is(':hidden')) {
+                    $("#prev_icon").text("▼");
+                }
+                else {
+                    $("#prev_icon").text("▲");
+                }
+            });
+        });
+    </script>
 
     <!-- wrap -->
     <div class="wrap wrap_nutrition">
@@ -82,7 +94,31 @@
 	                            </div>
 	                          </div>  
                             </#list>
-                         </#if>  
+                         </#if>
+                        <div class="prev_title" id="extend_btn">
+                            <div id="prev_icon" style="margin-right: 5px;">
+                                ▼
+                            </div>
+                            지난 건강검진
+                        </div>
+                        <div class="pre_cont" style="display: none;">
+                            <#if model['rm_vac_schedule_prvs']? has_content>
+                                <#list model['rm_vac_schedule_prvs'] as item>
+                                    <div class="list">
+                                        <!-- 날짜 -->
+                                        <div class="date">${item['recmnd_month']!}</div>
+                                        <!-- content -->
+                                        <div class="content">
+                                            <div class="title">${item['dv_disease']!}</div>
+                                            <div class="box">
+                                                <div class="box_title">권장일</div>
+                                                <div class="box_content">${item['recmnd_from_dt']!}~${item['recmnd_to_dt']!}</div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </#list>
+                            </#if>
+                        </div>
                     </div> 
                   </div>
 		       </div>

src/main/webapp/m/css/style.css

@@ -15921,6 +15921,14 @@ main.sona_cont_measurement {
     margin-bottom: 40px;
 }
 
+.healthcheckup_list > .list:nth-child(1) .date {
+    border: 1px solid #FF9C01;
+}
+
+.healthcheckup_list > .list:nth-child(1) .content {
+    border: 1px solid #FF9C01;
+}
+
 .healthcheckup_list .date {
     display: flex;
     width: 100px;
@@ -15971,6 +15979,14 @@ main.sona_cont_measurement {
     font-weight: 400;
 }
 
+.healthcheckup_list .prev_title {
+    display: flex;
+    padding: 10px;
+    border: 1px solid #D2D2D2;
+    border-radius: 10px;
+    margin-bottom: 25px;
+    width: 100%;
+}
 
 /* 13-5.커뮤니티자유글-게시글 */
 .community_view01 {

src/main/webapp/m/html/bf_growth/11-6.아기건강-건강검진.html

@@ -13,6 +13,18 @@
 </head>
 
 <body>
+    <script>
+        $(document).on("click", "#extend_btn", function() {
+            $(".pre_cont").toggle("fast", function() {
+                if($(this).is(':hidden')) { 
+                    $("#prev_icon").text("▼");
+                }
+                else {
+                    $("#prev_icon").text("▲");
+                }
+            });
+        });
+    </script>
 
     <!-- wrap -->
     <div class="wrap wrap_nutrition">
@@ -114,6 +126,47 @@
                                 </div>
                             </div>
                         </div>
+
+                        <div class="prev_title" id="extend_btn">
+                            <div id="prev_icon" style="margin-right: 5px;">
+                                ▼
+                            </div>
+                            지난 건강검진
+                        </div>
+                        <div class="pre_cont">
+                            <div class="list">
+                                <!-- 날짜 -->
+                                <div class="date">2022년 1월</div>
+                                <!-- content -->
+                                <div class="content">
+                                    <div class="title">1차 건강검진 (생후 14 ~ 35일)</div>
+                                    <div class="box">
+                                        <div class="box_title">검진 항목</div>
+                                        <div class="box_content">문진 및 진찰, 신체계측, 건강 교육</div>
+                                    </div>
+                                    <div class="box">
+                                        <div class="box_title">권장일</div>
+                                        <div class="box_content">2022. 01. 14~2022. 02. 04</div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="list">
+                                <!-- 날짜 -->
+                                <div class="date">2022년 1월</div>
+                                <!-- content -->
+                                <div class="content">
+                                    <div class="title">1차 건강검진 (생후 14 ~ 35일)</div>
+                                    <div class="box">
+                                        <div class="box_title">검진 항목</div>
+                                        <div class="box_content">문진 및 진찰, 신체계측, 건강 교육</div>
+                                    </div>
+                                    <div class="box">
+                                        <div class="box_title">권장일</div>
+                                        <div class="box_content">2022. 01. 14~2022. 02. 04</div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                     <!-- //nutrition_subMain_graph_list -->
                     <!-- //nutrition_subMain_wrap -->
@@ -225,6 +278,7 @@
             var list = $(".nutrition_subMain_swiper .swiper-slide");
             list.height(equalHeight(list));
         })
+
     </script>
 
 </body>