From ade516d1883d54cd91fa0d94fafdcb860ac15fbe Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 24 Nov 2023 10:01:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRaCIS.Core.Application.xml | 14 +++++++------- .../Service/QC/DTO/QARecordViewModel.cs | 2 +- .../Service/QC/QCListService.cs | 4 ++-- IRaCIS.Core.Application/Service/QC/_MapConfig.cs | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 5db76d015..debdb971a 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -10176,37 +10176,37 @@ 受试者ID - + 文件名称 - + 文件路径 - + 相对路径 - + 创建人 - + 创建时间 - + 项目ID - + 创建者名称 diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs index 8b810779b..c26348971 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs +++ b/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/*: ConsistencyCheckFile*/ { /// /// 文件名称 diff --git a/IRaCIS.Core.Application/Service/QC/QCListService.cs b/IRaCIS.Core.Application/Service/QC/QCListService.cs index 3f4ff47a3..8cbbe14bb 100644 --- a/IRaCIS.Core.Application/Service/QC/QCListService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCListService.cs @@ -849,10 +849,10 @@ namespace IRaCIS.Core.Application.Image.QA /// /// [HttpPost] - public async Task> GetConsistencyCheckFile(GetConsistencyCheckFileInDto indto) + public async Task> GetConsistencyCheckFile(GetConsistencyCheckFileInDto indto) { var query = _repository.Where(t => t.TrialId == indto.TrialId) - .ProjectTo(_mapper.ConfigurationProvider); + .ProjectTo(_mapper.ConfigurationProvider); return await query.ToPagedListAsync(indto.PageIndex, indto.PageSize, "CreateTime", false); } diff --git a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs index b53aa1700..07f3b8df1 100644 --- a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs @@ -494,7 +494,7 @@ namespace IRaCIS.Core.Application.Service ; // 一致性核查文件 - CreateMap() + CreateMap() .ForMember(d => d.CreateUserName, u => u.MapFrom(t => t.User.FirstName + "/" + t.User.LastName)); From a5dee142bf3b31d741368c9069e502cd74a1e65a Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Fri, 24 Nov 2023 10:28:41 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=A8=BD=E6=9F=A5=E4=BF=AE=E6=94=B91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/AuditingData.cs | 46 +++++++++++++++++++ .../Common/Dto/SetDictionaryValueDto.cs | 1 + 2 files changed, 47 insertions(+) diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 6397217b6..af81fb592 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -2071,6 +2071,10 @@ namespace IRaCIS.Core.Infra.EFCore.Common { extraIdentification = "/ConfirmSelect"; } + else if (_userInfo.RequestUrl == "ClinicalDataSet/applyTrialClinical") + { + extraIdentification = "/applyTrialClinical"; + } //获取配置的标准名称 @@ -2111,6 +2115,48 @@ namespace IRaCIS.Core.Infra.EFCore.Common }); } + + + //临床数据问题 + + foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialClinicalQuestion))) + { + var type = GetEntityAuditOpt(item); + + var entity = item.Entity as TrialClinicalQuestion; + + var trialId= await _dbContext.ClinicalDataTrialSet.Where(t => t.Id == entity.TrialClinicalId).Select(t => t.TrialId).FirstOrDefaultAsync(); + var GroupName = entity.GroupId == null ? entity.QuestionName: _dbContext.TrialClinicalQuestion.Where(t => t.Id == entity.GroupId).Select(t => t.QuestionName).FirstOrDefault(); + var GroupEnName = entity.GroupId == null ? entity.QuestionEnName : _dbContext.TrialClinicalQuestion.Where(t => t.Id == entity.GroupId).Select(t => t.QuestionEnName).FirstOrDefault(); + await InsertInspection(entity, type, x => new InspectionConvertDTO() + { + TrialId= trialId, + }, + new { + GroupName= GroupName, + GroupEnName= GroupEnName, + } + ); + } + + + //临床数据表格问题 + + foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialClinicalTableQuestion))) + { + var type = GetEntityAuditOpt(item); + + var entity = item.Entity as TrialClinicalTableQuestion; + + var trialId = await _dbContext.ClinicalDataTrialSet.Where(t => t.Id == entity.TrialClinicalId).Select(t => t.TrialId).FirstOrDefaultAsync(); + await InsertInspection(entity, type, x => new InspectionConvertDTO() + { + TrialId = trialId, + } + + ); + } + // CRC PM 临床数据 foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ReadingClinicalData))) { diff --git a/IRaCIS.Core.Infra.EFCore/Common/Dto/SetDictionaryValueDto.cs b/IRaCIS.Core.Infra.EFCore/Common/Dto/SetDictionaryValueDto.cs index 8ef19d6d2..2534fb6f9 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/Dto/SetDictionaryValueDto.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/Dto/SetDictionaryValueDto.cs @@ -152,6 +152,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common.Dto public bool IsSelfDefine = false; + // 额外标识 public string ExtraIndentification = string.Empty; From 670cee592357ce9fd3a22a2da33c6525e3fc4f89 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Fri, 24 Nov 2023 10:51:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReadingCalculate/LuganoCalculateService.cs | 12 ++++++------ IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs index e2c20f20f..2b4540f13 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs @@ -1713,7 +1713,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate var taskAnswer = await GetVisitTaskAnswerList(inDto); if (inDto.IsBaseLine) { - return string.Empty; + return "NA"; } @@ -2053,7 +2053,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { if (inDto.IsBaseLine) { - return string.Empty; + return "NA"; } var lastTaskId = await GetLastVisitTaskId(inDto); @@ -2620,10 +2620,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { NewLesionAssessment result = NewLesionAssessment.No; - //if (inDto.IsBaseLine) - //{ - // return NewLesionAssessment.NA.GetEnumInt(); - //} + if (inDto.IsBaseLine) + { + return NewLesionAssessment.NA.GetEnumInt(); + } var tableRows = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.NewLesions).SelectMany(x => x.TableRowInfoList).ToList(); diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index fc4875c02..fa20e384d 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -2165,7 +2165,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common //临床数据表格问题 - foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialClinicalTableQuestion))) { var type = GetEntityAuditOpt(item); From ec64533b4b09b41996d8868c13e5ad0661a020e0 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Fri, 24 Nov 2023 10:56:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ReadingCalculate/LuganoCalculateService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs index 2b4540f13..83e1268e8 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs @@ -2053,7 +2053,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { if (inDto.IsBaseLine) { - return "NA"; + return FDGPETOverallAssessment.NA.GetEnumInt(); } var lastTaskId = await GetLastVisitTaskId(inDto);