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

IRaCIS.Core.Application/IRaCIS.Core.Application.csproj

@@ -58,24 +58,24 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.13.0" />
+		<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
 		<PackageReference Include="DocX" Version="3.0.1" />	
 		<PackageReference Include="FreeSpire.Doc" Version="12.2.0" />
 		<PackageReference Include="Hangfire.Core" Version="1.8.14" />
 		<PackageReference Include="Castle.Core.AsyncInterceptor" Version="2.1.0" />
 		<PackageReference Include="EasyCaching.Redis" Version="1.9.2" />
 		<PackageReference Include="EasyCaching.InMemory" Version="1.9.2" />
-		<PackageReference Include="ExcelDataReader" Version="3.6.0" />
-		<PackageReference Include="ExcelDataReader.DataSet" Version="3.6.0" />
+		<PackageReference Include="ExcelDataReader" Version="3.7.0" />
+		<PackageReference Include="ExcelDataReader.DataSet" Version="3.7.0" />
 		<PackageReference Include="DistributedLock.Redis" Version="1.0.3" />
-		<PackageReference Include="DistributedLock.SqlServer" Version="1.0.4" />
+		<PackageReference Include="DistributedLock.SqlServer" Version="1.0.5" />
 		<PackageReference Include="fo-dicom" Version="5.1.3" />
 		<PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.1.3" />
-		<PackageReference Include="fo-dicom.Codecs" Version="5.14.4" />
+		<PackageReference Include="fo-dicom.Codecs" Version="5.14.5" />
 		<PackageReference Include="IP2Region.Net" Version="2.0.2" />
 		<PackageReference Include="MailKit" Version="4.2.0" />
 		<PackageReference Include="MimeKit" Version="4.2.0" />
-		<PackageReference Include="MiniExcel" Version="1.32.0" />
+		<PackageReference Include="MiniExcel" Version="1.34.1" />
 		<PackageReference Include="Minio" Version="6.0.3" />
 		<PackageReference Include="MiniWord" Version="0.8.0" />
 		<PackageReference Include="My.Extensions.Localization.Json" Version="3.3.0">

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -523,6 +523,25 @@
             系统模板文档配置表   
             </summary>	
         </member>
+        <member name="T:IRaCIS.Core.Application.Service.Common.DevelopService">
+            <summary>
+             开始时候一些帮助 比如根据配置的字典生成枚举
+            </summary>
+            <param name="_dictionaryRepository"></param>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.Common.DevelopService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary})">
+            <summary>
+             开始时候一些帮助 比如根据配置的字典生成枚举
+            </summary>
+            <param name="_dictionaryRepository"></param>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.Common.DevelopService.BackDicGenerateEnum(System.String)">
+            <summary>
+            根据配置的字典名生成后端枚举
+            </summary>
+            <param name="dicName"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.Common.ExcelExportService.TrialUserListExport(IRaCIS.Application.Contracts.TrialMaintenanceExportQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CommonDocument},IRaCIS.Application.Interfaces.IDictionaryService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser})">
             <summary>
             项目参与人员导出
@@ -15359,6 +15378,13 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Application.Services.ReadModuleService.GetReadModuleList_new(IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleDto)">
+            <summary>
+            用ef 实现之前视图的功能
+            </summary>
+            <param name="inQuery"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Application.Services.ReadModuleService.GetReadModuleList(IRaCIS.Core.Application.Service.Reading.Dto.GetReadModuleDto)">
             <summary>
             获取读片模块  //加了标准参数

IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs

@@ -1,4 +1,5 @@
 using IRaCIS.Core.Domain.Share;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -263,13 +264,20 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public string? TrialSiteCode { get; set; }
 
-        public string? SiteCode { get; set; }
 
         public Guid? TrialSiteId { get; set; }
 
         public Guid? SubjectId { get; set; }
 
-        public List<ReadModuleView> Data { get; set; }
+        public List<ReadModuleView> Data { get; set; } = new List<ReadModuleView>();
+
+        //public List<ReadModuleView> Data => VisitData.Union(ReadMouduleData).ToList();
+
+
+        [JsonIgnore]
+        public List<ReadModuleView> VisitData { get; set; } = new List<ReadModuleView>();
+        [JsonIgnore]
+        public List<ReadModuleView> ReadMouduleData { get; set; } = new List<ReadModuleView>();
 
     }
 

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

@@ -164,8 +164,8 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<Domain.Models.Trial, TrialConfigDTO>().ForMember(t => t.TrialId, u => u.MapFrom(c => c.Id))
                     .ForMember(t => t.TrialCriterionIds, u => u.MapFrom(c => c.TrialReadingCriterionList.Where(v => v.IsConfirm).OrderBy(x => x.ShowOrder).Select(r => r.Id)))
                     .ForMember(t => t.TrialCriterionNames, u => u.MapFrom(c => c.TrialReadingCriterionList.Where(v => v.IsConfirm).OrderBy(x => x.ShowOrder).Select(r => r.CriterionName)))
-                    .ForMember(t => t.ClinicalDataTrialSetIds, u => u.MapFrom(c => c.clinicalDataTrialSets.Where(v => v.IsConfirm).Select(r => r.Id)))
-                    .ForMember(t => t.ClinicalDataSetNames, u => u.MapFrom(c => c.clinicalDataTrialSets.Where(v => v.IsConfirm).Select(r => isEn_Us ? r.ClinicalDataSetEnName : r.ClinicalDataSetName)))
+                    .ForMember(t => t.ClinicalDataTrialSetIds, u => u.MapFrom(c => c.ClinicalDataTrialSetList.Where(v => v.IsConfirm).Select(r => r.Id)))
+                    .ForMember(t => t.ClinicalDataSetNames, u => u.MapFrom(c => c.ClinicalDataTrialSetList.Where(v => v.IsConfirm).Select(r => isEn_Us ? r.ClinicalDataSetEnName : r.ClinicalDataSetName)))
                     //.ForMember(t => t.CriterionIds, u => u.MapFrom(c => c.TrialDicList.Where(v => v.KeyName == StaticData.Criterion).Select(r => r.DictionaryId)))
                     ;
             CreateMap<Domain.Models.Trial, TrialSubjectConfig>();