From 440790a01ae568c3a33d8a1a20ee02de66b5260a Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Fri, 24 Jun 2022 10:53:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Allocation/VisitTaskHelpeService.cs | 3 +++ .../Service/Reading/ClinicalDataSetService.cs | 1 + .../Dto/ClinicalDataServiceViewModel.cs | 20 +++++++++++++++++++ .../Reading/Dto/ReadingClinicalDataDto.cs | 5 +++++ .../Reading/Dto/ReadingImageTaskViewModel.cs | 2 ++ .../Reading/ReadingClinicalDataService.cs | 3 ++- .../Reading/ReadingImageTaskService.cs | 10 +++++----- IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs | 16 +++++++++++++++ .../Reading/ClinicalDataSystemSet.cs | 6 ++++++ .../Reading/ClinicalDataTrialSet.cs | 5 +++++ .../Reading/View/ReadingClinicalDataView.cs | 4 ++-- 11 files changed, 67 insertions(+), 8 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs index 982c4062..bf2ead20 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs @@ -365,6 +365,7 @@ namespace IRaCIS.Core.Application.Service TaskName = item.ReadingName, ArmEnum = Arm.DoubleReadingArm1,//特殊 Code = currentMaxCodeInt + 1, + TaskBlindName = item.ReadingName, SouceReadModuleId = item.ReadModuleId, TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)), ReadingCategory = item.ReadingCategory @@ -377,6 +378,7 @@ namespace IRaCIS.Core.Application.Service TaskName = item.ReadingName, ArmEnum = Arm.DoubleReadingArm2,//特殊 Code = currentMaxCodeInt + 2, + TaskBlindName = item.ReadingName, SouceReadModuleId = item.ReadModuleId, TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 2, nameof(VisitTask)), ReadingCategory = item.ReadingCategory @@ -398,6 +400,7 @@ namespace IRaCIS.Core.Application.Service ArmEnum = Arm.SingleReadingArm, //特殊 Code = currentMaxCodeInt + 1, SouceReadModuleId = item.ReadModuleId, + TaskBlindName = item.ReadingName, TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)), ReadingCategory = item.ReadingCategory }); diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs index fa1e70aa..b0eed3be 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs @@ -131,6 +131,7 @@ namespace IRaCIS.Application.Services ClinicalDataSetName=x.ClinicalDataSetName, ClinicalDataLevel=x.ClinicalDataLevel, ClinicalUploadType=x.ClinicalUploadType, + UploadRole=x.UploadRole, TrialId= trialId, }).ToList(); diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs index 0e6e86a5..5a6b1bb6 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs @@ -32,6 +32,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public ClinicalUploadType ClinicalUploadType { get; set; } + /// + /// 上传角色 + /// + public UploadRole UploadRole { get; set; } + /// /// 是否启用 /// @@ -68,6 +73,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public ClinicalLevel ClinicalDataLevel { get; set; } + /// + /// 上传角色 + /// + public UploadRole UploadRole { get; set; } + /// /// 上传方式 @@ -115,6 +125,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public Guid CreateUserId { get; set; } + /// + /// 上传角色 + /// + public UploadRole UploadRole { get; set; } + /// /// 项目ID @@ -175,6 +190,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public ClinicalUploadType ClinicalUploadType { get; set; } + /// + /// 上传角色 + /// + public UploadRole UploadRole { get; set; } + /// /// 创建时间 /// diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs index 18f0e24d..5335d94e 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs @@ -307,6 +307,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public bool IsBaseLine { get; set; } + + /// + /// 上传角色 + /// + public UploadRole? UploadRole { get; set; } } public class GetTrialClinicalDataSelectOutDto diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 04566f16..1dd5e0fc 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -142,6 +142,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto { public Guid TaskId { get; set; } public string TaskName { get; set; } + + public string TaskBlindName { get; set; } } public class GetReadingPastResultListInDto diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs index 18e2ab89..3184580b 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs @@ -149,7 +149,8 @@ namespace IRaCIS.Application.Services public async Task> GetTrialClinicalDataSelect(GetTrialClinicalDataSelectIndto inDto) { var usedIdsQuery = _readingClinicalDataRepository.Where(x => x.ReadingId == inDto.ReadingId && x.Id != inDto.ReadingClinicalDataId).Select(x => x.ClinicalDataTrialSetId); - List clinicalList = await _clinicalDataTrialSetRepository.Where(x=>x.TrialId==inDto.TrialId&&x.IsConfirm&&x.ClinicalDataSetName!= "既往局部治疗史") + List clinicalList = await _clinicalDataTrialSetRepository.Where(x=>x.TrialId==inDto.TrialId&&x.IsConfirm) + .WhereIf(inDto.UploadRole!=null,x=>x.UploadRole==inDto.UploadRole) .Where(x=> !usedIdsQuery.Contains(x.Id)) .WhereIf(inDto.IsVisit&&inDto.IsBaseLine,x=>x.ClinicalDataLevel == ClinicalLevel.Subject||x.ClinicalDataLevel== ClinicalLevel.SubjectVisit) .WhereIf(inDto.IsVisit&&! inDto.IsBaseLine, x => x.ClinicalDataLevel == ClinicalLevel.SubjectVisit) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index 98773fb3..7e182a14 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -270,7 +270,7 @@ namespace IRaCIS.Application.Services List groupList = qusetionList.Where(x => x.ParentId == null).ToList(); groupList.ForEach(x => { - FindChildQuestion(x, qusetionList); + this.FindChildQuestion(x, qusetionList); }); return (groupList, new { @@ -305,7 +305,7 @@ namespace IRaCIS.Application.Services List groupList = qusetionList.Where(x => x.ParentId == null).ToList(); groupList.ForEach(x => { - FindChildQuestion(x, qusetionList); + this.FindChildQuestion(x, qusetionList); }); return groupList; @@ -388,9 +388,9 @@ namespace IRaCIS.Application.Services [HttpPost] public async Task> GetReadingPastResultList(GetReadingPastResultListInDto inDto) { - var readingPastResultListawait =await _visitTaskRepository.Where(x => x.TrialId == inDto.TrialId && x.DoctorUserId == _userInfo.Id) + var readingPastResultList =await _visitTaskRepository.Where(x => x.TrialId == inDto.TrialId && x.DoctorUserId == _userInfo.Id) .ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); - return readingPastResultListawait; + return readingPastResultList; } /// @@ -406,7 +406,7 @@ namespace IRaCIS.Application.Services { trialReadingQuestion.Childrens.ForEach(x => { - FindChildQuestion(x, questionlists); + this.FindChildQuestion(x, questionlists); }); } } diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs index c2f27f2c..936a3aca 100644 --- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs +++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs @@ -99,6 +99,22 @@ namespace IRaCIS.Core.Domain.Share Revocation=2, } + /// + /// 上传角色 + /// + public enum UploadRole + { + /// + /// CRC + /// + CRC=0, + + /// + /// PM + /// + PM=1, + } + /// /// 上传方式 /// diff --git a/IRaCIS.Core.Domain/Reading/ClinicalDataSystemSet.cs b/IRaCIS.Core.Domain/Reading/ClinicalDataSystemSet.cs index 32da2dc9..0dda8fd5 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalDataSystemSet.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalDataSystemSet.cs @@ -50,6 +50,12 @@ namespace IRaCIS.Core.Domain.Models /// public bool IsEnable { get; set; } + + /// + /// 上传角色 + /// + public UploadRole UploadRole { get; set; } + } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalDataTrialSet.cs b/IRaCIS.Core.Domain/Reading/ClinicalDataTrialSet.cs index a2f65525..efb5d9bb 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalDataTrialSet.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalDataTrialSet.cs @@ -57,6 +57,11 @@ namespace IRaCIS.Core.Domain.Models /// public bool IsConfirm { get; set; } + /// + /// 上传角色 + /// + public UploadRole UploadRole { get; set; } + /// /// /// diff --git a/IRaCIS.Core.Domain/Reading/View/ReadingClinicalDataView.cs b/IRaCIS.Core.Domain/Reading/View/ReadingClinicalDataView.cs index 1a3dcb54..b50053ed 100644 --- a/IRaCIS.Core.Domain/Reading/View/ReadingClinicalDataView.cs +++ b/IRaCIS.Core.Domain/Reading/View/ReadingClinicalDataView.cs @@ -12,7 +12,7 @@ namespace IRaCIS.Core.Domain.Models { /// - /// 项目ID + /// 项目ID /// public Guid TrialId { get; set; } @@ -43,7 +43,7 @@ namespace IRaCIS.Core.Domain.Models /// - /// + /// 临床数据级别 /// public ClinicalLevel ClinicalDataLevel { get; set; }