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

修改一版

Uat_Study
he 2022-06-24 10:53:42 +08:00
parent 3d78d99f93
commit 440790a01a
11 changed files with 67 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
View File

@ -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
});

1
IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs
View File

@ -131,6 +131,7 @@ namespace IRaCIS.Application.Services
ClinicalDataSetName=x.ClinicalDataSetName,
ClinicalDataLevel=x.ClinicalDataLevel,
ClinicalUploadType=x.ClinicalUploadType,
UploadRole=x.UploadRole,
TrialId= trialId,
}).ToList();

20
IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs
View File

@ -32,6 +32,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public ClinicalUploadType ClinicalUploadType { get; set; }
/// <summary>
/// 上传角色
/// </summary>
public UploadRole UploadRole { get; set; }
/// <summary>
/// 是否启用
/// </summary>
@ -68,6 +73,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public ClinicalLevel ClinicalDataLevel { get; set; }
/// <summary>
/// 上传角色
/// </summary>
public UploadRole UploadRole { get; set; }
/// <summary>
/// 上传方式
@ -115,6 +125,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public Guid CreateUserId { get; set; }
/// <summary>
/// 上传角色
/// </summary>
public UploadRole UploadRole { get; set; }
/// <summary>
/// 项目ID
@ -175,6 +190,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public ClinicalUploadType ClinicalUploadType { get; set; }
/// <summary>
/// 上传角色
/// </summary>
public UploadRole UploadRole { get; set; }
/// <summary>
/// 创建时间
/// </summary>

5
IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
View File

@ -307,6 +307,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public bool IsBaseLine { get; set; }
/// <summary>
/// 上传角色
/// </summary>
public UploadRole? UploadRole { get; set; }
}
public class GetTrialClinicalDataSelectOutDto

2
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
View File

@ -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

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

@ -149,7 +149,8 @@ namespace IRaCIS.Application.Services
public async Task<List<GetTrialClinicalDataSelectOutDto>> GetTrialClinicalDataSelect(GetTrialClinicalDataSelectIndto inDto)
{
var usedIdsQuery = _readingClinicalDataRepository.Where(x => x.ReadingId == inDto.ReadingId && x.Id != inDto.ReadingClinicalDataId).Select(x => x.ClinicalDataTrialSetId);
List<GetTrialClinicalDataSelectOutDto> clinicalList = await _clinicalDataTrialSetRepository.Where(x=>x.TrialId==inDto.TrialId&&x.IsConfirm&&x.ClinicalDataSetName!= "既往局部治疗史")
List<GetTrialClinicalDataSelectOutDto> 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)

10
IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
View File

@ -270,7 +270,7 @@ namespace IRaCIS.Application.Services
List<GetTrialReadingQuestionOutDto> 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<GetTrialReadingQuestionOutDto> 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<List<GetReadingPastResultListOutDto>> 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<GetReadingPastResultListOutDto>(_mapper.ConfigurationProvider).ToListAsync();
return readingPastResultListawait;
return readingPastResultList;
}
/// <summary>
@ -406,7 +406,7 @@ namespace IRaCIS.Application.Services
{
trialReadingQuestion.Childrens.ForEach(x =>
{
FindChildQuestion(x, questionlists);
this.FindChildQuestion(x, questionlists);
});
}
}

16
IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
View File

@ -99,6 +99,22 @@ namespace IRaCIS.Core.Domain.Share
Revocation=2,
}
/// <summary>
/// 上传角色
/// </summary>
public enum UploadRole
{
/// <summary>
/// CRC
/// </summary>
CRC=0,
/// <summary>
/// PM
/// </summary>
PM=1,
}
/// <summary>
/// 上传方式
/// </summary>

6
IRaCIS.Core.Domain/Reading/ClinicalDataSystemSet.cs
View File

@ -50,6 +50,12 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public bool IsEnable { get; set; }
/// <summary>
/// 上传角色
/// </summary>
public UploadRole UploadRole { get; set; }
}

5
IRaCIS.Core.Domain/Reading/ClinicalDataTrialSet.cs
View File

@ -57,6 +57,11 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public bool IsConfirm { get; set; }
/// <summary>
/// 上传角色
/// </summary>
public UploadRole UploadRole { get; set; }
/// <summary>
///
/// </summary>

4
IRaCIS.Core.Domain/Reading/View/ReadingClinicalDataView.cs
View File

@ -12,7 +12,7 @@ namespace IRaCIS.Core.Domain.Models
{
/// <summary>
/// 项目ID
/// 项目ID
/// </summary>
public Guid TrialId { get; set; }
@ -43,7 +43,7 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
///
/// 临床数据级别
/// </summary>
public ClinicalLevel ClinicalDataLevel { get; set; }