diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 053e3986..4e545ab0 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -1291,16 +1291,18 @@ namespace IRaCIS.Application.Services
                   
                 };
 
-                Dictionary<CriterionType, string> errorMsgDic = new Dictionary<CriterionType, string>()
-                            {
-                               {CriterionType.RECIST1Pointt1, _localizer["ReadingImage_Maxlesion", item.MaxRowCount.Value]},
-                            };
+              
                 string msg = string.Empty;
                 foreach (var item in tableQuestions)
                 {
+                 
                     var answer = inDto.AnswerList.Where(x => x.TableQuestionId == item.Id).Select(x => x.Answer).FirstOrDefault();
                     if (!answer.IsNullOrEmpty())
                     {
+                        Dictionary<CriterionType, string> errorMsgDic = new Dictionary<CriterionType, string>()
+                            {
+                               {CriterionType.RECIST1Pointt1, _localizer["ReadingImage_Maxlesion", item.MaxRowCount.Value]},
+                            };
                         var rowCount = 0;
                         if ((item.QuestionMark == QuestionMark.Part|| item.QuestionMark == QuestionMark.Organ) &&inDto.OrganInfoId!=null)
                         {
@@ -1309,13 +1311,21 @@ namespace IRaCIS.Application.Services
 
                             var orginInfos = await _organInfoRepository.Where(x => organIds.Contains(x.Id)).ToListAsync();
 
+                            List<OrganInfo?> orginInfoList = new List<OrganInfo?>();
+                            foreach (var organId in organIds)
+                            {
+                                orginInfoList.Add(orginInfos.Where(x=>x.Id==organId).FirstOrDefault());
+                            }
+
+                            var currentOrginInfo = orginInfos.Where(x => x.Id == inDto.OrganInfoId).FirstOrDefault()??new OrganInfo ();
+
                             if (item.QuestionMark == QuestionMark.Part)
                             {
-                                rowCount = orginInfos.Select(x => x.Part).Distinct().Count();
+                                rowCount = orginInfoList.Where(x=>x.Part== currentOrginInfo.Part).Count();
                             }
                             else
                             {
-                                rowCount = orginInfos.Select(x => x.TULOC).Distinct().Count();
+                                rowCount = orginInfoList.Where(x => x.TULOC == currentOrginInfo.TULOC).Count();
                             }
 
                             if (rowCount > item.MaxRowCount.Value)