diff --git a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java
index a5fa988..33494a9 100644
--- a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java
+++ b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java
@@ -256,7 +256,7 @@ public class CtrCntrlQueryRepository{
 				
 		return result;
 	}
-public List<AnlsHstryModel> cntrlBasNormalList(AnlsHstryRqModel rq, String idntfNum){
+public List<AnlsHstryModel> cntrlBasNormalHstryList(AnlsHstryGroupModel rq, String idntfNum){
 		
 		QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas;
 		QCtrCntrlHstryArea qCntrlHstryAreaEntity = QCtrCntrlHstryArea.ctrCntrlHstryArea;
@@ -349,7 +349,100 @@ public List<AnlsHstryModel> cntrlBasNormalList(AnlsHstryRqModel rq, String idntf
 		return result;
 	}
 
-	public List<AnlsHstryModel> cntrlBasNormalPlanList(AnlsHstryRqModel rq, int planSno){
+	public List<AnlsHstryModel> cntrlBasNormalList(AnlsHstryRqModel rq, String idntfNum){
+		
+		QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas;
+		QCtrCntrlHstryArea qCntrlHstryAreaEntity = QCtrCntrlHstryArea.ctrCntrlHstryArea;
+		
+		BooleanBuilder builder = new BooleanBuilder();
+		
+		log.debug("Params ===> " +rq.toString());
+		Calendar end = Calendar.getInstance(); 
+		end.setTime(DateUtils.stringToDate(rq.getEndDate()));
+		end.add(Calendar.DATE, 1);
+		Date endDate = end.getTime();
+		builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate())));
+		builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate));
+		
+		builder.and(qCntrlBasEntity.statusCd.eq("99"));
+		builder.and(qCntrlBasEntity.idntfNum.eq(idntfNum));
+		if(!StringUtils.isEmpty(rq.getSearch1())) {
+			builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%"));
+		}
+	
+		ArrayList<AnlsHstryModel> result = new ArrayList<AnlsHstryModel>();
+	
+		List<AnlsHstryModel> queryList = query.select(Projections.bean(AnlsHstryModel.class , 
+				qCntrlBasEntity.cntrlId,
+				qCntrlBasEntity.idntfNum,
+				qCntrlBasEntity.statusCd,
+				qCntrlBasEntity.objectTypeCd,
+				qCntrlBasEntity.flghtStDt,
+				qCntrlBasEntity.flghtEndDt,
+				qCntrlBasEntity.cntrlStDt,
+				qCntrlBasEntity.cntrlEndDt,
+				qCntrlBasEntity.ttlTime,
+				qCntrlBasEntity.ttlTimeType,
+				qCntrlBasEntity.ttlDstnc,
+				qCntrlBasEntity.ttlDstncType,
+				qCntrlBasEntity.avrgSpeed,
+				qCntrlBasEntity.avrgSpeedType,
+				qCntrlBasEntity.bttrCnsmptn,
+				qCntrlBasEntity.endTypeCd,
+				qCntrlBasEntity.createDt,
+				qCntrlBasEntity.updateDt,
+				qCntrlHstryAreaEntity.actnType,
+				qCntrlHstryAreaEntity.area1,
+				qCntrlHstryAreaEntity.area2,
+				qCntrlHstryAreaEntity.area3,
+				qCntrlHstryAreaEntity.areaNm,
+				qCntrlHstryAreaEntity.areaType,
+				qCntrlHstryAreaEntity.landNm,
+				qCntrlHstryAreaEntity.landNum,
+				qCntrlHstryAreaEntity.zipCd
+				
+				
+				))
+				.from(qCntrlBasEntity)
+				.leftJoin(qCntrlHstryAreaEntity)
+				.on(qCntrlBasEntity.cntrlId.eq(qCntrlHstryAreaEntity.cntrlId))
+				.on(qCntrlHstryAreaEntity.actnType.eq("01"))
+				.where(builder)
+				.orderBy(qCntrlBasEntity.cntrlStDt.asc())
+				.fetch();
+		
+		for(AnlsHstryModel model: queryList) {
+			String addr = "";
+			
+			if(!StringUtils.isEmpty(model.getArea1())) {
+				addr = addr + " " + model.getArea1();
+			}
+			
+			if(!StringUtils.isEmpty(model.getArea2())) {
+				addr = addr + " " + model.getArea2();
+			}
+			
+			if(!StringUtils.isEmpty(model.getArea3())) {
+				addr = addr + " " + model.getArea3();
+			}
+			
+			if(!StringUtils.isEmpty(model.getLandNm())) {
+				addr = addr + " " + model.getLandNm();
+			}
+			
+			if(!StringUtils.isEmpty(model.getLandNum())) {
+				addr = addr + " " + model.getLandNum();
+			}
+			model.setStArea(addr);
+			result.add(model);
+		}
+
+		
+				
+		return result;
+	}
+
+	public List<AnlsHstryModel> cntrlBasNormalPlanHstryList(AnlsHstryGroupModel rq, int planSno){
 		
 		QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas;
 		QCtrCntrlHstryArea qCntrlHstryAreaEntity = QCtrCntrlHstryArea.ctrCntrlHstryArea;
@@ -444,6 +537,103 @@ public List<AnlsHstryModel> cntrlBasNormalList(AnlsHstryRqModel rq, String idntf
 				
 		return result;
 	}
+	
+public List<AnlsHstryModel> cntrlBasNormalPlanList(AnlsHstryRqModel rq, int planSno){
+		
+		QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas;
+		QCtrCntrlHstryArea qCntrlHstryAreaEntity = QCtrCntrlHstryArea.ctrCntrlHstryArea;
+		QFltPlanCtrCntrlRel qFltPlanCtrCntrlRelEntity = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel;
+		
+		BooleanBuilder builder = new BooleanBuilder();
+		
+		log.debug("Params ===> " +rq.toString());
+		Calendar end = Calendar.getInstance(); 
+		end.setTime(DateUtils.stringToDate(rq.getEndDate()));
+		end.add(Calendar.DATE, 1);
+		Date endDate = end.getTime();
+		builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate())));
+		builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate));
+		
+		builder.and(qFltPlanCtrCntrlRelEntity.planSno.eq(planSno));
+		builder.and(qCntrlBasEntity.statusCd.eq("99"));
+		if(!StringUtils.isEmpty(rq.getSearch1())) {
+			builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%"));
+		}
+	
+		ArrayList<AnlsHstryModel> result = new ArrayList<AnlsHstryModel>();
+	
+		List<AnlsHstryModel> queryList = query.select(Projections.bean(AnlsHstryModel.class , 
+				qCntrlBasEntity.cntrlId,
+				qCntrlBasEntity.idntfNum,
+				qCntrlBasEntity.statusCd,
+				qCntrlBasEntity.objectTypeCd,
+				qCntrlBasEntity.flghtStDt,
+				qCntrlBasEntity.flghtEndDt,
+				qCntrlBasEntity.cntrlStDt,
+				qCntrlBasEntity.cntrlEndDt,
+				qCntrlBasEntity.ttlTime,
+				qCntrlBasEntity.ttlTimeType,
+				qCntrlBasEntity.ttlDstnc,
+				qCntrlBasEntity.ttlDstncType,
+				qCntrlBasEntity.avrgSpeed,
+				qCntrlBasEntity.avrgSpeedType,
+				qCntrlBasEntity.bttrCnsmptn,
+				qCntrlBasEntity.endTypeCd,
+				qCntrlBasEntity.createDt,
+				qCntrlBasEntity.updateDt,
+				qCntrlHstryAreaEntity.actnType,
+				qCntrlHstryAreaEntity.area1,
+				qCntrlHstryAreaEntity.area2,
+				qCntrlHstryAreaEntity.area3,
+				qCntrlHstryAreaEntity.areaNm,
+				qCntrlHstryAreaEntity.areaType,
+				qCntrlHstryAreaEntity.landNm,
+				qCntrlHstryAreaEntity.landNum,
+				qCntrlHstryAreaEntity.zipCd
+				
+				
+				))
+				.from(qCntrlBasEntity)
+				.leftJoin(qCntrlHstryAreaEntity)
+				.on(qCntrlBasEntity.cntrlId.eq(qCntrlHstryAreaEntity.cntrlId))
+				.on(qCntrlHstryAreaEntity.actnType.eq("01"))
+				.leftJoin(qFltPlanCtrCntrlRelEntity)
+				.on(qCntrlBasEntity.cntrlId.eq(qFltPlanCtrCntrlRelEntity.cntrlId))
+				.where(builder)
+				.orderBy(qCntrlBasEntity.cntrlStDt.asc())
+				.fetch();
+		
+		for(AnlsHstryModel model: queryList) {
+			String addr = "";
+			
+			if(!StringUtils.isEmpty(model.getArea1())) {
+				addr = addr + " " + model.getArea1();
+			}
+			
+			if(!StringUtils.isEmpty(model.getArea2())) {
+				addr = addr + " " + model.getArea2();
+			}
+			
+			if(!StringUtils.isEmpty(model.getArea3())) {
+				addr = addr + " " + model.getArea3();
+			}
+			
+			if(!StringUtils.isEmpty(model.getLandNm())) {
+				addr = addr + " " + model.getLandNm();
+			}
+			
+			if(!StringUtils.isEmpty(model.getLandNum())) {
+				addr = addr + " " + model.getLandNum();
+			}
+			model.setStArea(addr);
+			result.add(model);
+		}
+	
+		
+				
+		return result;
+	}
+
 	@Cacheable(value = "cntrl-count")
 	public long countCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSno) {
 		QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas;
@@ -484,7 +674,7 @@ public List<AnlsHstryModel> cntrlBasNormalList(AnlsHstryRqModel rq, String idntf
 
 
 	@Cacheable(value = "cntrl-list")
-	public PageImpl<AnlsHstryRsModel> listCntrlBasRs(AnlsHstryGroupModel rq, Pageable pageable){
+	public PageImpl<AnlsHstryModel> listCntrlBasRs(AnlsHstryGroupModel rq, Pageable pageable){
 		QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas;
 		QComIdntfBas qComIdntfBasEntity = QComIdntfBas.comIdntfBas;
 		QComArcrftBas qComArcrftBasEntity = QComArcrftBas.comArcrftBas;
@@ -505,11 +695,12 @@ public List<AnlsHstryModel> cntrlBasNormalList(AnlsHstryRqModel rq, String idntf
 			builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%"));
 		}
 		
-		List<AnlsHstryRsModel> queryList = query.select(
-				Projections.bean(AnlsHstryRsModel.class ,
+		List<AnlsHstryModel> queryList = query.select(
+				Projections.bean(AnlsHstryModel.class ,
 						qCntrlBasEntity.cntrlId,
 						qCntrlBasEntity.idntfNum,
 						qCntrlBasEntity.cntrlStDt,
+						qCntrlBasEntity.cntrlEndDt,
 						qCntrlHstryAreaEntity.area1,
 						qCntrlHstryAreaEntity.area2,
 						qCntrlHstryAreaEntity.area3,
@@ -529,9 +720,9 @@ public List<AnlsHstryModel> cntrlBasNormalList(AnlsHstryRqModel rq, String idntf
 				.limit(pageable.getPageSize())
 				.fetch();
 		
-		List<AnlsHstryRsModel> result = new ArrayList<>();
+		List<AnlsHstryModel> result = new ArrayList<>();
 		
-		for(AnlsHstryRsModel model: queryList) {
+		for(AnlsHstryModel model: queryList) {
 			String addr = "";
 			
 			if(!StringUtils.isEmpty(model.getArea1())) {