From aa8bdf786505a7f65e5f8908a9237afa66e40804 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Mon, 27 Jun 2022 17:06:37 +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 --- .../Reading/ReadingClinicalDataService.cs | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs index 6e48bb09..20c31526 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs @@ -285,19 +285,20 @@ namespace IRaCIS.Application.Services [HttpPost] public async Task> GetReadingClinicalDataList(GetReadingClinicalDataListIndto inDto) { - var userPMTypes = new List() { - (int)UserTypeEnum.ProjectManager, - (int)UserTypeEnum.SPM, - (int)UserTypeEnum.CPM, - (int)UserTypeEnum.IndependentReviewer, - }; + //var userPMTypes = new List() { + // (int)UserTypeEnum.ProjectManager, + // (int)UserTypeEnum.SPM, + // (int)UserTypeEnum.CPM, + // (int)UserTypeEnum.IndependentReviewer, + // }; - if (userPMTypes.Contains(_userInfo.UserTypeEnumInt)) - { - inDto.UploadRole = UploadRole.PM; - } + //if (userPMTypes.Contains(_userInfo.UserTypeEnumInt)) + //{ + // inDto.UploadRole = UploadRole.PM; + //} - else if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.IQC) + //else + if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.IQC) { inDto.UploadRole = UploadRole.CRC; } @@ -306,7 +307,7 @@ namespace IRaCIS.Application.Services var resultQuery = _readingClinicalDataRepository.Where(x => x.SubjectId == inDto.SubjectId) .Where(x => x.ReadingId == inDto.ReadingId) .WhereIf(inDto.UploadRole == UploadRole.CRC, x => x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC) - .WhereIf(inDto.UploadRole == UploadRole.PM && !isBaseLine, x => x.ClinicalDataTrialSet.UploadRole == UploadRole.PM) + //.WhereIf(inDto.UploadRole == UploadRole.PM && !isBaseLine, x => x.ClinicalDataTrialSet.UploadRole == UploadRole.PM) .Select(x => new GetReadingClinicalDataListOutDto() { ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel, SubjectId = x.SubjectId,