diff --git a/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java b/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java
index e41454f..e844183 100644
--- a/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java
+++ b/src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java
@@ -116,12 +116,6 @@ public class AnlsHstryService {
 				
 		PageImpl<AnlsHstryModel> result = query.listCntrlBasRs(rq, pageable);
 
-		for(AnlsHstryModel model : result){
-			if(model.getIdntfNum().contains("PALDRONE")){
-				model.setIdntfNum(model.getIdntfNum().substring(9));
-			}
-		}
-
 		long total = query.countCntrlBasRs(rq, cstmrSno);
 		long totalPage = total % rq.getRecord() > 0 ? (total/rq.getRecord()) + 1 : total/rq.getRecord();
 		response.setItems(result.getContent());
diff --git a/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java b/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java
index 88fc1ec..4a86879 100644
--- a/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java
+++ b/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java
@@ -83,10 +83,6 @@ public class BasDronService {
 
 		for(BasIdntfModel model : resultList){
 
-			if (model.getIdntfNum().contains("PALDRONE")) {
-				model.setIdntfNum(model.getIdntfNum().substring(9));
-			}
-
 			model.setHpno(EncryptUtils.decrypt(model.getHpno()));
 		}
 
@@ -194,7 +190,6 @@ public class BasDronService {
 			
 			BeanUtils.copyProperties(model , entity);
 
-			entity.setIdntfNum("PALDRONE-" + model.getIdntfNum());
 			entity.setHpno(hpno);
 			entity.setArcrftSno(rq.getArcrftSno());
 			entity.setCreateDt(DateUtils.nowDate());
diff --git a/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java b/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java
index e1f2727..20fb0a7 100644
--- a/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java
+++ b/src/main/java/com/palnet/biz/api/bas/flight/service/BasFlightService.java
@@ -161,11 +161,6 @@ public class BasFlightService {
             List<FltPlanArcrft> arcrft = fltPlanArcrftRepository.findByPlanSnoOrderByPlanArcrftSnoAsc(planSno);
             if (arcrft != null && !arcrft.isEmpty()) {
                 rs.setArcrftList(BasFlightMapper.mapper.entityToModelArcrftList(arcrft));
-                    for(FltPlanArcrft model : arcrft){
-                        if(model.getIdntfNum().contains("PALDRONE")){
-                            model.setIdntfNum(model.getIdntfNum().substring(9));
-                        }
-                    }
             }
         }
         return rs;
@@ -496,12 +491,6 @@ public class BasFlightService {
     public List<BasFlightPlanArcrftModel> listArcrftByGroup(String groupId) {
         List<BasFlightPlanArcrftModel> arcrftModels = fltPlanQueryRepository.listArcrft(groupId);
 
-        for(BasFlightPlanArcrftModel model : arcrftModels){
-            if(model.getIdntfNum().contains("PALDRONE")){
-                model.setIdntfNum(model.getIdntfNum().substring(9));
-            }
-        }
-
 //        List<ComArcrftBas> arcrftEntityList = comArcrftBasRepository.findByGroupIdOrderByArcrftSnoAsc(groupId);
 //        List<BasFlightPlanArcrftModel> arcrftModelList = BasFlightMapper.mapper.comArcrftEntityToModelArcrftList(arcrftEntityList);
         return arcrftModels;
diff --git a/src/main/java/com/palnet/biz/message/service/impl/MessageServiceImpl.java b/src/main/java/com/palnet/biz/message/service/impl/MessageServiceImpl.java
index eb0643f..e2c9aa4 100644
--- a/src/main/java/com/palnet/biz/message/service/impl/MessageServiceImpl.java
+++ b/src/main/java/com/palnet/biz/message/service/impl/MessageServiceImpl.java
@@ -141,7 +141,7 @@ public class MessageServiceImpl implements MessageService {
             CtrCntrlBas ctrCntrlBas = ctrCntrlJpaService.insertCtrCntrlBas(dbModel);
 
             // 비행 이력, 비행 계획서 mapping
-            if (model.getObjectId().indexOf("PALDRONE") > -1) {
+            if ("PA".equals(model.getObjectId().substring(0,2))) {
                 FltPlanCtrCntrlRel fltPlanCtrCntrlRel = new FltPlanCtrCntrlRel();
 
                 // 1. 식별 번호의 소유자 정보 저장.
@@ -175,13 +175,12 @@ public class MessageServiceImpl implements MessageService {
         }
 
         // Drone인 경우에만 history 생성
-        if (model.getObjectId().indexOf("PALDRONE") > -1) {
-            CtrCntrlHstry ctrCntrlHstry = ctrCntrlJpaService.insertCtrCntrlHstry(dbModel);
+        CtrCntrlHstry ctrCntrlHstry = ctrCntrlJpaService.insertCtrCntrlHstry(dbModel);
+
+        if(model.getTypeCd().equals("01") || model.getTypeCd().equals("99")) {
+            ctrCntrlJpaService.insertCtrCntrlHstryArea(dbModel, ctrCntrlHstry.getHstrySno());
+        }
 
-            if(model.getTypeCd().equals("01") || model.getTypeCd().equals("99")) {
-                ctrCntrlJpaService.insertCtrCntrlHstryArea(dbModel, ctrCntrlHstry.getHstrySno());
-            }    
-        }        
     }
 
     @Override