Merge commit '0cd99c47816eed890d777a6773591838f573e769' into develop

pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java

@@ -2658,7 +2658,8 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
 				.where(
 						fpb.aprvlYn.eq("Y"),
 						fpccr.planSno.isNull(),
-						ccb.cntrlEndDt.between(start, end),
+						ccb.statusCd.isNull(),
+						ccb.cntrlId.isNull(),
 						fpb.aprvlDt.between(start, end)
 				)
 				.fetch();