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

修改一版

Uat_Study
he 2022-06-27 09:43:01 +08:00
parent 45d5a64cdf
commit 9a571620fe
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -1045,6 +1045,11 @@
名称 名称
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetCRCClinicalDataOutDto.ClinicalUploadType">
<summary>
上传方式
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetCRCClinicalDataOutDto.FileName"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetCRCClinicalDataOutDto.FileName">
<summary> <summary>
模板文件名称 模板文件名称

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

@ -207,7 +207,14 @@ namespace IRaCIS.Application.Services
[HttpPost] [HttpPost]
public async Task<List<GetTrialClinicalDataSelectOutDto>> GetTrialClinicalDataSelect(GetTrialClinicalDataSelectIndto inDto) public async Task<List<GetTrialClinicalDataSelectOutDto>> GetTrialClinicalDataSelect(GetTrialClinicalDataSelectIndto inDto)
{ {
if (_userInfo.UserTypeShortName == "PM" || _userInfo.UserTypeShortName == "IR") var userTypes = new List<int>() {
(int)UserTypeEnum.APM,
(int)UserTypeEnum.SPM,
(int)UserTypeEnum.CPM,
(int)UserTypeEnum.IndependentReviewer,
};
if (userTypes.Contains(_userInfo.UserTypeEnumInt))
{ {
inDto.UploadRole = UploadRole.PM; inDto.UploadRole = UploadRole.PM;
@ -226,8 +233,6 @@ namespace IRaCIS.Application.Services
ClinicalDataLevel = x.ClinicalDataLevel, ClinicalDataLevel = x.ClinicalDataLevel,
ClinicalDataSetName = x.ClinicalDataSetName, ClinicalDataSetName = x.ClinicalDataSetName,
ClinicalUploadType = x.ClinicalUploadType, ClinicalUploadType = x.ClinicalUploadType,
ClinicalDataLevelName = x.ClinicalDataLevel.GetDisplayName(),
ClinicalUploadTypeName = x.ClinicalUploadType.GetDisplayName(),
Id = x.Id Id = x.Id
}).ToListAsync() ; }).ToListAsync() ;
return clinicalList; return clinicalList;
@ -260,13 +265,19 @@ 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>() {
(int)UserTypeEnum.APM,
(int)UserTypeEnum.SPM,
(int)UserTypeEnum.CPM,
(int)UserTypeEnum.IndependentReviewer,
};
if (_userInfo.UserTypeShortName == "PM" || _userInfo.UserTypeShortName == "IR") if (userPMTypes.Contains(_userInfo.UserTypeEnumInt))
{ {
inDto.UploadRole = UploadRole.PM; inDto.UploadRole = UploadRole.PM;
} }
else if (_userInfo.UserTypeShortName == "CRC" || _userInfo.UserTypeShortName == "IQC")
else if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.IQC)
{ {
inDto.UploadRole = UploadRole.CRC; inDto.UploadRole = UploadRole.CRC;
} }
@ -294,18 +305,9 @@ namespace IRaCIS.Application.Services
}).ToList() }).ToList()
}); });
var result=await resultQuery.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField == null ? nameof(GetReadingClinicalDataListOutDto.ClinicalDataSetName) : inDto.SortField, var result=await resultQuery.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField == null ? nameof(GetReadingClinicalDataListOutDto.ClinicalDataSetName) : inDto.SortField,
inDto.Asc); inDto.Asc);
return result;
return result;
} }