一致性核查文件名修改

IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

@@ -772,7 +772,7 @@ namespace IRaCIS.Core.API.Controllers
 
                 (serverFilePath, relativePath) = FileStoreHelper.GetTrialCheckFilePath(_hostEnvironment, fileName, trialId);
 
-                await _repository.AddAsync(new ConsistencyCheckFile()
+                await _repository.AddAsync(new UserUploadFile()
                 {
                     TrialId = trialId,
                     CreateTime = DateTime.Now,

IRaCIS.Core.API/IRaCIS.Core.API.xml

@@ -212,6 +212,13 @@
         <member name="M:IRaCIS.Core.API.Controllers.StudyController.ArchiveStudyNew(System.Guid,System.Guid,System.String,System.Nullable{System.Guid},System.Guid,Microsoft.Extensions.Logging.ILogger{IRaCIS.Core.API.Controllers.UploadDownLoadController},EasyCaching.Core.IEasyCachingProvider,IRaCIS.Core.Application.Contracts.IStudyService,Microsoft.AspNetCore.SignalR.IHubContext{IRaCIS.Core.API.UploadHub,IRaCIS.Core.API.IUploadClient},IRaCIS.Core.Application.Contracts.Dicom.IDicomArchiveService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.StudyMonitor})">
             <summary>Dicom 归档</summary>
         </member>
+        <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadNoneDicomFile(IRaCIS.Core.API.Controllers.StudyController.UploadNoneDicomFileCommand,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudy},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.StudyMonitor})">
+            <summary>
+            上传非Dicom 文件 支持压缩包 多文件上传
+            </summary>
+            <param name="_noneDicomStudyRepository"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.API.Controllers.StudyController.UploadVisitCheckExcel(System.Guid)">
             <summary>
             一致性核查 excel上传 支持三种格式

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

@@ -9251,37 +9251,37 @@
             受试者ID
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetConsistencyCheckFileDto.FileName">
+        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetUserUploadFileDto.FileName">
             <summary>
             文件名称
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetConsistencyCheckFileDto.FilePath">
+        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetUserUploadFileDto.FilePath">
             <summary>
             文件路径
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetConsistencyCheckFileDto.RelativePath">
+        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetUserUploadFileDto.RelativePath">
             <summary>
             相对路径
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetConsistencyCheckFileDto.CreateUserId">
+        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetUserUploadFileDto.CreateUserId">
             <summary>
             创建人
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetConsistencyCheckFileDto.CreateTime">
+        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetUserUploadFileDto.CreateTime">
             <summary>
             创建时间
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetConsistencyCheckFileDto.TrialId">
+        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetUserUploadFileDto.TrialId">
             <summary>
             项目ID
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetConsistencyCheckFileDto.CreateUserName">
+        <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetUserUploadFileDto.CreateUserName">
             <summary>
             创建者名称
             </summary>
@@ -10412,7 +10412,7 @@
             <param name="trialId"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Image.QA.QCListService.GetConsistencyCheckFile(IRaCIS.Core.Application.Contracts.DTO.GetConsistencyCheckFileInDto)">
+        <member name="M:IRaCIS.Core.Application.Image.QA.QCListService.GetUserUploadFile(IRaCIS.Core.Application.Contracts.DTO.GetUserUploadFileInDto)">
             <summary>
             获取一致性核查文件上传记录
             </summary>

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

@@ -129,7 +129,7 @@ namespace IRaCIS.Core.Application.Contracts.DTO
     }
 
 
-    public class GetConsistencyCheckFileDto/*: ConsistencyCheckFile*/
+    public class GetUserUploadFileDto/*: UserUploadFile*/
     {
         /// <summary>
 		/// 文件名称
@@ -170,7 +170,7 @@ namespace IRaCIS.Core.Application.Contracts.DTO
     }
 
 
-     public class GetConsistencyCheckFileInDto
+     public class GetUserUploadFileInDto
     {
         public Guid TrialId { get; set; }
 

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

@@ -19,7 +19,7 @@ namespace IRaCIS.Core.Application.Image.QA
         private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSet;
         private readonly IRepository<TrialQCQuestionAnswer> _trialQCQuestionAnswerRepository;
         private readonly IRepository<TrialQCQuestion> _trialQCQuestionRepository;
-        private readonly IRepository<ConsistencyCheckFile> _consistencyCheckFileRepository;
+        private readonly IRepository<UserUploadFile> _UserUploadFileRepository;
 
         private IReadingImageTaskService _IReadingImageTaskService;
 
@@ -30,14 +30,14 @@ namespace IRaCIS.Core.Application.Image.QA
               IRepository<TrialQCQuestionAnswer> trialQCQuestionAnswerRepository,
               IRepository<TrialQCQuestion> trialQCQuestionRepository,
               IReadingImageTaskService IReadingImageTaskService,
-             IRepository<ConsistencyCheckFile> consistencyCheckFileRepository
+             IRepository<UserUploadFile> UserUploadFileRepository
             )
         {
             this._IReadingImageTaskService = IReadingImageTaskService;
             _subjectVisitRepository = subjectVisitRepository;
             this._trialQCQuestionAnswerRepository = trialQCQuestionAnswerRepository;
             this._trialQCQuestionRepository = trialQCQuestionRepository;
-            this._consistencyCheckFileRepository = consistencyCheckFileRepository;
+            this._UserUploadFileRepository = UserUploadFileRepository;
             _trialRepository = trialRepository;
             this._clinicalDataTrialSet = clinicalDataTrialSet;
         }
@@ -849,10 +849,10 @@ namespace IRaCIS.Core.Application.Image.QA
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public async Task<PageOutput<GetConsistencyCheckFileDto>> GetConsistencyCheckFile(GetConsistencyCheckFileInDto indto)
+        public async Task<PageOutput<GetUserUploadFileDto>> GetUserUploadFile(GetUserUploadFileInDto indto)
         {
-            var query = _repository.Where<ConsistencyCheckFile>(t => t.TrialId == indto.TrialId)
+            var query = _repository.Where<UserUploadFile>(t => t.TrialId == indto.TrialId)
-             .ProjectTo<GetConsistencyCheckFileDto>(_mapper.ConfigurationProvider);
+             .ProjectTo<GetUserUploadFileDto>(_mapper.ConfigurationProvider);
 
             return await query.ToPagedListAsync(indto.PageIndex, indto.PageSize, "CreateTime", false);
         }

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

@@ -494,7 +494,7 @@ namespace IRaCIS.Core.Application.Service
                  ;
 
             // 一致性核查文件
-            CreateMap<ConsistencyCheckFile, GetConsistencyCheckFileDto>()
+            CreateMap<UserUploadFile, GetUserUploadFileDto>()
              .ForMember(d => d.CreateUserName, u => u.MapFrom(t => t.User.FirstName + "/" + t.User.LastName));
 
 

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

@@ -286,7 +286,7 @@ namespace IRaCIS.Application.Services
 
                 await _repository.BatchDeleteAsync<CheckChallengeDialog>(o => o.SubjectVisit.TrialId == trialId);
                 await _repository.BatchDeleteAsync<ClinicalDataTrialSet>(o => o.TrialId == trialId);
-                await _repository.BatchDeleteAsync<ConsistencyCheckFile>(o => o.TrialId == trialId);
+                await _repository.BatchDeleteAsync<UserUploadFile>(o => o.TrialId == trialId);
                 await _repository.BatchDeleteAsync<CriterionNidusSystem>(o => o.TrialReadingCriterion.TrialId == trialId);
                 await _repository.BatchDeleteAsync<DataInspection>(o => o.TrialId == trialId);
                 await _repository.BatchDeleteAsync<DicomStudy>(t => t.TrialId == trialId);

IRaCIS.Core.Domain/QC/UserUploadFile.cs

@@ -7,8 +7,8 @@ namespace IRaCIS.Core.Domain.Models
 	 ///<summary>
 	 /// 一致性核查文件
 	 ///</summary>
-	 [Table("ConsistencyCheckFile")]	
+	 [Table("UserUploadFile")]	
-	 public class ConsistencyCheckFile : Entity, IAuditAdd
+	 public class UserUploadFile : Entity, IAuditAdd
 	 {
 		/// <summary>
 		/// 文件名称
@@ -49,7 +49,16 @@ namespace IRaCIS.Core.Domain.Models
 		[ForeignKey("CreateUserId")]
 		public User User { get; set; }
 
-	}
 
+		public UploadScenarios UploadScenarios { get;set; }
+
+    }
+
+	public enum UploadScenarios
+	{
+		Check=0,
+
+		Site=1,
+	}
 
 }	 

IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs

@@ -14,6 +14,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
 
 
 namespace IRaCIS.Core.Infra.EFCore.Common
@@ -1356,11 +1357,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
 
             // 一致性核查文件  是否需要单独一个表记录？
-            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ConsistencyCheckFile)))
+            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(UserUploadFile)))
             {
                 var type = GetEntityAuditOpt(item);
 
-                await InsertInspection<ConsistencyCheckFile>(item.Entity as ConsistencyCheckFile, type, x => new InspectionConvertDTO()
+                await InsertInspection<UserUploadFile>(item.Entity as UserUploadFile, type, x => new InspectionConvertDTO()
                 {
                     ObjectRelationParentId = x.TrialId
 
@@ -1853,6 +1854,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
 
 
+
             //系统临床数据配置
 
             foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ClinicalDataSystemSet)))
@@ -1882,6 +1884,33 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     extraIdentification = "/ConfirmSelect";
                 }
                 
+                if (_userInfo.RequestUrl == "ClinicalDataSet/applyTrialClinical" )
+                {
+                    extraIdentification = "/SaveTemplate";
+                    
+                    var list = await _dbContext.TrialClinicalQuestion.Where(x => x.TrialClinicalId == entity.Id)
+                        .Select(t => new
+                        {
+                            t.QuestionEnName,
+                            t.QuestionName,
+                            GroupNameCN = t.GroupQuestin.QuestionName,
+                            GroupName = t.GroupQuestin.QuestionEnName,
+                            t.ClinicalQuestionType,
+                            t.ClinicalQuestionShowEnum,
+                            t.TypeValue,
+                            t.IsRequired
+                        }).ToListAsync();
+
+
+                    await InsertInspection<ClinicalDataTrialSet>(entity, type, x => new InspectionConvertDTO()
+                    {
+                        IsDistinctionInterface = false,
+                        ExtraIndentification = extraIdentification
+                    }, new { QuestionList = list });
+
+                    continue;
+                }
+
                 //获取配置的标准名称
 
                 //List<string> trialDics = new List<string>();

IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs

@@ -467,7 +467,7 @@ namespace IRaCIS.Core.Infra.EFCore
 
         public virtual DbSet<FrontAuditConfig> FrontAuditConfig { get; set; }
 
-        public virtual DbSet<ConsistencyCheckFile> ConsistencyCheckFile { get; set; }
+        public virtual DbSet<UserUploadFile> UserUploadFile { get; set; }
 
         public virtual DbSet<CommonDocument> CommonDocument { get; set; }