修改

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

@@ -1496,7 +1496,7 @@
             <param name="_userInfo"></param>
             <param name="_localizer"></param>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.TrialFinalRecordService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialFinalRecord},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
+        <member name="M:IRaCIS.Core.Application.Service.TrialFinalRecordService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialFinalRecord},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialFile},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
             <summary>
             项目定稿记录
             </summary>
@@ -1505,6 +1505,13 @@
             <param name="_userInfo"></param>
             <param name="_localizer"></param>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.TrialFinalRecordService.AddOrUpdateTrialFinalRecord(IRaCIS.Core.Application.ViewModel.TrialFinalRecordAddOrEdit)">
+            <summary>
+            新增或者修改文档
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.TrialFinalRecordService.AuthorizedTrialFinalRecord(IRaCIS.Core.Application.ViewModel.AuthorizedTrialFinalRecordInDto)">
             <summary>
             授权文档
@@ -1512,6 +1519,13 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.TrialFinalRecordService.DeleteTrialFinalRecord(System.Guid)">
+            <summary>
+            删除文档
+            </summary>
+            <param name="trialFinalRecordId"></param>
+            <returns></returns>
+        </member>
         <member name="T:IRaCIS.Core.Application.Service.TrialNormalRecordService">
             <summary>
             项目-一般文件记录
@@ -15877,6 +15891,21 @@
             跨项目复制
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.BasicTrialConfig.IsShowStudyName">
+            <summary>
+            是否显示检查名称
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.BasicTrialConfig.StudyNameList">
+            <summary>
+            检查名称列表
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialProcessConfig.ImageFormatList">
+            <summary>
+            图像格式
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Contracts.TrialProcessConfig.ClinicalInformationTransmissionEnum">
             <summary>
             临床信息传输 1：系统录入2：系统录入+PDF 0：无

IRaCIS.Core.Application/Service/Document/DTO/TrialFinalRecordViewModel.cs

@@ -33,6 +33,7 @@ public class TrialFinalRecordAddOrEdit
     public Guid? Id { get; set; }
 
 
+
     public bool IsAuthorizedView { get; set; }
 
     public string Name { get; set; }
@@ -48,7 +49,6 @@ public class TrialFinalRecordAddOrEdit
     public string Version { get; set; }
 
 
-
     /// <summary>
     /// 定稿PDF
     /// </summary>

IRaCIS.Core.Application/Service/Document/TrialFinalRecordService.cs

@@ -22,6 +22,7 @@ namespace IRaCIS.Core.Application.Service;
 /// <param name="_localizer"></param>
 [ApiExplorerSettings(GroupName = "FileRecord")]
 public class TrialFinalRecordService(IRepository<TrialFinalRecord> _trialFinalRecordRepository,
+    IRepository<TrialFile> _trialFileRepository,
                                   IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITrialFinalRecordService
 {
 
@@ -35,6 +36,7 @@ public class TrialFinalRecordService(IRepository<TrialFinalRecord> _trialFinalRe
             .WhereIf(inDto.Name.IsNotNullOrEmpty(),x=>x.Name.Contains(inDto.Name))
             .WhereIf(inDto.Version.IsNotNullOrEmpty(), x => x.Version.Contains(inDto.Version))
             .WhereIf(inDto.IsAuthorizedView!=null, x => x.IsAuthorizedView==inDto.IsAuthorizedView)
+           // .Include(x=>x.PDFFileRecord).Include(x => x.WordFileRecord).Include(x => x.SignFileRecord).Include(x => x.HistoryFileRecord)
             .ProjectTo<TrialFinalRecordView>(_mapper.ConfigurationProvider);
 
         var pageList = await trialFinalRecordQueryable.ToPagedListAsync(inDto);
@@ -43,22 +45,49 @@ public class TrialFinalRecordService(IRepository<TrialFinalRecord> _trialFinalRe
     }
 
 
-
+    /// <summary>
-    public async Task<IResponseOutput> AddOrUpdateTrialFinalRecord(TrialFinalRecordAddOrEdit addOrEditTrialFinalRecord)
+    /// 新增或者修改文档
+    /// </summary>
+    /// <param name="inDto"></param>
+    /// <returns></returns>
+    public async Task<IResponseOutput> AddOrUpdateTrialFinalRecord(TrialFinalRecordAddOrEdit inDto)
     {
         //  在此处拷贝automapper 映射
+        if (inDto.PDFFileRecord != null) inDto.PDFFileRecord.TrialFileTypeId = inDto.TrialFileTypeId;
+        if (inDto.WordFileRecord != null) inDto.WordFileRecord.TrialFileTypeId = inDto.TrialFileTypeId;
+        if (inDto.SignFileRecord != null) inDto.SignFileRecord.TrialFileTypeId = inDto.TrialFileTypeId;
+        if (inDto.HistoryFileRecord != null) inDto.HistoryFileRecord.TrialFileTypeId = inDto.TrialFileTypeId;
+
+       
        
 
         var verifyExp = new EntityVerifyExp<TrialFinalRecord>()
         {
-            VerifyExp = u => u.Name == addOrEditTrialFinalRecord.Name,
+            VerifyExp = u => u.Name == inDto.Name,
 
             // "当前类型启用的文件类型名称重复"
             VerifyMsg = _localizer["TrialFileType_NameRepeat"],
           
         };
+        if (inDto.Id != null)
+        {
+            var trialFinalRecord = await _trialFinalRecordRepository.Where(x => x.Id == inDto.Id.Value).FirstNotNullAsync();
+
+            List<Guid?> ids= new List<Guid?>() { 
+                trialFinalRecord.WordFileRecordId, 
+                trialFinalRecord.PDFFileRecordId,
+                trialFinalRecord.SignFileRecordId,
+                trialFinalRecord.HistoryFileRecordId
+
+            };
+
+            var fileIds = ids.Where(x => x != null).Select(x => (Guid)x).ToList();
+            await _trialFileRepository.BatchDeleteNoTrackingAsync(x => fileIds.Contains(x.Id));
+        }
+        var entity = await _trialFinalRecordRepository.InsertOrUpdateAsync(inDto, true);
+      
+        
 
-        var entity = await _trialFinalRecordRepository.InsertOrUpdateAsync(addOrEditTrialFinalRecord, true);
 
          return ResponseOutput.Ok(entity.Id.ToString());
 
@@ -76,7 +105,11 @@ public class TrialFinalRecordService(IRepository<TrialFinalRecord> _trialFinalRe
        return ResponseOutput.Ok();
     }
 
-
+    /// <summary>
+    /// 删除文档
+    /// </summary>
+    /// <param name="trialFinalRecordId"></param>
+    /// <returns></returns>
     [HttpDelete("{trialFinalRecordId:guid}")]
     public async Task<IResponseOutput> DeleteTrialFinalRecord(Guid trialFinalRecordId)
     {

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

@@ -3,6 +3,7 @@ using AutoMapper.EquivalencyExpression;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.ViewModel;
+using IRaCIS.Core.Infrastructure.Extention;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -107,7 +108,11 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<TrialFileType, TrialFileTypeAddOrEdit>().ReverseMap();
 
             CreateMap<TrialFinalRecord, TrialFinalRecordView>();
-            CreateMap<TrialFinalRecord, TrialFinalRecordAddOrEdit>().ReverseMap();
+            CreateMap<TrialFinalRecordAddOrEdit, TrialFinalRecord>();
+            //.ForMember(d => d.HistoryFileRecord.TrialFileTypeId, c => c.MapFrom(t => t.TrialFileTypeId))
+            //.ForMember(d => d.SignFileRecord.TrialFileTypeId, c => c.MapFrom(t => t.TrialFileTypeId))
+            //.ForMember(d => d.WordFileRecord.TrialFileTypeId, c => c.MapFrom(t => t.TrialFileTypeId))
+            //.ForMember(d => d.PDFFileRecord.TrialFileTypeId, c => c.MapFrom(t => t.TrialFileTypeId));
 
             CreateMap<TrialNormalRecord, TrialNormalRecordView>();
             CreateMap<TrialNormalRecord, TrialNormalRecordAddOrEdit>().ReverseMap();

IRaCIS.Core.Domain/FileRecord/TrialRecord.cs

@@ -152,6 +152,13 @@ public class TrialTrianingRecord : BaseFullAuditEntity
 public class TrialFile : BaseFullAuditEntity
 {
 
+    /// <summary>
+    /// TrialFinalRecord
+    /// </summary>
+    [JsonIgnore]
+    [ForeignKey("TrialFileTypeId")]
+    public TrialFileType TrialFileType { get; set; }
+
     [Comment("关联项目文件类型")]
     public Guid TrialFileTypeId { get; set; }
 

IRaCIS.Core.Infra.EFCore/EntityConfigration/TrialFileConfigration.cs

@@ -0,0 +1,30 @@
+using IRaCIS.Core.Domain.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+
+namespace IRaCIS.Core.Infra.EFCore.EntityConfigration
+{
+    //public class TrialFileConfigration : IEntityTypeConfiguration<TrialFinalRecord>
+    //{
+
+
+    //    public void Configure(EntityTypeBuilder<TrialFinalRecord> builder)
+    //    {
+    //     //   builder.HasOne(r => r.WordFileRecord)
+    //     //.WithOne(t => t.WordFileRecord)
+    //     //.HasForeignKey<TrialFile>(t => t.WordFileRecordId)
+    //     //.OnDelete(DeleteBehavior.Cascade);
+    //     //   builder.HasOne(r => r.PDFFileRecord).WithOne().HasForeignKey<TrialFile>(f => f.TrialFileTypeId);
+
+    //     //   builder.HasOne(r => r.WordFileRecord).WithOne().HasForeignKey<TrialFile>(f => f.TrialFileTypeId);
+
+    //     //   builder.HasOne(r => r.SignFileRecord).WithOne().HasForeignKey<TrialFile>(f => f.TrialFileTypeId);
+
+    //     //   builder.HasOne(r => r.HistoryFileRecord).WithOne().HasForeignKey<TrialFile>(f => f.TrialFileTypeId);
+
+    //    }
+    //}
+   
+
+}