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

S-008

Uat_Study
he 2023-07-05 14:49:19 +08:00
parent 2e2d912aeb
commit 438e0947ac
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs
View File

@ -449,6 +449,7 @@ namespace IRaCIS.Core.Application.Service
IsPMConfirm = x.IsPMConfirm, IsPMConfirm = x.IsPMConfirm,
SubjectCode = x.Subject.Code, SubjectCode = x.Subject.Code,
ReadModuleId = x.Id, ReadModuleId = x.Id,
ModuleName=x.ModuleName,
}); });
@ -553,7 +554,7 @@ namespace IRaCIS.Core.Application.Service
/// <param name="inDto"></param> /// <param name="inDto"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public async Task<List<GetClinicalTableListOutDto>> GetClinicalTableList(GetClinicalTableListInDto inDto) public async Task<(List<GetClinicalTableListOutDto>,object)> GetClinicalTableList(GetClinicalTableListInDto inDto)
{ {
var readModule=await _readModuleRepository.Where(x => x.Id == inDto.ReadModuleId).FirstNotNullAsync(); var readModule=await _readModuleRepository.Where(x => x.Id == inDto.ReadModuleId).FirstNotNullAsync();
@ -585,6 +586,7 @@ namespace IRaCIS.Core.Application.Service
List<GetClinicalTableListOutDto> result = new List<GetClinicalTableListOutDto>(); List<GetClinicalTableListOutDto> result = new List<GetClinicalTableListOutDto>();
clinicalDataTrialSetIds.ForEach(x => { clinicalDataTrialSetIds.ForEach(x => {
GetClinicalTableListOutDto dto = new GetClinicalTableListOutDto(); GetClinicalTableListOutDto dto = new GetClinicalTableListOutDto();
dto.ModuleName = readModule.ModuleName;
dto.ClinicalDataSetName = confirmList.Where(y => y.ClinicalDataTrialSetId == x).Select(y => y.ClinicalDataSetName).First(); dto.ClinicalDataSetName = confirmList.Where(y => y.ClinicalDataTrialSetId == x).Select(y => y.ClinicalDataSetName).First();
dto.QuestionList = questionList.Where(y => y.TrialClinicalId == x).OrderBy(y => y.ShowOrder).ToList(); dto.QuestionList = questionList.Where(y => y.TrialClinicalId == x).OrderBy(y => y.ShowOrder).ToList();
dto.AnswerList = new List<Dictionary<string, string>>(); dto.AnswerList = new List<Dictionary<string, string>>();
@ -602,9 +604,12 @@ namespace IRaCIS.Core.Application.Service
}); });
result.Add(dto); result.Add(dto);
}); });
return result; return (result, new
{
readModule.ModuleName,
});
} }
/// <summary> /// <summary>
@ -613,9 +618,10 @@ namespace IRaCIS.Core.Application.Service
/// <param name="inDto"></param> /// <param name="inDto"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public async Task<List<GetClinicalDateListOutDto>> GetClinicalDateList(GetCRCBeConfirmListInDto inDto) public async Task<(List<GetClinicalDateListOutDto>,object)> GetClinicalDateList(GetCRCBeConfirmListInDto inDto)
{ {
var confirmList = (await this.GetCRCConfirmList(new GetCRCConfirmListInDto() var readModule = await _readModuleRepository.Where(x => x.Id == inDto.ReadModuleId).FirstNotNullAsync();
var confirmList = (await this.GetCRCConfirmList(new GetCRCConfirmListInDto()
{ {
ReadModuleId = inDto.ReadModuleId, ReadModuleId = inDto.ReadModuleId,
TrialId = inDto.TrialId, TrialId = inDto.TrialId,
@ -633,7 +639,6 @@ namespace IRaCIS.Core.Application.Service
result.Add(new GetClinicalDateListOutDto() result.Add(new GetClinicalDateListOutDto()
{ {
ClinicalDataSetName = confirmList.Where(y => y.ClinicalDataTrialSetId == x).Select(y => y.ClinicalDataSetName).First(), ClinicalDataSetName = confirmList.Where(y => y.ClinicalDataTrialSetId == x).Select(y => y.ClinicalDataSetName).First(),
DateList = confirmList.Where(y => y.ClinicalDataTrialSetId == x).ToList() DateList = confirmList.Where(y => y.ClinicalDataTrialSetId == x).ToList()
@ -641,7 +646,9 @@ namespace IRaCIS.Core.Application.Service
}); });
return result; return (result,new {
readModule.ModuleName,
});
} }
/// <summary> /// <summary>

14
IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs
View File

@ -145,7 +145,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class GetClinicalTableListOutDto: GetClinicalQuestionAnswerListOutDto public class GetClinicalTableListOutDto: GetClinicalQuestionAnswerListOutDto
{ {
public string ClinicalDataSetName { get; set; } public string ClinicalDataSetName { get; set; }
}
/// <summary>
/// 模块名称
/// </summary>
public string ModuleName { get; set; }
}
public class GetCRCBeConfirm: GetCRCBeConfirmListOutDto public class GetCRCBeConfirm: GetCRCBeConfirmListOutDto
@ -210,7 +215,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid SubjectId { get; set; } public Guid SubjectId { get; set; }
public Guid ReadModuleId { get; set; } public Guid ReadModuleId { get; set; }
public bool IsPMConfirm { get; set; } /// <summary>
/// 模块名称
/// </summary>
public string ModuleName { get; set; }
public bool IsPMConfirm { get; set; }
public ReadingSetType ReadingSetType { get; set; } public ReadingSetType ReadingSetType { get; set; }