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

S-43

Uat_Study
he 2023-07-11 16:30:50 +08:00
parent de3c59b7f5
commit c6a4a2dd0b
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
View File

@ -701,6 +701,8 @@ namespace IRaCIS.Application.Services
ClinicalDataLevel = x.ClinicalDataLevel, ClinicalDataLevel = x.ClinicalDataLevel,
SubjectId = inDto.SubjectId, SubjectId = inDto.SubjectId,
ReadingId = default(Guid), ReadingId = default(Guid),
IsCRCConfirm= readModule.IsCRCConfirm,
IsPMConfirm= readModule.IsPMConfirm,
ClinicalDataSetName = x.ClinicalDataSetName.LanguageName(x.ClinicalDataSetEnName, _userInfo.IsEn_Us), ClinicalDataSetName = x.ClinicalDataSetName.LanguageName(x.ClinicalDataSetEnName, _userInfo.IsEn_Us),
ClinicalDataSetEnName = x.ClinicalDataSetEnName, ClinicalDataSetEnName = x.ClinicalDataSetEnName,
ClinicalDataTrialSetId = x.Id, ClinicalDataTrialSetId = x.Id,
@ -761,7 +763,7 @@ namespace IRaCIS.Application.Services
result = result.Where(x => x.UploadRole == UploadRole.PM).ToList(); result = result.Where(x => x.UploadRole == UploadRole.PM).ToList();
break; break;
case GetClinicalType.CRCConfirm: case GetClinicalType.CRCConfirm:
result = result.Where(x => x.UploadRole == UploadRole.CRC).ToList(); result = result.Where(x => x.UploadRole == UploadRole.CRC&&x.IsCRCConfirm&&!x.IsPMConfirm).ToList();
break; break;
case GetClinicalType.HasSign: case GetClinicalType.HasSign:
result = result.Where(x => x.IsSign).ToList(); result = result.Where(x => x.IsSign).ToList();
@ -856,7 +858,10 @@ namespace IRaCIS.Application.Services
ClinicalDataLevel = x.ClinicalDataLevel, ClinicalDataLevel = x.ClinicalDataLevel,
SubjectId = inDto.SubjectId, SubjectId = inDto.SubjectId,
ReadingId = default(Guid), ReadingId = default(Guid),
ClinicalDataSetName = x.ClinicalDataSetName.LanguageName(x.ClinicalDataSetEnName, _userInfo.IsEn_Us), IsCRCConfirm= readModule.IsCRCConfirm,
IsPMConfirm=readModule.IsPMConfirm,
ClinicalDataSetName = x.ClinicalDataSetName.LanguageName(x.ClinicalDataSetEnName, _userInfo.IsEn_Us),
ClinicalDataSetEnName = x.ClinicalDataSetEnName, ClinicalDataSetEnName = x.ClinicalDataSetEnName,
ClinicalDataTrialSetId = x.Id, ClinicalDataTrialSetId = x.Id,
IsSign = readModule.IsPMConfirm, IsSign = readModule.IsPMConfirm,
@ -907,7 +912,7 @@ namespace IRaCIS.Application.Services
result = result.Where(x => x.UploadRole == UploadRole.PM).ToList(); result = result.Where(x => x.UploadRole == UploadRole.PM).ToList();
break; break;
case GetClinicalType.CRCConfirm: case GetClinicalType.CRCConfirm:
result = result.Where(x => x.UploadRole == UploadRole.CRC).ToList(); result = result.Where(x => x.UploadRole == UploadRole.CRC&&x.IsCRCConfirm&&!x.IsPMConfirm).ToList();
break; break;
case GetClinicalType.HasSign: case GetClinicalType.HasSign:
result = result.Where(x => x.IsSign).ToList(); result = result.Where(x => x.IsSign).ToList();

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

@ -335,11 +335,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public Guid ReadingId { get; set; } public Guid ReadingId { get; set; }
public bool IsCRCConfirm { get; set; } = false;
/// <summary> public bool IsPMConfirm { get; set; } = false;
/// 项目配置临床类型Name
/// </summary> /// <summary>
public string ClinicalDataSetName { get; set; } /// 项目配置临床类型Name
/// </summary>
public string ClinicalDataSetName { get; set; }
/// <summary> /// <summary>
/// 英文名称 /// 英文名称