diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
index f2de7e2d3..c070055e1 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
@@ -188,7 +188,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         public async Task<string> GetVisitReadReportUrl(CaGetVisitReadReportUrl inDto)
         {
             var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Include(x => x.Subject).Include(x => x.SourceSubjectVisit).FirstNotNullAsync();
-            if (taskinfo.ReportExportUrl != string.Empty)
+            var iscache = false;
+            if (iscache && taskinfo.ReportExportUrl != string.Empty)
             {
                 return taskinfo.ReportExportUrl;
             }
@@ -242,7 +243,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         public async Task<string> GetTumorEvaluationReportUrl(CaGetVisitReadReportUrl inDto)
         {
             var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Include(x => x.Subject).Include(x => x.SourceSubjectVisit).FirstNotNullAsync();
-            if (taskinfo.TumorEvaluationUrl != string.Empty)
+            var iscache = false;
+            if (iscache&&taskinfo.TumorEvaluationUrl != string.Empty)
             {
                 return taskinfo.TumorEvaluationUrl;
             }
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
index 1d0929520..98b07fd7f 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
@@ -1374,8 +1374,21 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                         foreach (var item in recistTableAnswers)
                         {
+                            var rowinfo = tableRowAnswers.Where(y => y.OriginalId == item.RowId).FirstOrDefault();
+                            if (rowinfo != null)
+                            {
+                                item.QuestionId = rowinfo.QuestionId;
 
-                            item.QuestionId = tableRowAnswers.Where(y => y.OriginalId == item.RowId).Select(x => x.QuestionId).FirstOrDefault();
+                                var IslymphNode= recistTableAnswers.Where(x=>x.RowId== rowinfo.Id&&x.QuestionMark==QuestionMark.IsLymph).Select(x=>x.Answer).FirstIsNullReturnEmpty().EqEnum(YesOrNoOrNa.Yes);
+                                var minorAxis= recistTableAnswers.Where(x => x.RowId == rowinfo.Id && x.QuestionMark == QuestionMark.ShortAxis).Select(x => x.Answer).FirstIsNullReturnEmpty().IsNullOrEmptyReturn0();
+                                
+                                var iSbetween15and20= minorAxis >= 15 && minorAxis < 20;
+                                if (item.QuestionMark == QuestionMark.State && IslymphNode && iSbetween15and20 && rowinfo.LesionType == LesionType.TargetLesion)
+                                {
+                                    item.Answer = string.Empty;
+                                }
+                            }
+                          
 
                             item.TableQuestionId = tableQuestionList.Where(x => x.ReadingQuestionId == item.QuestionId && x.QuestionMark == item.QuestionMark).Select(x => x.Id).FirstOrDefault();
                         }
@@ -1386,6 +1399,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                         {
 
                         };
+                     
                         var tableAnswers = recistTableAnswers.Select(x => new ReadingTableQuestionAnswer
                         {
                             Id = NewId.NextGuid(),
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
index 645770dad..4b29cd984 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
@@ -1208,7 +1208,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                 var visitIds = siteVisitForTumorList.Select(x => x.SubjectVisitId).ToList();
                 // Dicom 用NM  非dicom 用骨扫描 (BoneScan)
-                List<VisitStudyTime> visitStudies = await _dicomStudyRepository.Where(x => visitIds.Contains(x.SubjectVisitId) && x.ModalityForEdit == "BoneScan").Select(x => new VisitStudyTime()
+                List<VisitStudyTime> visitStudies = await _dicomStudyRepository.Where(x => visitIds.Contains(x.SubjectVisitId)/* && x.ModalityForEdit == "BoneScan"*/).Select(x => new VisitStudyTime()
                 {
                     SubjectVisitId = x.SubjectVisitId,
                     StudyTime = x.StudyTime
@@ -1216,7 +1216,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 }).ToListAsync();
 
                 visitStudies.AddRange(
-                    await _noneDicomStudyRepository.Where(x => visitIds.Contains(x.SubjectVisitId) && x.Modality == "BoneScan").Select(x => new VisitStudyTime()
+                    await _noneDicomStudyRepository.Where(x => visitIds.Contains(x.SubjectVisitId) /*&& x.Modality == "BoneScan"*/).Select(x => new VisitStudyTime()
                     {
                         SubjectVisitId = x.SubjectVisitId,
                         StudyTime = x.ImageDate