XCKJ
/
EI-Image-Viewer-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改一版

Test.EIImageViewer
he 2022-06-27 17:06:37 +08:00
parent 31158df4a0
commit aa8bdf7865
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs
View File

@ -285,19 +285,20 @@ namespace IRaCIS.Application.Services
[HttpPost] [HttpPost]
public async Task<PageOutput<GetReadingClinicalDataListOutDto>> GetReadingClinicalDataList(GetReadingClinicalDataListIndto inDto) public async Task<PageOutput<GetReadingClinicalDataListOutDto>> GetReadingClinicalDataList(GetReadingClinicalDataListIndto inDto)
{ {
var userPMTypes = new List<int>() { //var userPMTypes = new List<int>() {
(int)UserTypeEnum.ProjectManager, // (int)UserTypeEnum.ProjectManager,
(int)UserTypeEnum.SPM, // (int)UserTypeEnum.SPM,
(int)UserTypeEnum.CPM, // (int)UserTypeEnum.CPM,
(int)UserTypeEnum.IndependentReviewer, // (int)UserTypeEnum.IndependentReviewer,
}; // };
if (userPMTypes.Contains(_userInfo.UserTypeEnumInt)) //if (userPMTypes.Contains(_userInfo.UserTypeEnumInt))
{ //{
inDto.UploadRole = UploadRole.PM; // 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; inDto.UploadRole = UploadRole.CRC;
} }
@ -306,7 +307,7 @@ namespace IRaCIS.Application.Services
var resultQuery = _readingClinicalDataRepository.Where(x => x.SubjectId == inDto.SubjectId) var resultQuery = _readingClinicalDataRepository.Where(x => x.SubjectId == inDto.SubjectId)
.Where(x => x.ReadingId == inDto.ReadingId) .Where(x => x.ReadingId == inDto.ReadingId)
.WhereIf(inDto.UploadRole == UploadRole.CRC, x => x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC) .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() { .Select(x => new GetReadingClinicalDataListOutDto() {
ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel, ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel,
SubjectId = x.SubjectId, SubjectId = x.SubjectId,