XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Uat_Study
he 2023-04-25 17:16:17 +08:00
parent 1f04bdb57a
commit 19ebce1c98
16 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.Application/Service/Common/DictionaryService.cs
View File

@ -24,7 +24,7 @@ namespace IRaCIS.Application.Services
private readonly IRepository<TrialCriterionDictionaryCode> _trialCriterionDictionaryCodeRepository; private readonly IRepository<TrialCriterionDictionaryCode> _trialCriterionDictionaryCodeRepository;
private readonly IRepository<ReadingTrialCriterionDictionary> _readingTrialCriterionDictionaryRepository; private readonly IRepository<ReadingTrialCriterionDictionary> _readingTrialCriterionDictionaryRepository;
private readonly IRepository<ReadingCriterionDictionary> _readingCriterionDictionaryRepository; private readonly IRepository<ReadingSystemCriterionDictionary> _readingCriterionDictionaryRepository;
private readonly IRepository<ReadingQuestionCriterionSystem> _readingQuestionCriterionSystem; private readonly IRepository<ReadingQuestionCriterionSystem> _readingQuestionCriterionSystem;
private readonly IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrial; private readonly IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrial;
private readonly IReadingQuestionService _readingQuestionService; private readonly IReadingQuestionService _readingQuestionService;
@ -35,7 +35,7 @@ namespace IRaCIS.Application.Services
IRepository<SystemCriterionDictionaryCode> systemCriterionDictionaryCodeRepository, IRepository<SystemCriterionDictionaryCode> systemCriterionDictionaryCodeRepository,
IRepository<TrialCriterionDictionaryCode> trialCriterionDictionaryCodeRepository, IRepository<TrialCriterionDictionaryCode> trialCriterionDictionaryCodeRepository,
IRepository<ReadingTrialCriterionDictionary> readingTrialCriterionDictionaryRepository, IRepository<ReadingTrialCriterionDictionary> readingTrialCriterionDictionaryRepository,
IRepository<ReadingCriterionDictionary> readingCriterionDictionaryRepository, IRepository<ReadingSystemCriterionDictionary> readingCriterionDictionaryRepository,
IRepository<ReadingQuestionCriterionSystem> readingQuestionCriterionSystem, IRepository<ReadingQuestionCriterionSystem> readingQuestionCriterionSystem,
IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrial, IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrial,
IReadingQuestionService readingQuestionService IReadingQuestionService readingQuestionService

4
IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
View File

@ -199,8 +199,8 @@ namespace IRaCIS.Core.Application.ViewModel
} }
public class CriterionNidusData : CriterionNidus public class CriterionNidusData : CriterionNidusSystem
{ {
public Guid OriginalId { get; set; } public Guid OriginalId { get; set; }
} }

4
IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
View File

@ -28,7 +28,7 @@ namespace IRaCIS.Core.Application.Service
private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository; private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository;
private readonly IRepository<ReadingGlobalTaskInfo> _readingGlobalTaskInfoRepository; private readonly IRepository<ReadingGlobalTaskInfo> _readingGlobalTaskInfoRepository;
private readonly IRepository<ReadingOncologyTaskInfo> _readingOncologyTaskInfoRepository; private readonly IRepository<ReadingOncologyTaskInfo> _readingOncologyTaskInfoRepository;
private readonly IRepository<ReadingCriterionDictionary> _readingCriterionDictionaryRepository; private readonly IRepository<ReadingSystemCriterionDictionary> _readingCriterionDictionaryRepository;
private readonly IReadingImageTaskService _iReadingImageTaskService; private readonly IReadingImageTaskService _iReadingImageTaskService;
private readonly IRepository<User> _userTaskRepository; private readonly IRepository<User> _userTaskRepository;
@ -49,7 +49,7 @@ namespace IRaCIS.Core.Application.Service
IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswerRepository, IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswerRepository,
IRepository<ReadingGlobalTaskInfo> readingGlobalTaskInfoRepository, IRepository<ReadingGlobalTaskInfo> readingGlobalTaskInfoRepository,
IRepository<ReadingOncologyTaskInfo> readingOncologyTaskInfoRepository, IRepository<ReadingOncologyTaskInfo> readingOncologyTaskInfoRepository,
IRepository<ReadingCriterionDictionary> readingCriterionDictionaryRepository, IRepository<ReadingSystemCriterionDictionary> readingCriterionDictionaryRepository,
IRepository<User> userTaskRepository, IRepository<User> userTaskRepository,
IVisitTaskService visitTaskService, IVisitTaskService visitTaskService,
IRepository<TaskMedicalReview> taskMedicalReviewRepository, IRepository<TaskMedicalReview> taskMedicalReviewRepository,

4
IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs
View File

@ -27,7 +27,7 @@ namespace IRaCIS.Core.Application.Service
private readonly IRepository<VisitTask> _visitTaskRepository; private readonly IRepository<VisitTask> _visitTaskRepository;
private readonly IRepository<OrganTrialInfo> _organTrialInfoRepository; private readonly IRepository<OrganTrialInfo> _organTrialInfoRepository;
private readonly IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrial; private readonly IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrial;
private readonly IRepository<CriterionNidus> _criterionNidusRepository; private readonly IRepository<CriterionNidusSystem> _criterionNidusRepository;
private readonly IRepository<CriterionNidusTrial> _criterionNidusTrialRepository; private readonly IRepository<CriterionNidusTrial> _criterionNidusTrialRepository;
private readonly IRepository<ReadingQuestionCriterionSystem> _readingQuestionCriterionSystemRepository; private readonly IRepository<ReadingQuestionCriterionSystem> _readingQuestionCriterionSystemRepository;
@ -39,7 +39,7 @@ namespace IRaCIS.Core.Application.Service
IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrial, IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrial,
IRepository<CriterionNidusTrial> criterionNidusTrialRepository, IRepository<CriterionNidusTrial> criterionNidusTrialRepository,
IRepository<ReadingQuestionCriterionSystem> readingQuestionCriterionSystemRepository, IRepository<ReadingQuestionCriterionSystem> readingQuestionCriterionSystemRepository,
IRepository<CriterionNidus> criterionNidusRepository IRepository<CriterionNidusSystem> criterionNidusRepository
) )
{ {
_organInfoRepository = organInfoRepository; _organInfoRepository = organInfoRepository;

22
IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs
View File

@ -19,7 +19,7 @@ namespace IRaCIS.Core.Application.Service.RC
private readonly IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository; private readonly IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository;
private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswer; private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswer;
private readonly IRepository<ReadingCriterionPage> _readingCriterionPageRepository; private readonly IRepository<ReadingCriterionPage> _readingCriterionPageRepository;
private readonly IRepository<ReadingCriterionDictionary> _readingCriterionDictionaryRepository; private readonly IRepository<ReadingSystemCriterionDictionary> _readingCriterionDictionaryRepository;
private readonly IRepository<ReadingTrialCriterionDictionary> _readingTrialCriterionDictionaryRepository; private readonly IRepository<ReadingTrialCriterionDictionary> _readingTrialCriterionDictionaryRepository;
private readonly IRepository<VisitTask> _visitTaskRepository; private readonly IRepository<VisitTask> _visitTaskRepository;
private readonly IRepository<SystemCriterionDictionaryCode> _systemCriterionDictionaryCodeRepository; private readonly IRepository<SystemCriterionDictionaryCode> _systemCriterionDictionaryCodeRepository;
@ -32,7 +32,7 @@ namespace IRaCIS.Core.Application.Service.RC
IRepository<ReadingQuestionCriterionSystem> readingQuestionCriterionSystemRepository, IRepository<ReadingQuestionCriterionSystem> readingQuestionCriterionSystemRepository,
IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrialRepository, IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrialRepository,
IRepository<ReadingQuestionTrial> readingQuestionTrialRepository, IRepository<ReadingQuestionTrial> readingQuestionTrialRepository,
IRepository<ReadingCriterionDictionary> readingCriterionDictionaryRepository, IRepository<ReadingSystemCriterionDictionary> readingCriterionDictionaryRepository,
IRepository<ReadingTrialCriterionDictionary> readingTrialCriterionDictionaryRepository, IRepository<ReadingTrialCriterionDictionary> readingTrialCriterionDictionaryRepository,
IRepository<VisitTask> visitTaskRepository, IRepository<VisitTask> visitTaskRepository,
IRepository<SystemCriterionDictionaryCode> systemCriterionDictionaryCodeRepository, IRepository<SystemCriterionDictionaryCode> 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.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, CriterionId = inDto.SystemCriterionId,
DictionaryId = x.DictionaryId, DictionaryId = x.DictionaryId,
IsSystemCriterion = true, 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.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, CriterionId = inDto.SystemCriterionId,
DictionaryId = x, DictionaryId = x,
IsSystemCriterion = true, IsSystemCriterion = true,
@ -537,7 +537,7 @@ namespace IRaCIS.Core.Application.Service.RC
[HttpPost] [HttpPost]
public async Task<IResponseOutput> SetDictionaryFollowVisitUse(SetDictionaryFollowVisitUseInDto inDto) public async Task<IResponseOutput> SetDictionaryFollowVisitUse(SetDictionaryFollowVisitUseInDto inDto)
{ {
await _readingCriterionDictionaryRepository.UpdatePartialFromQueryAsync(inDto.Id, x => new ReadingCriterionDictionary() await _readingCriterionDictionaryRepository.UpdatePartialFromQueryAsync(inDto.Id, x => new ReadingSystemCriterionDictionary()
{ {
IsFollowVisitUse = inDto.IsFollowVisitUse IsFollowVisitUse = inDto.IsFollowVisitUse
}); });
@ -556,7 +556,7 @@ namespace IRaCIS.Core.Application.Service.RC
[HttpPost] [HttpPost]
public async Task<IResponseOutput> SetDictionaryBaseLineUse(SetDictionaryBaseLineUseInDto inDto) public async Task<IResponseOutput> SetDictionaryBaseLineUse(SetDictionaryBaseLineUseInDto inDto)
{ {
await _readingCriterionDictionaryRepository.UpdatePartialFromQueryAsync(inDto.Id, x => new ReadingCriterionDictionary() await _readingCriterionDictionaryRepository.UpdatePartialFromQueryAsync(inDto.Id, x => new ReadingSystemCriterionDictionary()
{ {
IsBaseLineUse = inDto.IsBaseLineUse IsBaseLineUse = inDto.IsBaseLineUse
}); });
@ -602,7 +602,7 @@ namespace IRaCIS.Core.Application.Service.RC
[HttpPost] [HttpPost]
public async Task<bool> EditCriterionDictionary(EditCriterionDictionaryInDto inDto) public async Task<bool> EditCriterionDictionary(EditCriterionDictionaryInDto inDto)
{ {
await _readingCriterionDictionaryRepository.UpdatePartialFromQueryAsync(inDto.Id,x=>new ReadingCriterionDictionary() { await _readingCriterionDictionaryRepository.UpdatePartialFromQueryAsync(inDto.Id,x=>new ReadingSystemCriterionDictionary() {
CrterionDictionaryGroup=inDto.CrterionDictionaryGroup 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.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, CriterionId = inDto.CriterionId,
DictionaryId = x, 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.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, CriterionId = inDto.CriterionId,
DictionaryId = x.DictionaryId, DictionaryId = x.DictionaryId,

4
IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
View File

@ -26,7 +26,7 @@ namespace IRaCIS.Application.Services
private readonly IRepository<ClinicalDataSystemSet> _clinicalDataSystemSetRepository; private readonly IRepository<ClinicalDataSystemSet> _clinicalDataSystemSetRepository;
private readonly IRepository<Dictionary> _dictionaryRepository; private readonly IRepository<Dictionary> _dictionaryRepository;
private readonly IReadingImageTaskService _iReadingImageTaskService; private readonly IReadingImageTaskService _iReadingImageTaskService;
private readonly IRepository<ReadingCriterionDictionary> _readingCriterionDictionaryRepository; private readonly IRepository<ReadingSystemCriterionDictionary> _readingCriterionDictionaryRepository;
private readonly IRepository<ReadingTableQuestionTrial> _readingTableQuestionTrialRepository; private readonly IRepository<ReadingTableQuestionTrial> _readingTableQuestionTrialRepository;
private readonly IRepository<ReadingCriterionPage> _readingCriterionPageRepository; private readonly IRepository<ReadingCriterionPage> _readingCriterionPageRepository;
private readonly IRepository<Trial> _trialRepository; private readonly IRepository<Trial> _trialRepository;
@ -46,7 +46,7 @@ namespace IRaCIS.Application.Services
IRepository<ClinicalDataSystemSet> ClinicalDataSystemSetRepository, IRepository<ClinicalDataSystemSet> ClinicalDataSystemSetRepository,
IRepository<Dictionary> dictionaryRepository, IRepository<Dictionary> dictionaryRepository,
IReadingImageTaskService iReadingImageTaskService, IReadingImageTaskService iReadingImageTaskService,
IRepository<ReadingCriterionDictionary> readingCriterionDictionaryRepository, IRepository<ReadingSystemCriterionDictionary> readingCriterionDictionaryRepository,
IRepository<ReadingTableQuestionTrial> readingTableQuestionTrialRepository, IRepository<ReadingTableQuestionTrial> readingTableQuestionTrialRepository,
IRepository<ReadingCriterionPage> readingCriterionPageRepository, IRepository<ReadingCriterionPage> readingCriterionPageRepository,
IRepository<Trial> trialRepository, IRepository<Trial> trialRepository,

4
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
View File

@ -345,8 +345,8 @@ namespace IRaCIS.Application.Services
result.TaskList.ForEach(x => result.TaskList.ForEach(x =>
{ {
x.AfterQuestionList = x.BeforeQuestionList x.AfterQuestionList = x.BeforeQuestionList.Where(x => x.IsJudgeQuestion)
.GroupJoin( .GroupJoin(
globalReadingQuestion globalReadingQuestion
, l => new { a = l.QuestionId, b = x.VisitTaskId } , l => new { a = l.QuestionId, b = x.VisitTaskId }
, r => new { a = r.QuestionId, b = r.TaskId } , r => new { a = r.QuestionId, b = r.TaskId }

4
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
View File

@ -42,7 +42,7 @@ namespace IRaCIS.Application.Services
private readonly IRepository<ReadModule> _readModuleRepository; private readonly IRepository<ReadModule> _readModuleRepository;
private readonly IRepository<DicomInstance> _dicomInstanceRepository; private readonly IRepository<DicomInstance> _dicomInstanceRepository;
private readonly IRepository<OrganInfo> _organInfoRepository; private readonly IRepository<OrganInfo> _organInfoRepository;
private readonly IRepository<ReadingCriterionDictionary> _readingCriterionDictionaryRepository; private readonly IRepository<ReadingSystemCriterionDictionary> _readingCriterionDictionaryRepository;
private readonly IRepository<ReadingTrialCriterionDictionary> _readingTrialCriterionDictionaryRepository; private readonly IRepository<ReadingTrialCriterionDictionary> _readingTrialCriterionDictionaryRepository;
private readonly IRepository<TumorAssessment_RECIST1Point1> _tumorAssessmentRepository; private readonly IRepository<TumorAssessment_RECIST1Point1> _tumorAssessmentRepository;
private readonly IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository; private readonly IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository;
@ -80,7 +80,7 @@ namespace IRaCIS.Application.Services
IRepository<DicomInstance> dicomInstanceRepository, IRepository<DicomInstance> dicomInstanceRepository,
IRepository<OrganInfo> organInfoRepository, IRepository<OrganInfo> organInfoRepository,
IMemoryCache cache, IMemoryCache cache,
IRepository<ReadingCriterionDictionary> readingCriterionDictionaryRepository, IRepository<ReadingSystemCriterionDictionary> readingCriterionDictionaryRepository,
IRepository<ReadingTrialCriterionDictionary> readingTrialCriterionDictionaryRepository, IRepository<ReadingTrialCriterionDictionary> readingTrialCriterionDictionaryRepository,
IRepository<TumorAssessment_RECIST1Point1> tumorAssessmentRepository, IRepository<TumorAssessment_RECIST1Point1> tumorAssessmentRepository,
IRepository<ReadingTableAnswerRowInfo> readingTableAnswerRowInfoRepository, IRepository<ReadingTableAnswerRowInfo> readingTableAnswerRowInfoRepository,

6
IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
View File

@ -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.SiteCodes, u => u.MapFrom(s => s.ReadingPeriodSites.Select(x => x.TrialSite.TrialSiteCode)))
.ForMember(d => d.PlanCount, u => u.MapFrom(s => s.ReadingPeriodPlanList.Count)); .ForMember(d => d.PlanCount, u => u.MapFrom(s => s.ReadingPeriodPlanList.Count));
CreateMap<ReadingCriterionDictionary, CriterionDictionaryInfo>() CreateMap<ReadingSystemCriterionDictionary, CriterionDictionaryInfo>()
.ForMember(d => d.ChildGroup, u => u.MapFrom(s => s.Dictionary.ChildGroup)) .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.Code, u => u.MapFrom(s => s.Dictionary.Code))
.ForMember(d => d.Description, u => u.MapFrom(s => s.Dictionary.Description)) .ForMember(d => d.Description, u => u.MapFrom(s => s.Dictionary.Description))
@ -252,8 +252,8 @@ namespace IRaCIS.Core.Application.Service
#region 阅片部位 #region 阅片部位
CreateMap<CriterionNidusTrial, CriterionNidusView>(); CreateMap<CriterionNidusTrial, CriterionNidusView>();
CreateMap<CriterionNidus, CriterionNidusView>(); CreateMap<CriterionNidusSystem, CriterionNidusView>();
CreateMap<CriterionNidus, CriterionNidusAddOrEdit>().ReverseMap(); CreateMap<CriterionNidusSystem, CriterionNidusAddOrEdit>().ReverseMap();
CreateMap<OrganInfoAddOrEdit, OrganInfo>(); CreateMap<OrganInfoAddOrEdit, OrganInfo>();
CreateMap<OrganInfo, OrganInfoView>(); CreateMap<OrganInfo, OrganInfoView>();

4
IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
View File

@ -38,7 +38,7 @@ namespace IRaCIS.Core.Application
private readonly IEasyCachingProvider _provider; private readonly IEasyCachingProvider _provider;
private readonly IOrganInfoService _iOrganInfoService; private readonly IOrganInfoService _iOrganInfoService;
private readonly IRepository<TaskAllocationRule> _taskAllocationRuleRepository; private readonly IRepository<TaskAllocationRule> _taskAllocationRuleRepository;
private readonly IRepository<ReadingCriterionDictionary> _readingCriterionDictionaryRepository; private readonly IRepository<ReadingSystemCriterionDictionary> _readingCriterionDictionaryRepository;
private readonly IRepository<ReadingTrialCriterionDictionary> _readingTrialCriterionDictionaryRepository; private readonly IRepository<ReadingTrialCriterionDictionary> _readingTrialCriterionDictionaryRepository;
private readonly IReadingQuestionService iReadingQuestionService; private readonly IReadingQuestionService iReadingQuestionService;
private readonly IRepository<TrialCriterionAdditionalAssessmentType> _trialCriterionAdditionalAssessmentTypeRepository; private readonly IRepository<TrialCriterionAdditionalAssessmentType> _trialCriterionAdditionalAssessmentTypeRepository;
@ -61,7 +61,7 @@ namespace IRaCIS.Core.Application
IRepository<ClinicalDataTrialSet> clinicalDataTrialSetRepository, IRepository<ClinicalDataTrialSet> clinicalDataTrialSetRepository,
IRepository<ReadingCriterionPage> readingCriterionPageRepository, IRepository<ReadingCriterionPage> readingCriterionPageRepository,
IRepository<TaskAllocationRule> taskAllocationRuleRepository, IRepository<TaskAllocationRule> taskAllocationRuleRepository,
IRepository<ReadingCriterionDictionary> readingCriterionDictionaryRepository, IRepository<ReadingSystemCriterionDictionary> readingCriterionDictionaryRepository,
IRepository<ReadingTrialCriterionDictionary> readingTrialCriterionDictionaryRepository, IRepository<ReadingTrialCriterionDictionary> readingTrialCriterionDictionaryRepository,
IReadingQuestionService iReadingQuestionService, IReadingQuestionService iReadingQuestionService,
IEasyCachingProvider provider, IEasyCachingProvider provider,

2
IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
View File

@ -408,7 +408,7 @@ namespace IRaCIS.Application.Services
await _repository.BatchDeleteAsync<ConsistencyCheckFile>(o => o.TrialId == trialId) || await _repository.BatchDeleteAsync<ConsistencyCheckFile>(o => o.TrialId == trialId) ||
await _repository.BatchDeleteAsync<CriterionNidus>(o => o.TrialReadingCriterion.TrialId == trialId) || await _repository.BatchDeleteAsync<CriterionNidusSystem>(o => o.TrialReadingCriterion.TrialId == trialId) ||

4
IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidus.cs → IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusSystem.cs
View File

@ -12,8 +12,8 @@ namespace IRaCIS.Core.Domain.Models
/// <summary> /// <summary>
/// 标准病灶中间表 /// 标准病灶中间表
/// </summary> /// </summary>
[Table("CriterionNidus")] [Table("CriterionNidusSystem")]
public class CriterionNidus : Entity, IAuditAdd public class CriterionNidusSystem : Entity, IAuditAdd
{ {
/// <summary> /// <summary>

4
IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingCriterionDictionary.cs → IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingSystemCriterionDictionary.cs
View File

@ -10,8 +10,8 @@ namespace IRaCIS.Core.Domain.Models
///<summary> ///<summary>
///ReadingCriterionDictionary ///ReadingCriterionDictionary
///</summary> ///</summary>
[Table("ReadingCriterionDictionary")] [Table("ReadingSystemCriterionDictionary")]
public class ReadingCriterionDictionary : Entity, IAuditAdd public class ReadingSystemCriterionDictionary : Entity, IAuditAdd
{ {
/// <summary> /// <summary>
/// CriterionId /// CriterionId

8
IRaCIS.Core.Domain/SQLFile/Test.sql
View File

@ -1017,13 +1017,13 @@ SELECT NEWID(), TaskId, RelevanceTaskId, 2,ReadingTaskRelation.CreateTime ,Readi
-----------------------------------------2023-04-24----------------------------------- -----------------------------------------2023-04-24-----------------------------------
-- 维护CriterionNidusTrial 数据 -- 维护CriterionNidusTrial 数据
INSERT INTO CriterionNidusTrial (Id, CriterionId, CreateTime, CreateUserId, LesionType, OrganType) INSERT INTO CriterionNidusTrial (Id, CriterionId, CreateTime, CreateUserId, LesionType, OrganType)
SELECT NEWID(), CriterionId, GETDATE(), '00000000-0000-0000-0000-000000000000', LesionType, OrganType SELECT id, CriterionId, CreateTime, '00000000-0000-0000-0000-000000000000', LesionType, OrganType
FROM CriterionNidus FROM CriterionNidusSystem
WHERE CriterionId NOT IN (SELECT DISTINCT CriterionId FROM CriterionNidusTrial ) and IsSystemCriterion=0 WHERE CriterionId NOT IN (SELECT DISTINCT CriterionId FROM CriterionNidusTrial ) and IsSystemCriterion=0
-- 维护ReadingTrialCriterionDictionary 数据 -- 维护ReadingTrialCriterionDictionary 数据
INSERT INTO ReadingTrialCriterionDictionary (Id, CriterionId, DictionaryId, CreateTime, CreateUserId, ParentCode, IsBaseLineUse, IsFollowVisitUse, CrterionDictionaryGroup) 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 SELECT id, RC.CriterionId, RC.DictionaryId, CreateTime, '00000000-0000-0000-0000-000000000000', RC.ParentCode, RC.IsBaseLineUse, RC.IsFollowVisitUse, RC.CrterionDictionaryGroup
FROM ReadingCriterionDictionary RC FROM ReadingSystemCriterionDictionary RC
WHERE CriterionId NOT IN (SELECT DISTINCT CriterionId FROM ReadingTrialCriterionDictionary ) and IsSystemCriterion=0 WHERE CriterionId NOT IN (SELECT DISTINCT CriterionId FROM ReadingTrialCriterionDictionary ) and IsSystemCriterion=0

16
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -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<string>(); var dicValueList = new List<string>();
if (dicIdList.Count() == 0) 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 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 type = GetEntityAuditOpt(item);
var entity = item.Entity as CriterionNidus; var entity = item.Entity as CriterionNidusSystem;
var extraIdentification = string.Empty; var extraIdentification = string.Empty;
@ -583,7 +583,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
await InsertInspection<CriterionNidus>(entity, type, x => new InspectionConvertDTO() await InsertInspection<CriterionNidusSystem>(entity, type, x => new InspectionConvertDTO()
{ {
IsDistinctionInterface = false, IsDistinctionInterface = false,
@ -618,14 +618,14 @@ namespace IRaCIS.Core.Infra.EFCore.Common
// 项目 系统公用表 // 项目 系统公用表
//配置标准 病灶类型 自动计算标识 "LesionType", "QuestionType" //配置标准 病灶类型 自动计算标识 "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 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 保存 //查询出字典的Value ValueCN Des 保存
var dicIdList = allList.Select(t => t.DictionaryId).ToList(); var dicIdList = allList.Select(t => t.DictionaryId).ToList();
@ -657,7 +657,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
} }
await InsertInspection<ReadingCriterionDictionary>(cloneEntity, type, x => new InspectionConvertDTO() await InsertInspection<ReadingSystemCriterionDictionary>(cloneEntity, type, x => new InspectionConvertDTO()
{ {
ObjectRelationParentId = x.CriterionId, ObjectRelationParentId = x.CriterionId,

4
IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
View File

@ -216,7 +216,7 @@ namespace IRaCIS.Core.Infra.EFCore
public virtual DbSet<ReadingTaskRelation> ReadingTaskRelation { get; set; } public virtual DbSet<ReadingTaskRelation> ReadingTaskRelation { get; set; }
public virtual DbSet<OrganInfo> OrganInfo { get; set; } public virtual DbSet<OrganInfo> OrganInfo { get; set; }
public virtual DbSet<ReadingCriterionDictionary> ReadingCriterionDictionary { get; set; } public virtual DbSet<ReadingSystemCriterionDictionary> ReadingSystemCriterionDictionary { get; set; }
public virtual DbSet<ReadingTableAnswerRowInfo> ReadingTableAnswerRowInfo { get; set; } public virtual DbSet<ReadingTableAnswerRowInfo> ReadingTableAnswerRowInfo { get; set; }
public virtual DbSet<OrganTrialInfo> OrganTrialInfo { get; set; } public virtual DbSet<OrganTrialInfo> OrganTrialInfo { get; set; }
public virtual DbSet<ReadingTableQuestionSystem> ReadingTableQuestionSystem { get; set; } public virtual DbSet<ReadingTableQuestionSystem> ReadingTableQuestionSystem { get; set; }
@ -259,7 +259,7 @@ namespace IRaCIS.Core.Infra.EFCore
public virtual DbSet<ReadingMedicalReviewDialog> ReadingMedicalReviewDialog { get; set; } public virtual DbSet<ReadingMedicalReviewDialog> ReadingMedicalReviewDialog { get; set; }
public virtual DbSet<CriterionNidus> CriterionNidus { get; set; } public virtual DbSet<CriterionNidusSystem> CriterionNidusSystem { get; set; }
public virtual DbSet<CriterionNidusTrial> CriterionNidusTrial { get; set; } public virtual DbSet<CriterionNidusTrial> CriterionNidusTrial { get; set; }