Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Service/Common/ExcelExportService.cs

@@ -1840,8 +1840,11 @@ namespace IRaCIS.Core.Application.Service.Common
 
             list.Add(new ExportDocumentDes() { Code = StaticData.Export.CommonReadingDetail_Export, ExportCatogory = ExportResult.DetailedTableOfAssessmentResults });
 
+
+
             list.Add(new ExportDocumentDes() { Code = StaticData.Export.CommonJudgeReadingDetail_Export, ExportCatogory = ExportResult.DetailedTableOfAdjudicationResults });
 
+
             if (criterion.CriterionType == CriterionType.RECIST1Point1 || criterion.CriterionType == CriterionType.RECIST1Pointt1_MB
                       || criterion.CriterionType == CriterionType.IRECIST1Point1 || criterion.CriterionType == CriterionType.Lugano2014
                       || criterion.CriterionType == CriterionType.Lugano2014WithoutPET || criterion.CriterionType == CriterionType.PCWG3)
@@ -1849,6 +1852,10 @@ namespace IRaCIS.Core.Application.Service.Common
                 list.Add(new ExportDocumentDes() { Code = StaticData.Export.ReadingLession_Export, ExportCatogory = ExportResult.DetailedTableOfLesions });
             }
 
+            if (criterion.CriterionType == CriterionType.OCT)
+            {
+                list.Add(new ExportDocumentDes() { Code = StaticData.Export.OCT_ReadingLession_Export, ExportCatogory = ExportResult.OCT_ReadingLession_Export });
+            }
 
             switch (criterion.ArbitrationRule)
             {
@@ -1966,11 +1973,14 @@ namespace IRaCIS.Core.Application.Service.Common
             {
                 //病灶明细表
                 export_Template = StaticData.Export.ReadingLession_Export;
+
             }
 
+
             //病灶明细表 需要单独处理
-            if (inQuery.ReadingExportType != ExportResult.DetailedTableOfLesions)
+            if (inQuery.ReadingExportType != ExportResult.DetailedTableOfLesions && inQuery.ReadingExportType != ExportResult.OCT_ReadingLession_Export)
             {
+                //其他可以统一处理
                 list = await query.ProjectTo<CommonEvaluationExport>(_mapper.ConfigurationProvider,
                  new
                  {
@@ -1983,7 +1993,12 @@ namespace IRaCIS.Core.Application.Service.Common
             }
             else
             {
-                //其他可以统一处理
+                //病灶明细表
+                if (inQuery.ReadingExportType == ExportResult.OCT_ReadingLession_Export)
+                {
+                    export_Template = StaticData.Export.OCT_ReadingLession_Export;
+                }
+
                 var taskList = await query.ProjectTo<CommonLessionExport>(_mapper.ConfigurationProvider,
                  new
                  {
@@ -2055,10 +2070,16 @@ namespace IRaCIS.Core.Application.Service.Common
                             //有三部分组成  外层问题+ 没有配置病灶编号和类型+ 动态的表格问题
                             var dynamicLessionInfoList = addLessionInfoList.Union(dynamicPartialLessionInfoList).Union(item.QuestionAnswerList).ToList();
 
-                            var cloneItem = item.Clone();
-                            cloneItem.QuestionAnswerList = dynamicLessionInfoList;
+                            //OCT 多个表格，但是只导出一个表格,有的问题答案就是空的
+                            if (dynamicLessionInfoList.Count > 0)
+                            {
+
+                                var cloneItem = item.Clone();
+                                cloneItem.QuestionAnswerList = dynamicLessionInfoList;
+
+                                list.Add(cloneItem);
+                            }
 
-                            list.Add(cloneItem);
                         }
                     }
                     else

IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs

@@ -231,6 +231,9 @@ namespace IRaCIS.Core.Application.Contracts
         public DateTime? EarliestScanDate { get; set; }
         public DateTime? LatestScanDate { get; set; }
 
+        public string EarliestScanDateStr => EarliestScanDate?.ToString("yyyy-MM-dd") ?? string.Empty;
+        public string LatestScanDateStr => LatestScanDate?.ToString("yyyy-MM-dd") ?? string.Empty;
+
         public DateTime? SubmitTime { get; set; }
 
 
@@ -293,7 +296,7 @@ namespace IRaCIS.Core.Application.Contracts
         public string LatestReplyUserName { get; set; } = String.Empty;
 
         public string Content { get; set; } = string.Empty;
-        public string ContentReplaced => Content.Replace("<br>","").Replace("<br/>", "").Replace("<div style='margin-left:20px'>", "").Replace("</div>","");
+        public string ContentReplaced => Content.Replace("<br>", "").Replace("<br/>", "").Replace("<div style='margin-left:20px'>", "").Replace("</div>", "");
 
         [DictionaryTranslateAttribute("ChallengeIsClosed")]
         public bool IsClosed { get; set; }
@@ -377,7 +380,7 @@ namespace IRaCIS.Core.Application.Contracts
         //public bool IsUrgent { get; set; }
 
         //[ExcelColumn(Name = "FirstGiveMedicineTime", Format = "yyyy-MM-dd")]
-        public DateTime? FirstGiveMedicineTime { get; set; }
+        public DateOnly? FirstGiveMedicineTime { get; set; }
 
 
         public string FirstGiveMedicineTimeStr => FirstGiveMedicineTime?.ToString("yyyy-MM-dd");
@@ -740,6 +743,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         public DateTime? LatestScanDate { get; set; }
 
+        public string LatestScanDateStr => LatestScanDate?.ToString("yyyy-MM-dd") ?? string.Empty;
+
         public List<string> ModalityList { get; set; }
 
         public string Modalitys => string.Join(',', ModalityList);

IRaCIS.Core.Application/Service/QC/_MapConfig.cs

@@ -276,7 +276,7 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<ReadingTableAnswerRowInfo, CommonLessionInfo>()
                  .ForMember(o => o.LessionCode, t => t.MapFrom(u => u.RowMark))
                  .ForMember(o => o.LessionType, t => t.MapFrom(u => (int?)u.ReadingQuestionTrial.LesionType))
-                  .ForMember(o => o.LessionAnswerList, t => t.MapFrom(u => u.LesionAnswerList));
+                 .ForMember(o => o.LessionAnswerList, t => t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.ExportResultStr.Contains(((int)readingExportType).ToString()))));
 
             CreateMap<ReadingTableQuestionAnswer, CommonLessionQuestionAnswerInfo>()
                  .ForMember(o => o.LessionCode, t => t.MapFrom(u => u.Lesion.RowMark))

IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs

@@ -244,7 +244,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter))]
+        [TrialGlobalLimit("AfterStopCannNotOpt")]
         public async Task<IResponseOutput> AddOrUpdateReadingMedicineTrialQuestion(ReadingMedicineTrialQuestionAddOrEdit inDto)
         {
             var existsQuery = _readingMedicineTrialQuestionRepository

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs

@@ -88,7 +88,7 @@ namespace IRaCIS.Application.Contracts
 
         public string CriterionName { get; set; } = string.Empty;
 
-        public List<TrialObjectNameConfig> TrialObjectNameList { get; set; }
+        public List<TrialObjectNameConfig> TrialObjectNameList { get; set; } = new List<TrialObjectNameConfig>();
     }
 
     public class TrialModalitySelectDto

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs

@@ -88,11 +88,14 @@ namespace IRaCIS.Application.Contracts
         [ExcelFormat("yyyy-MM-dd")]
         public DateTime? RemoveTime { get; set; }
 
+        public string RemoveTimeStr=> RemoveTime?.ToString("yyyy-MM-dd") ?? string.Empty;
+
 
         //[ExporterHeader(Format = "yyyy-mm-DD")]
         [ExcelFormat("yyyy-MM-dd")]
         public DateTime? JoinTime { get; set; }
 
+        public string JoinTimeStr => JoinTime?.ToString("yyyy-MM-dd") ?? string.Empty;
 
         //[ExporterHeader(Format = "yyyy-mm-DD hh:mm:ss")]
         [ExcelFormat("yyyy-MM-dd HH:mm:ss")]