From 19ebce1c9803d0b16ff6241b31abef9104d88bee Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Tue, 25 Apr 2023 17:16:17 +0800 Subject: [PATCH] =?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/Common/DictionaryService.cs | 4 ++-- .../Service/Reading/Dto/OrganInfoViewModel.cs | 4 ++-- .../ReadingMedicalReviewService.cs | 4 ++-- .../ReadingCriterion/OrganInfoService.cs | 4 ++-- .../ReadingCriterionService.cs | 22 +++++++++---------- .../ReadingQuestionService.cs | 4 ++-- .../ReadingGlobalTaskService.cs | 4 ++-- .../ReadingImageTaskService.cs | 4 ++-- .../Service/Reading/_MapConfig.cs | 6 ++--- .../TrialSiteUser/TrialConfigService.cs | 4 ++-- .../Service/TrialSiteUser/TrialService.cs | 2 +- ...terionNidus.cs => CriterionNidusSystem.cs} | 4 ++-- ...cs => ReadingSystemCriterionDictionary.cs} | 4 ++-- IRaCIS.Core.Domain/SQLFile/Test.sql | 8 +++---- .../Common/AuditingData.cs | 16 +++++++------- .../Context/IRaCISDBContext.cs | 4 ++-- 16 files changed, 49 insertions(+), 49 deletions(-) rename IRaCIS.Core.Domain/Reading/ReadingCriterion/{CriterionNidus.cs => CriterionNidusSystem.cs} (93%) rename IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/{ReadingCriterionDictionary.cs => ReadingSystemCriterionDictionary.cs} (92%) diff --git a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs index 9b6e8f2b7..f02173ae2 100644 --- a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs +++ b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs @@ -24,7 +24,7 @@ namespace IRaCIS.Application.Services private readonly IRepository _trialCriterionDictionaryCodeRepository; private readonly IRepository _readingTrialCriterionDictionaryRepository; - private readonly IRepository _readingCriterionDictionaryRepository; + private readonly IRepository _readingCriterionDictionaryRepository; private readonly IRepository _readingQuestionCriterionSystem; private readonly IRepository _readingQuestionCriterionTrial; private readonly IReadingQuestionService _readingQuestionService; @@ -35,7 +35,7 @@ namespace IRaCIS.Application.Services IRepository systemCriterionDictionaryCodeRepository, IRepository trialCriterionDictionaryCodeRepository, IRepository readingTrialCriterionDictionaryRepository, - IRepository readingCriterionDictionaryRepository, + IRepository readingCriterionDictionaryRepository, IRepository readingQuestionCriterionSystem, IRepository readingQuestionCriterionTrial, IReadingQuestionService readingQuestionService diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs index 1b15b16db..2c894b22d 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs @@ -199,8 +199,8 @@ namespace IRaCIS.Core.Application.ViewModel } - public class CriterionNidusData : CriterionNidus - { + public class CriterionNidusData : CriterionNidusSystem + { public Guid OriginalId { get; set; } } diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs index acb1a7b08..8303a9893 100644 --- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs +++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs @@ -28,7 +28,7 @@ namespace IRaCIS.Core.Application.Service private readonly IRepository _readingTaskQuestionAnswerRepository; private readonly IRepository _readingGlobalTaskInfoRepository; private readonly IRepository _readingOncologyTaskInfoRepository; - private readonly IRepository _readingCriterionDictionaryRepository; + private readonly IRepository _readingCriterionDictionaryRepository; private readonly IReadingImageTaskService _iReadingImageTaskService; private readonly IRepository _userTaskRepository; @@ -49,7 +49,7 @@ namespace IRaCIS.Core.Application.Service IRepository readingTaskQuestionAnswerRepository, IRepository readingGlobalTaskInfoRepository, IRepository readingOncologyTaskInfoRepository, - IRepository readingCriterionDictionaryRepository, + IRepository readingCriterionDictionaryRepository, IRepository userTaskRepository, IVisitTaskService visitTaskService, IRepository taskMedicalReviewRepository, diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs index 86f5d9973..849b16010 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs @@ -27,7 +27,7 @@ namespace IRaCIS.Core.Application.Service private readonly IRepository _visitTaskRepository; private readonly IRepository _organTrialInfoRepository; private readonly IRepository _readingQuestionCriterionTrial; - private readonly IRepository _criterionNidusRepository; + private readonly IRepository _criterionNidusRepository; private readonly IRepository _criterionNidusTrialRepository; private readonly IRepository _readingQuestionCriterionSystemRepository; @@ -39,7 +39,7 @@ namespace IRaCIS.Core.Application.Service IRepository readingQuestionCriterionTrial, IRepository criterionNidusTrialRepository, IRepository readingQuestionCriterionSystemRepository, - IRepository criterionNidusRepository + IRepository criterionNidusRepository ) { _organInfoRepository = organInfoRepository; diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs index edf2ffb96..648b85c16 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs @@ -19,7 +19,7 @@ namespace IRaCIS.Core.Application.Service.RC private readonly IRepository _readingQuestionTrialRepository; private readonly IRepository _readingTaskQuestionAnswer; private readonly IRepository _readingCriterionPageRepository; - private readonly IRepository _readingCriterionDictionaryRepository; + private readonly IRepository _readingCriterionDictionaryRepository; private readonly IRepository _readingTrialCriterionDictionaryRepository; private readonly IRepository _visitTaskRepository; private readonly IRepository _systemCriterionDictionaryCodeRepository; @@ -32,7 +32,7 @@ namespace IRaCIS.Core.Application.Service.RC IRepository readingQuestionCriterionSystemRepository, IRepository readingQuestionCriterionTrialRepository, IRepository readingQuestionTrialRepository, - IRepository readingCriterionDictionaryRepository, + IRepository readingCriterionDictionaryRepository, IRepository readingTrialCriterionDictionaryRepository, IRepository visitTaskRepository, IRepository systemCriterionDictionaryCodeRepository, @@ -135,8 +135,8 @@ namespace IRaCIS.Core.Application.Service.RC await _readingCriterionDictionaryRepository.BatchDeleteNoTrackingAsync(x => x.CriterionId == inDto.SystemCriterionId && x.ParentCode == ReadingCommon.CriterionDictionary.GlobalAssess); - await _readingCriterionDictionaryRepository.AddRangeAsync(inDto.DictionaryList.Select(x => new ReadingCriterionDictionary - { + await _readingCriterionDictionaryRepository.AddRangeAsync(inDto.DictionaryList.Select(x => new ReadingSystemCriterionDictionary + { CriterionId = inDto.SystemCriterionId, DictionaryId = x.DictionaryId, IsSystemCriterion = true, @@ -206,8 +206,8 @@ namespace IRaCIS.Core.Application.Service.RC await _readingCriterionDictionaryRepository.BatchDeleteNoTrackingAsync(x => x.CriterionId == inDto.SystemCriterionId && x.ParentCode == ReadingCommon.CriterionDictionary.OncologyAssess); - await _readingCriterionDictionaryRepository.AddRangeAsync(inDto.DictionaryIds.Select(x => new ReadingCriterionDictionary - { + await _readingCriterionDictionaryRepository.AddRangeAsync(inDto.DictionaryIds.Select(x => new ReadingSystemCriterionDictionary + { CriterionId = inDto.SystemCriterionId, DictionaryId = x, IsSystemCriterion = true, @@ -537,7 +537,7 @@ namespace IRaCIS.Core.Application.Service.RC [HttpPost] public async Task SetDictionaryFollowVisitUse(SetDictionaryFollowVisitUseInDto inDto) { - await _readingCriterionDictionaryRepository.UpdatePartialFromQueryAsync(inDto.Id, x => new ReadingCriterionDictionary() + await _readingCriterionDictionaryRepository.UpdatePartialFromQueryAsync(inDto.Id, x => new ReadingSystemCriterionDictionary() { IsFollowVisitUse = inDto.IsFollowVisitUse }); @@ -556,7 +556,7 @@ namespace IRaCIS.Core.Application.Service.RC [HttpPost] public async Task SetDictionaryBaseLineUse(SetDictionaryBaseLineUseInDto inDto) { - await _readingCriterionDictionaryRepository.UpdatePartialFromQueryAsync(inDto.Id, x => new ReadingCriterionDictionary() + await _readingCriterionDictionaryRepository.UpdatePartialFromQueryAsync(inDto.Id, x => new ReadingSystemCriterionDictionary() { IsBaseLineUse = inDto.IsBaseLineUse }); @@ -602,7 +602,7 @@ namespace IRaCIS.Core.Application.Service.RC [HttpPost] public async Task EditCriterionDictionary(EditCriterionDictionaryInDto inDto) { - await _readingCriterionDictionaryRepository.UpdatePartialFromQueryAsync(inDto.Id,x=>new ReadingCriterionDictionary() { + await _readingCriterionDictionaryRepository.UpdatePartialFromQueryAsync(inDto.Id,x=>new ReadingSystemCriterionDictionary() { CrterionDictionaryGroup=inDto.CrterionDictionaryGroup }); @@ -620,7 +620,7 @@ namespace IRaCIS.Core.Application.Service.RC await _readingCriterionDictionaryRepository.BatchDeleteNoTrackingAsync(x => x.CriterionId == inDto.CriterionId && x.ParentCode == inDto.ParentCode); - await _readingCriterionDictionaryRepository.AddRangeAsync(inDto.DictionaryIds.Select(x => new ReadingCriterionDictionary() + await _readingCriterionDictionaryRepository.AddRangeAsync(inDto.DictionaryIds.Select(x => new ReadingSystemCriterionDictionary() { CriterionId = inDto.CriterionId, DictionaryId = x, @@ -644,7 +644,7 @@ namespace IRaCIS.Core.Application.Service.RC { await _readingCriterionDictionaryRepository.BatchDeleteNoTrackingAsync(x => x.CriterionId == inDto.CriterionId && x.ParentCode == inDto.ParentCode); - await _readingCriterionDictionaryRepository.AddRangeAsync(inDto.DictionaryList.Select(x => new ReadingCriterionDictionary() + await _readingCriterionDictionaryRepository.AddRangeAsync(inDto.DictionaryList.Select(x => new ReadingSystemCriterionDictionary() { CriterionId = inDto.CriterionId, DictionaryId = x.DictionaryId, diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs index 11b91591a..0c940d0b3 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs @@ -26,7 +26,7 @@ namespace IRaCIS.Application.Services private readonly IRepository _clinicalDataSystemSetRepository; private readonly IRepository _dictionaryRepository; private readonly IReadingImageTaskService _iReadingImageTaskService; - private readonly IRepository _readingCriterionDictionaryRepository; + private readonly IRepository _readingCriterionDictionaryRepository; private readonly IRepository _readingTableQuestionTrialRepository; private readonly IRepository _readingCriterionPageRepository; private readonly IRepository _trialRepository; @@ -46,7 +46,7 @@ namespace IRaCIS.Application.Services IRepository ClinicalDataSystemSetRepository, IRepository dictionaryRepository, IReadingImageTaskService iReadingImageTaskService, - IRepository readingCriterionDictionaryRepository, + IRepository readingCriterionDictionaryRepository, IRepository readingTableQuestionTrialRepository, IRepository readingCriterionPageRepository, IRepository trialRepository, diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs index 441d8c1ad..e5fd804f4 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs @@ -345,8 +345,8 @@ namespace IRaCIS.Application.Services result.TaskList.ForEach(x => { - x.AfterQuestionList = x.BeforeQuestionList - .GroupJoin( + x.AfterQuestionList = x.BeforeQuestionList.Where(x => x.IsJudgeQuestion) + .GroupJoin( globalReadingQuestion , l => new { a = l.QuestionId, b = x.VisitTaskId } , r => new { a = r.QuestionId, b = r.TaskId } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 49d586f02..62aae8533 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -42,7 +42,7 @@ namespace IRaCIS.Application.Services private readonly IRepository _readModuleRepository; private readonly IRepository _dicomInstanceRepository; private readonly IRepository _organInfoRepository; - private readonly IRepository _readingCriterionDictionaryRepository; + private readonly IRepository _readingCriterionDictionaryRepository; private readonly IRepository _readingTrialCriterionDictionaryRepository; private readonly IRepository _tumorAssessmentRepository; private readonly IRepository _readingTableAnswerRowInfoRepository; @@ -80,7 +80,7 @@ namespace IRaCIS.Application.Services IRepository dicomInstanceRepository, IRepository organInfoRepository, IMemoryCache cache, - IRepository readingCriterionDictionaryRepository, + IRepository readingCriterionDictionaryRepository, IRepository readingTrialCriterionDictionaryRepository, IRepository tumorAssessmentRepository, IRepository readingTableAnswerRowInfoRepository, diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs index d3c5a76ae..9d481d5a7 100644 --- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs @@ -30,7 +30,7 @@ namespace IRaCIS.Core.Application.Service .ForMember(d => d.SiteCodes, u => u.MapFrom(s => s.ReadingPeriodSites.Select(x => x.TrialSite.TrialSiteCode))) .ForMember(d => d.PlanCount, u => u.MapFrom(s => s.ReadingPeriodPlanList.Count)); - CreateMap() + CreateMap() .ForMember(d => d.ChildGroup, u => u.MapFrom(s => s.Dictionary.ChildGroup)) .ForMember(d => d.Code, u => u.MapFrom(s => s.Dictionary.Code)) .ForMember(d => d.Description, u => u.MapFrom(s => s.Dictionary.Description)) @@ -252,8 +252,8 @@ namespace IRaCIS.Core.Application.Service #region 阅片部位 CreateMap(); - CreateMap(); - CreateMap().ReverseMap(); + CreateMap(); + CreateMap().ReverseMap(); CreateMap(); CreateMap(); diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs index adc751bf5..99f6436b3 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs @@ -38,7 +38,7 @@ namespace IRaCIS.Core.Application private readonly IEasyCachingProvider _provider; private readonly IOrganInfoService _iOrganInfoService; private readonly IRepository _taskAllocationRuleRepository; - private readonly IRepository _readingCriterionDictionaryRepository; + private readonly IRepository _readingCriterionDictionaryRepository; private readonly IRepository _readingTrialCriterionDictionaryRepository; private readonly IReadingQuestionService iReadingQuestionService; private readonly IRepository _trialCriterionAdditionalAssessmentTypeRepository; @@ -61,7 +61,7 @@ namespace IRaCIS.Core.Application IRepository clinicalDataTrialSetRepository, IRepository readingCriterionPageRepository, IRepository taskAllocationRuleRepository, - IRepository readingCriterionDictionaryRepository, + IRepository readingCriterionDictionaryRepository, IRepository readingTrialCriterionDictionaryRepository, IReadingQuestionService iReadingQuestionService, IEasyCachingProvider provider, diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs index ac69da8c1..4650b7434 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs @@ -408,7 +408,7 @@ namespace IRaCIS.Application.Services await _repository.BatchDeleteAsync(o => o.TrialId == trialId) || - await _repository.BatchDeleteAsync(o => o.TrialReadingCriterion.TrialId == trialId) || + await _repository.BatchDeleteAsync(o => o.TrialReadingCriterion.TrialId == trialId) || diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidus.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusSystem.cs similarity index 93% rename from IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidus.cs rename to IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusSystem.cs index 63dee9c27..c51e1e522 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidus.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusSystem.cs @@ -12,8 +12,8 @@ namespace IRaCIS.Core.Domain.Models /// /// 标准病灶中间表 /// - [Table("CriterionNidus")] - public class CriterionNidus : Entity, IAuditAdd + [Table("CriterionNidusSystem")] + public class CriterionNidusSystem : Entity, IAuditAdd { /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingCriterionDictionary.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingSystemCriterionDictionary.cs similarity index 92% rename from IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingCriterionDictionary.cs rename to IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingSystemCriterionDictionary.cs index 7357954ac..a046c7b2c 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingCriterionDictionary.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingSystemCriterionDictionary.cs @@ -10,8 +10,8 @@ namespace IRaCIS.Core.Domain.Models /// ///ReadingCriterionDictionary /// - [Table("ReadingCriterionDictionary")] - public class ReadingCriterionDictionary : Entity, IAuditAdd + [Table("ReadingSystemCriterionDictionary")] + public class ReadingSystemCriterionDictionary : Entity, IAuditAdd { /// /// CriterionId diff --git a/IRaCIS.Core.Domain/SQLFile/Test.sql b/IRaCIS.Core.Domain/SQLFile/Test.sql index 9ac62d4a7..3237dc0f1 100644 --- a/IRaCIS.Core.Domain/SQLFile/Test.sql +++ b/IRaCIS.Core.Domain/SQLFile/Test.sql @@ -1017,13 +1017,13 @@ SELECT NEWID(), TaskId, RelevanceTaskId, 2,ReadingTaskRelation.CreateTime ,Readi -----------------------------------------2023-04-24----------------------------------- -- 维护CriterionNidusTrial 数据 INSERT INTO CriterionNidusTrial (Id, CriterionId, CreateTime, CreateUserId, LesionType, OrganType) -SELECT NEWID(), CriterionId, GETDATE(), '00000000-0000-0000-0000-000000000000', LesionType, OrganType -FROM CriterionNidus +SELECT id, CriterionId, CreateTime, '00000000-0000-0000-0000-000000000000', LesionType, OrganType +FROM CriterionNidusSystem WHERE CriterionId NOT IN (SELECT DISTINCT CriterionId FROM CriterionNidusTrial ) and IsSystemCriterion=0 -- 维护ReadingTrialCriterionDictionary 数据 INSERT INTO ReadingTrialCriterionDictionary (Id, CriterionId, DictionaryId, CreateTime, CreateUserId, ParentCode, IsBaseLineUse, IsFollowVisitUse, CrterionDictionaryGroup) -SELECT NEWID(), RC.CriterionId, RC.DictionaryId, GETDATE(), '00000000-0000-0000-0000-000000000000', RC.ParentCode, RC.IsBaseLineUse, RC.IsFollowVisitUse, RC.CrterionDictionaryGroup -FROM ReadingCriterionDictionary RC +SELECT id, RC.CriterionId, RC.DictionaryId, CreateTime, '00000000-0000-0000-0000-000000000000', RC.ParentCode, RC.IsBaseLineUse, RC.IsFollowVisitUse, RC.CrterionDictionaryGroup +FROM ReadingSystemCriterionDictionary RC WHERE CriterionId NOT IN (SELECT DISTINCT CriterionId FROM ReadingTrialCriterionDictionary ) and IsSystemCriterion=0 \ No newline at end of file diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index cf24c4f80..e26eca4dd 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -254,12 +254,12 @@ namespace IRaCIS.Core.Infra.EFCore.Common //保存肿瘤学配置哪里 强行要将 评估结果（中间字典表的多条数据）存到标准稽查上 - var dicIdList = entitys.Where(x => x.Entity.GetType() == typeof(ReadingCriterionDictionary)).Select(t => t.Entity as ReadingCriterionDictionary).Where(t => t.CriterionId == entity.Id).Select(t => t.DictionaryId).ToList(); + var dicIdList = entitys.Where(x => x.Entity.GetType() == typeof(ReadingSystemCriterionDictionary)).Select(t => t.Entity as ReadingSystemCriterionDictionary).Where(t => t.CriterionId == entity.Id).Select(t => t.DictionaryId).ToList(); var dicValueList = new List(); if (dicIdList.Count() == 0) { - dicValueList = await _dbContext.ReadingCriterionDictionary.Where(t => t.CriterionId == entity.Id).Select(t => t.Dictionary.Value).ToListAsync(); + dicValueList = await _dbContext.ReadingSystemCriterionDictionary.Where(t => t.CriterionId == entity.Id).Select(t => t.Dictionary.Value).ToListAsync(); } else { @@ -563,11 +563,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common // 项目 系统公用表 //病灶管理 区分项目 还是系统的 - foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(CriterionNidus))) + foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(CriterionNidusSystem))) { var type = GetEntityAuditOpt(item); - var entity = item.Entity as CriterionNidus; + var entity = item.Entity as CriterionNidusSystem; var extraIdentification = string.Empty; @@ -583,7 +583,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common - await InsertInspection(entity, type, x => new InspectionConvertDTO() + await InsertInspection(entity, type, x => new InspectionConvertDTO() { IsDistinctionInterface = false, @@ -618,14 +618,14 @@ namespace IRaCIS.Core.Infra.EFCore.Common // 项目 系统公用表 //配置标准 病灶类型 自动计算标识 "LesionType", "QuestionType" - if (entitys.Any(x => x.Entity.GetType() == typeof(ReadingCriterionDictionary))) + if (entitys.Any(x => x.Entity.GetType() == typeof(ReadingSystemCriterionDictionary))) { var type = AuditOpt.Add; - var allList = entitys.Where(x => x.Entity.GetType() == typeof(ReadingCriterionDictionary)).Select(t => t.Entity as ReadingCriterionDictionary).ToList(); + var allList = entitys.Where(x => x.Entity.GetType() == typeof(ReadingSystemCriterionDictionary)).Select(t => t.Entity as ReadingSystemCriterionDictionary).ToList(); //查询出字典的Value ValueCN Des 保存 var dicIdList = allList.Select(t => t.DictionaryId).ToList(); @@ -657,7 +657,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common } - await InsertInspection(cloneEntity, type, x => new InspectionConvertDTO() + await InsertInspection(cloneEntity, type, x => new InspectionConvertDTO() { ObjectRelationParentId = x.CriterionId, diff --git a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs index 5c834ca38..e9e34e6af 100644 --- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs +++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs @@ -216,7 +216,7 @@ namespace IRaCIS.Core.Infra.EFCore public virtual DbSet ReadingTaskRelation { get; set; } public virtual DbSet OrganInfo { get; set; } - public virtual DbSet ReadingCriterionDictionary { get; set; } + public virtual DbSet ReadingSystemCriterionDictionary { get; set; } public virtual DbSet ReadingTableAnswerRowInfo { get; set; } public virtual DbSet OrganTrialInfo { get; set; } public virtual DbSet ReadingTableQuestionSystem { get; set; } @@ -259,7 +259,7 @@ namespace IRaCIS.Core.Infra.EFCore public virtual DbSet ReadingMedicalReviewDialog { get; set; } - public virtual DbSet CriterionNidus { get; set; } + public virtual DbSet CriterionNidusSystem { get; set; } public virtual DbSet CriterionNidusTrial { get; set; }