diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs index a2ccd15b3..4b5ea5b04 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs @@ -22,6 +22,7 @@ namespace IRaCIS.Application.Services public IRepository _subjectVisitRepository; private readonly IRepository _clinicalDataTrialSetRepository; + private readonly IRepository _trialClinicalDataSetCriterionRepository; private readonly IRepository _iReadingQuestionCriterionTrialRepository; private readonly IRepository _clinicalDataSystemSetRepository; private readonly IRepository _previousPDFRepository; @@ -34,6 +35,7 @@ namespace IRaCIS.Application.Services public ClinicalDataSetService(IRepository subjectVisitRepository, IClinicalQuestionService iClinicalQuestionService, IRepository ClinicalDataTrialSetRepository, + IRepository trialClinicalDataSetCriterionRepository, IRepository iReadingQuestionCriterionTrialRepository, IRepository ClinicalDataSystemSetRepository, IRepository previousPDFRepository, @@ -51,6 +53,7 @@ namespace IRaCIS.Application.Services _trialClinicalQuestionRepository = trialClinicalQuestionRepository; _systemClinicalQuestionRepository = systemClinicalQuestionRepository; _clinicalDataTrialSetRepository = ClinicalDataTrialSetRepository; + this._trialClinicalDataSetCriterionRepository = trialClinicalDataSetCriterionRepository; this._iReadingQuestionCriterionTrialRepository = iReadingQuestionCriterionTrialRepository; _clinicalDataSystemSetRepository = ClinicalDataSystemSetRepository; this._previousPDFRepository = previousPDFRepository; @@ -243,7 +246,10 @@ namespace IRaCIS.Application.Services //indto.CriterionEnumListStr = $"|{String.Join('|', indto.CriterionEnumList)}|"; - var entity = await _clinicalDataTrialSetRepository.InsertOrUpdateAsync(indto, true); + //var entity = _mapper.Map(from); + + indto.CreateTime = DateTime.Now; + var entity = await _clinicalDataTrialSetRepository.InsertOrUpdateAsync(indto); entity.TrialClinicalDataSetCriteriaList = indto.TrialCriterionIdList.Select(t => new TrialClinicalDataSetCriterion() { @@ -253,7 +259,7 @@ namespace IRaCIS.Application.Services if (indto.Id != null) { - await _repository.BatchDeleteAsync(t => t.TrialClinicalDataSetId == entity.Id); + await _trialClinicalDataSetCriterionRepository.DeleteFromQueryAsync(t => t.TrialClinicalDataSetId == entity.Id); await _repository.AddRangeAsync(entity.TrialClinicalDataSetCriteriaList); } diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs index 5f67adb1f..00ac54b9e 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs @@ -44,10 +44,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public UploadRole UploadRole { get; set; } - /// - /// 是否启用 - /// - public bool IsEnable { get; set; } + public DateTime CreateTime { get; set; } + + /// + /// 是否启用 + /// + public bool IsEnable { get; set; } /// /// 项目ID diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 19be959d2..e088c3be6 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -10,6 +10,7 @@ using Microsoft.EntityFrameworkCore.ChangeTracking.Internal; using NetTopologySuite.Index.HPRtree; using Newtonsoft.Json; using SharpCompress.Common; +using SharpCompress.Compressors.Xz; using System; using System.Collections.Generic; using System.Linq; @@ -143,8 +144,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common case "configTrialBasicInfo/ConfigTrialBasicInfoConfirm": extraIdentification = $"/{oldentity.IsTrialBasicLogicConfirmed.ToString()}"; break; + case "configTrialBasicInfo/ConfigTrialProcessInfoConfirm": + extraIdentification = $"/{oldentity.IsTrialProcessConfirmed.ToString()}"; + break; - case "configTrialBasicInfo/ConfigTrialUrgentInfoConfirm": + case "configTrialBasicInfo/ConfigTrialUrgentInfoConfirm": extraIdentification = $"/{oldentity.IsTrialUrgentConfirmed.ToString()}"; break; @@ -2168,8 +2172,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common if (entity.TrialClinicalDataSetCriteriaList == null || entity.TrialClinicalDataSetCriteriaList.Count() == 0) { - criterionNameList = await _dbContext.TrialClinicalDataSetCriterion.Where(t => t.TrialClinicalDataSetId == entity.Id).Select(t => t.TrialReadingCriterion.CriterionName).ToListAsync(); - } + criterionNameList = await _dbContext.TrialClinicalDataSetCriterion.Where(t => t.TrialClinicalDataSetId == entity.Id).Select(t => t.TrialReadingCriterion.CriterionName).ToListAsync(); + } else { var ids = entity.TrialClinicalDataSetCriteriaList.Select(t => t.TrialReadingCriterionId).ToList(); diff --git a/IRaCIS.Core.Infra.EFCore/Common/Dto/SetDictionaryValueDto.cs b/IRaCIS.Core.Infra.EFCore/Common/Dto/SetDictionaryValueDto.cs index c28949c72..62cb923ab 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/Dto/SetDictionaryValueDto.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/Dto/SetDictionaryValueDto.cs @@ -159,8 +159,10 @@ namespace IRaCIS.Core.Infra.EFCore.Common.Dto public string BlindName { get; set; } = string.Empty; - //标识操作 是否区分接口 - public bool IsDistinctionInterface=true; + /// + /// 标识操作 是否区分接口 + /// + public bool IsDistinctionInterface=true; public bool IsSelfDefine = false;