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

IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs

@@ -3,6 +3,8 @@
 //	   生成时间 2023-06-01 13:38:20 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
+using IRaCIS.Core.Application.Helper;
+
 namespace IRaCIS.Core.Application.ViewModel
 {
     /// <summary> InternationalizationView  列表视图模型 </summary>
@@ -19,6 +21,32 @@ namespace IRaCIS.Core.Application.ViewModel
 
     }
 
+    public class InternationExportDTO
+    {
+        public Guid? Id { get; set; }
+
+        [DictionaryTranslateAttribute("InternationalizationKeyState")]
+        public int State { get; set; }
+        public string Description { get; set; } = string.Empty;
+        public string Code { get; set; } = string.Empty;
+        public string Value { get; set; } = string.Empty;
+        public string ValueCN { get; set; } = string.Empty;
+
+        public string FrontType { get; set; } = string.Empty;
+
+        [DictionaryTranslateAttribute("InternationalizationType")]
+        public int InternationalizationType { get; set; }
+        public string Module { get; set; } = string.Empty;
+        //关联版本历史记录表Id
+        public Guid? PublishLogId { get; set; }
+
+        public string Version { get; set; }
+
+        public DateTime CreateTime { get; set; }
+
+        public DateTime UpdateTime { get; set; }
+    }
+
     ///<summary>InternationalizationQuery  列表查询参数模型</summary>
     public class InternationalizationQuery : PageInput
     {
@@ -34,6 +62,14 @@ namespace IRaCIS.Core.Application.ViewModel
         //关联版本历史记录表Id
         public Guid? PublishLogId { get; set; }
 
+        public DateTime? BeginCreateTime { get; set; }
+
+        public DateTime? EndCreatTime { get; set; }
+
+        public DateTime? BeginUpdateTime { get; set; }
+
+        public DateTime? EndUpdateTime { get; set; }
+
     }
 
     ///<summary> InternationalizationAddOrEdit  列表查询参数模型</summary>

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

@@ -1304,7 +1304,11 @@ namespace IRaCIS.Core.Application.Service.Common
                 .WhereIf(inQuery.InternationalizationType != null, t => t.InternationalizationType == inQuery.InternationalizationType)
                 .WhereIf(inQuery.Value != null, t => t.Value.Contains(inQuery.Value))
                 .WhereIf(inQuery.ValueCN != null, t => t.ValueCN.Contains(inQuery.ValueCN))
-                .ProjectTo<InternationalizationView>(_mapper.ConfigurationProvider);
+                 .WhereIf(inQuery.BeginCreateTime != null, t => t.CreateTime >= inQuery.BeginCreateTime)
+                .WhereIf(inQuery.EndCreatTime != null, t => t.CreateTime <= inQuery.EndCreatTime)
+                 .WhereIf(inQuery.BeginUpdateTime != null, t => t.UpdateTime >= inQuery.BeginUpdateTime)
+                .WhereIf(inQuery.EndUpdateTime != null, t => t.UpdateTime <= inQuery.EndUpdateTime)
+                .ProjectTo<InternationExportDTO>(_mapper.ConfigurationProvider);
 
             var list = internationalizationQueryable.SortToListAsync(inQuery);
 
@@ -1312,7 +1316,7 @@ namespace IRaCIS.Core.Application.Service.Common
             exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
             exportInfo.CurrentTime = ExportExcelConverterDate.DateTimeInternationalToString(DateTime.Now, _userInfo.TimeZoneId);
 
-            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSCPImageUploadList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(InternationalizationView));
+            return await ExcelExportHelper.DataExportAsync(StaticData.Export.Internationalization_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(InternationExportDTO));
 
         }
 
@@ -1663,7 +1667,7 @@ namespace IRaCIS.Core.Application.Service.Common
                     if (judegeList.Count > 0)
                     {
 
-                        var maxFinishedJudge = judegeList.Where(t => t.ReadingTaskState == ReadingTaskState.HaveSigned).OrderByDescending(t=>t.VisitTaskNum).FirstOrDefault();
+                        var maxFinishedJudge = judegeList.Where(t => t.ReadingTaskState == ReadingTaskState.HaveSigned).OrderByDescending(t => t.VisitTaskNum).FirstOrDefault();
 
                         var maxNotFinishedJudge = judegeList.Where(t => t.ReadingTaskState != ReadingTaskState.HaveSigned).FirstOrDefault();
 
@@ -2260,7 +2264,7 @@ namespace IRaCIS.Core.Application.Service.Common
                     .GroupBy(t => new { t.SubjectId, t.SourceSubjectVisitId })
                     .Where(g => g.Count() == 2).Select(g => g.Key.SourceSubjectVisitId).Distinct().Count();
 
-                exportInfo.JudgeVisitCount = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingCategory == ReadingCategory.Judge ).Count();
+                exportInfo.JudgeVisitCount = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingCategory == ReadingCategory.Judge).Count();
 
                 //3、裁判认同数M：触发裁判的受试者访视中，阅片人被裁判认同的访视数量；
                 //4、总裁判数N：阅片人所阅的受试者访视中，触发裁判的访视数量；
@@ -2329,11 +2333,11 @@ namespace IRaCIS.Core.Application.Service.Common
                 //2、总样本量Q：R1,R2均完成阅片的阅片期数量；
 
                 exportInfo.ReadingPeriodCount = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingCategory == ReadingCategory.Global && t.ReadingTaskState == ReadingTaskState.HaveSigned)
-                    .GroupBy(t => new { t.SubjectId,  t.SouceReadModuleId })
+                    .GroupBy(t => new { t.SubjectId, t.SouceReadModuleId })
                     .Where(g => g.Count() == 2).Select(g => g.Key.SouceReadModuleId).Distinct().Count();
 
                 exportInfo.judgeReadingPeriodCount = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingCategory == ReadingCategory.Global && t.ReadingTaskState == ReadingTaskState.HaveSigned)
-                   .GroupBy(t => new { t.SubjectId,  t.SouceReadModuleId })
+                   .GroupBy(t => new { t.SubjectId, t.SouceReadModuleId })
                    .Where(g => g.Count() == 2 && g.Any(c => c.JudgeVisitTaskId != null)).Select(g => g.Key.SouceReadModuleId).Distinct().Count();
 
                 //3、裁判认同数J：触发裁判的阅片期中，阅片人被裁判认同的阅片期数量；
@@ -2342,7 +2346,7 @@ namespace IRaCIS.Core.Application.Service.Common
                 var doctor2List = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingTaskState == ReadingTaskState.HaveSigned)
                   .GroupBy(t => new { t.DoctorUserId, t.DoctorUser.UserName, t.DoctorUser.FullName })
                   //有全局裁判
-                  .Where(g => g.Any(t => t.ReadingCategory == ReadingCategory.Global && t.JudgeVisitTaskId != null))
+                  //.Where(g => g.Any(t => t.ReadingCategory == ReadingCategory.Global && t.JudgeVisitTaskId != null))
                   .Select(g => new DoctorJudgeRatio()
                   {
                       DoctorUserId = g.Key.DoctorUserId,

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

@@ -101,6 +101,10 @@ namespace IRaCIS.Core.Application.Service
                 .WhereIf(inQuery.InternationalizationType != null, t => t.InternationalizationType == inQuery.InternationalizationType)
                 .WhereIf(inQuery.Value != null, t => t.Value.Contains(inQuery.Value))
                 .WhereIf(inQuery.ValueCN != null, t => t.ValueCN.Contains(inQuery.ValueCN))
+                .WhereIf(inQuery.BeginCreateTime != null, t => t.CreateTime >= inQuery.BeginCreateTime)
+                .WhereIf(inQuery.EndCreatTime != null, t => t.CreateTime <= inQuery.EndCreatTime)
+                 .WhereIf(inQuery.BeginUpdateTime != null, t => t.UpdateTime >= inQuery.BeginUpdateTime)
+                .WhereIf(inQuery.EndUpdateTime != null, t => t.UpdateTime <= inQuery.EndUpdateTime)
                 .ProjectTo<InternationalizationView>(_mapper.ConfigurationProvider);
 
             var pageList = await internationalizationQueryable

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

@@ -67,6 +67,10 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<Internationalization, InternationalizationView>()
                  .ForMember(o => o.Version, t => t.MapFrom(u => u.PublishLog.Version));
+
+            CreateMap<Internationalization, InternationExportDTO>()
+               .ForMember(o => o.Version, t => t.MapFrom(u => u.PublishLog.Version));
+
             CreateMap<Internationalization, InternationalizationAddOrEdit>().ReverseMap();
 
             CreateMap<Internationalization, BatchInternationalizationDto>().ReverseMap();

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

@@ -352,7 +352,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string Content { get; set; }
 
-        public string ContentReplaced => Content.Replace("<br>", "").Replace("<br>", "").Replace("<br/>", "").Replace("<div style='text-indent: 20px;'>", "").Replace("</div>", "");
+        public string ContentReplaced => Content.Replace("<br>", "").Replace("<br/>", "").Replace("<div style='text-indent: 20px;'>", "")
+            .Replace("<div style='color: red'>", "").Replace("</div>", "").Replace("<div/>", "");
     }
 
 
@@ -1183,7 +1184,7 @@ namespace IRaCIS.Core.Application.Contracts
         public string JudgeRatioStr => TotalJudgeCount == 0 ? $"NA" : $"{Math.Round((decimal)JudgeAgreeCount * 100 / TotalJudgeCount, 2)}%";
 
 
-        public string ExceptionMark => TotalJudgeCount == 0 ? $"Y" : (JudgeAgreeCount * 3 / TotalJudgeCount < 1) ? "Y" : "N";
+        public string ExceptionMark => TotalJudgeCount == 0 ? $"NA" : (JudgeAgreeCount * 3 / TotalJudgeCount < 1) ? "Y" : "N";
 
     }