临床数据bug
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
74dd5369cb
commit
1cf0ac0c53
|
|
@ -190,23 +190,24 @@ namespace IRaCIS.Application.Services
|
|||
.WhereIf(inDto.IsBaseline, x => x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Subject || x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit)
|
||||
.WhereIf(!inDto.IsBaseline, x => x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit)
|
||||
.Where(x => x.ClinicalDataTrialSet.TrialId == inDto.TrialId && x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC)
|
||||
.Include(x=>x.ClinicalDataTrialSet)
|
||||
.OrderBy(x=>x.ClinicalDataTrialSet.CreateTime)
|
||||
.Include(x => x.ClinicalDataTrialSet)
|
||||
.OrderBy(x => x.ClinicalDataTrialSet.CreateTime)
|
||||
.Select(x => new GetCRCClinicalDataOutDto()
|
||||
{
|
||||
Id = x.Id,
|
||||
ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName.LanguageName(x.ClinicalDataTrialSet.ClinicalDataSetEnName, _userInfo.IsEn_Us) ,
|
||||
ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName.LanguageName(x.ClinicalDataTrialSet.ClinicalDataSetEnName, _userInfo.IsEn_Us),
|
||||
ClinicalUploadType = x.ClinicalDataTrialSet.ClinicalUploadType,
|
||||
ClinicalDataSetEnName=x.ClinicalDataTrialSet.ClinicalDataSetEnName,
|
||||
ClinicalDataSetEnName = x.ClinicalDataTrialSet.ClinicalDataSetEnName,
|
||||
ClinicalDataTrialSetId = x.ClinicalDataTrialSet.Id,
|
||||
FileName = x.ClinicalDataTrialSet.FileName,
|
||||
UploadRole = x.ClinicalDataTrialSet.UploadRole,
|
||||
Path = x.ClinicalDataTrialSet.Path,
|
||||
IsBlind = x.IsBlind,
|
||||
IsComplete = x.IsComplete,
|
||||
ClinicalFromList=x.Subject.ClinicalFormList.Where(y=>y.ReadingId==x.ReadingId&&y.ClinicalDataTrialSetId==x.ClinicalDataTrialSetId).Select(y=> new ClinicalFromData() {
|
||||
CheckDate=y.CheckDate,
|
||||
ClinicalFormId=y.Id
|
||||
ClinicalFromList = x.Subject.ClinicalFormList.Where(y => y.ReadingId == x.ReadingId && y.ClinicalDataTrialSetId == x.ClinicalDataTrialSetId).Select(y => new ClinicalFromData()
|
||||
{
|
||||
CheckDate = y.CheckDate,
|
||||
ClinicalFormId = y.Id
|
||||
}).ToList(),
|
||||
PDFFileList = x.ReadingClinicalDataPDFList.Select(y => new GetFileDto()
|
||||
{
|
||||
|
|
@ -287,7 +288,7 @@ namespace IRaCIS.Application.Services
|
|||
//}
|
||||
|
||||
data.IsBlind = inDto.IsBlind;
|
||||
data.IsComplete=inDto.IsComplete;
|
||||
data.IsComplete = inDto.IsComplete;
|
||||
data.IsSign = true;
|
||||
data.ReadingClinicalDataState = ReadingClinicalDataStatus.HaveSigned;
|
||||
|
||||
|
|
@ -304,7 +305,16 @@ namespace IRaCIS.Application.Services
|
|||
|
||||
await this.iServiceProvider.GetService<IReadingImageTaskService>().AddOncologyTask(readingId);
|
||||
|
||||
await DealVisiTaskClinicalDataSignedAsync(data.TrialId, data.SubjectId, data.ReadingId, data.IsVisit, inDto.TrialReadingCriterionId);
|
||||
//如果先生成了任务，再签名subject级别 PM 临床数据，那么会导致其他标准的任务签名状态无法得到维护
|
||||
|
||||
var needDealTrialReadingCriterionIdList = _repository.Where<ClinicalDataTrialSet>(t => t.Id == data.ClinicalDataTrialSetId)
|
||||
.SelectMany(t => t.TrialClinicalDataSetCriteriaList)
|
||||
.Select(u => u.TrialReadingCriterionId).Distinct().ToList();
|
||||
|
||||
foreach (var trialReadingCriterionId in needDealTrialReadingCriterionIdList)
|
||||
{
|
||||
await DealVisiTaskClinicalDataSignedAsync(data.TrialId, data.SubjectId, data.ReadingId, data.IsVisit, trialReadingCriterionId);
|
||||
}
|
||||
|
||||
return ResponseOutput.Result(result);
|
||||
}
|
||||
|
|
@ -414,7 +424,7 @@ namespace IRaCIS.Application.Services
|
|||
}
|
||||
|
||||
//有序阅片才维护 IsFrontTaskNeedSignButNotSign 这个状态
|
||||
if (_readingQuestionCriterionTrialRepository.Any(t=>t.Id==trialReadingCritrialId && t.IsReadingTaskViewInOrder == true))
|
||||
if (_readingQuestionCriterionTrialRepository.Any(t => t.Id == trialReadingCritrialId && t.IsReadingTaskViewInOrder == true))
|
||||
{
|
||||
|
||||
|
||||
|
|
@ -429,7 +439,7 @@ namespace IRaCIS.Application.Services
|
|||
(t.Subject.SubjectVisitTaskList.AsQueryable().Where(visitTaskLambda).Any(c => c.IsNeedClinicalDataSign == true && c.IsClinicalDataSign == false && c.VisitTaskNum < t.VisitTaskNum)
|
||||
|
||||
// 前序存在 未一致性核查未通过的
|
||||
|| t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum>sv.VisitNum)
|
||||
|| t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum > sv.VisitNum)
|
||||
|
||||
))
|
||||
.Select(t => t.Id);
|
||||
|
|
@ -537,13 +547,13 @@ namespace IRaCIS.Application.Services
|
|||
.WhereIf(inDto.IsVisit && !inDto.IsBaseLine, x => x.ClinicalDataLevel == ClinicalLevel.SubjectVisit)
|
||||
.WhereIf(!inDto.IsVisit, x => x.ClinicalDataLevel == ClinicalLevel.ImageRead || x.ClinicalDataLevel == ClinicalLevel.OncologyRead)
|
||||
.WhereIf(readModule != null, x => x.ClinicalDataLevel == keyValuePairs[readModule!.ModuleType])
|
||||
.WhereIf(inDto.TrialReadingCriterionId!=null,x=>x.TrialClinicalDataSetCriteriaList.Any(y=>y.TrialReadingCriterionId== inDto.TrialReadingCriterionId))
|
||||
.WhereIf(inDto.TrialReadingCriterionId != null, x => x.TrialClinicalDataSetCriteriaList.Any(y => y.TrialReadingCriterionId == inDto.TrialReadingCriterionId))
|
||||
//.WhereIf(criterion!=null,x=>x.CriterionEnumListStr.Contains($"|{(int)criterion.CriterionType}|"))
|
||||
.Select(x => new GetTrialClinicalDataSelectOutDto()
|
||||
{
|
||||
ClinicalDataLevel = x.ClinicalDataLevel,
|
||||
ClinicalDataSetName = x.ClinicalDataSetName.LanguageName(x.ClinicalDataSetEnName, _userInfo.IsEn_Us),
|
||||
ClinicalDataSetEnName=x.ClinicalDataSetEnName,
|
||||
ClinicalDataSetEnName = x.ClinicalDataSetEnName,
|
||||
ClinicalUploadType = x.ClinicalUploadType,
|
||||
FileName = x.FileName,
|
||||
Path = x.Path,
|
||||
|
|
@ -709,10 +719,11 @@ namespace IRaCIS.Application.Services
|
|||
}
|
||||
|
||||
var readingIds = result.Select(x => x.ReadingId).ToList();
|
||||
var clinical = await _clinicalFormRepository.Where(x => readingIds.Contains(x.ReadingId??default(Guid))).ToListAsync();
|
||||
result.Where(x => x.ClinicalUploadType == ClinicalUploadType.Structuring).ForEach(x => {
|
||||
var clinical = await _clinicalFormRepository.Where(x => readingIds.Contains(x.ReadingId ?? default(Guid))).ToListAsync();
|
||||
result.Where(x => x.ClinicalUploadType == ClinicalUploadType.Structuring).ForEach(x =>
|
||||
{
|
||||
|
||||
x.ClinicalFromList = clinical.Where(y => y.ReadingId == x.ReadingId&&y.ClinicalDataTrialSetId==x.ClinicalDataTrialSetId).Select(y => new ClinicalFromData()
|
||||
x.ClinicalFromList = clinical.Where(y => y.ReadingId == x.ReadingId && y.ClinicalDataTrialSetId == x.ClinicalDataTrialSetId).Select(y => new ClinicalFromData()
|
||||
{
|
||||
CheckDate = y.CheckDate,
|
||||
ClinicalFormId = y.Id
|
||||
|
|
@ -723,17 +734,18 @@ namespace IRaCIS.Application.Services
|
|||
|
||||
// 这里处理CRC上传 阅片期的临床数据
|
||||
var readModule = await _readModuleRepository.Where(x => x.Id == inDto.ReadingId)
|
||||
.WhereIf(inDto.SelectIsSign,x=>x.IsPMConfirm)
|
||||
.WhereIf(inDto.SelectIsSign, x => x.IsPMConfirm)
|
||||
.WhereIf(!inDto.SelectIsSign, x => x.IsCRCConfirm)
|
||||
.FirstOrDefaultAsync();
|
||||
if (readModule != null)
|
||||
{
|
||||
var moduleCriterionFromList = await _readModuleCriterionFromRepository
|
||||
.WhereIf(inDto.ClinicalDataTrialSetId != null, x => x.ClinicalForm.ClinicalDataTrialSetId == inDto.ClinicalDataTrialSetId)
|
||||
.Where(x => x.ReadModuleId == readModule.Id).Select(x => new{
|
||||
ClinicalFormId= x.ClinicalFormId,
|
||||
CheckDate= x.ClinicalForm.CheckDate,
|
||||
ClinicalDataTrialSetId= x.ClinicalForm.ClinicalDataTrialSetId
|
||||
.Where(x => x.ReadModuleId == readModule.Id).Select(x => new
|
||||
{
|
||||
ClinicalFormId = x.ClinicalFormId,
|
||||
CheckDate = x.ClinicalForm.CheckDate,
|
||||
ClinicalDataTrialSetId = x.ClinicalForm.ClinicalDataTrialSetId
|
||||
|
||||
|
||||
}).ToListAsync();
|
||||
|
|
@ -742,16 +754,16 @@ namespace IRaCIS.Application.Services
|
|||
var clinicalresult = await _clinicalDataTrialSetRepository.Where(x => x.UploadRole == UploadRole.CRC && x.ClinicalUploadType == ClinicalUploadType.Structuring)
|
||||
.WhereIf(readModule.ReadingSetType == ReadingSetType.ImageReading, x => x.ClinicalDataLevel == ClinicalLevel.ImageRead)
|
||||
.WhereIf(readModule.ReadingSetType == ReadingSetType.TumorReading, x => x.ClinicalDataLevel == ClinicalLevel.OncologyRead)
|
||||
.Where(x=>x.TrialClinicalDataSetCriteriaList.Any(y=>y.TrialReadingCriterionId==readModule.TrialReadingCriterionId))
|
||||
.Where(x => x.TrialClinicalDataSetCriteriaList.Any(y => y.TrialReadingCriterionId == readModule.TrialReadingCriterionId))
|
||||
.Select(x => new GetReadingClinicalDataListOutDto()
|
||||
{
|
||||
|
||||
ClinicalDataLevel = x.ClinicalDataLevel,
|
||||
SubjectId = inDto.SubjectId,
|
||||
ReadingId = default(Guid),
|
||||
IsCRCApplicationRevoke=readModule.IsCRCApplicationRevoke,
|
||||
IsCRCConfirm= readModule.IsCRCConfirm,
|
||||
IsPMConfirm= readModule.IsPMConfirm,
|
||||
IsCRCApplicationRevoke = readModule.IsCRCApplicationRevoke,
|
||||
IsCRCConfirm = readModule.IsCRCConfirm,
|
||||
IsPMConfirm = readModule.IsPMConfirm,
|
||||
ClinicalDataSetName = x.ClinicalDataSetName.LanguageName(x.ClinicalDataSetEnName, _userInfo.IsEn_Us),
|
||||
ClinicalDataSetEnName = x.ClinicalDataSetEnName,
|
||||
ClinicalDataTrialSetId = x.Id,
|
||||
|
|
@ -762,7 +774,7 @@ namespace IRaCIS.Application.Services
|
|||
IsCRCUpload = x.UploadRole == UploadRole.CRC,
|
||||
IsNeedMerge = true,
|
||||
ReadModuleId = readModule.Id,
|
||||
TrialClinicalDataSetCriteriaList=x.TrialClinicalDataSetCriteriaList,
|
||||
TrialClinicalDataSetCriteriaList = x.TrialClinicalDataSetCriteriaList,
|
||||
//FileCount = x.FileCount,
|
||||
|
||||
//ReadingClinicalDataState = x.ReadingClinicalDataState,
|
||||
|
|
@ -813,7 +825,7 @@ namespace IRaCIS.Application.Services
|
|||
result = result.Where(x => x.UploadRole == UploadRole.PM).ToList();
|
||||
break;
|
||||
case GetClinicalType.CRCConfirm:
|
||||
result = result.Where(x => x.UploadRole == UploadRole.CRC&&x.IsCRCConfirm&&!x.IsPMConfirm).ToList();
|
||||
result = result.Where(x => x.UploadRole == UploadRole.CRC && x.IsCRCConfirm && !x.IsPMConfirm).ToList();
|
||||
break;
|
||||
case GetClinicalType.HasSign:
|
||||
result = result.Where(x => x.IsSign).ToList();
|
||||
|
|
@ -849,15 +861,15 @@ namespace IRaCIS.Application.Services
|
|||
{
|
||||
var resultQuery = _readingClinicalDataRepository.Where(x => x.SubjectId == inDto.SubjectId)
|
||||
.Where(x => x.ReadingId == inDto.ReadingId)
|
||||
.WhereIf(inDto.ClinicalDataTrialSetId!=null, x=>x.ClinicalDataTrialSetId==inDto.TrialReadingCriterionId)
|
||||
.Where(x => x.ClinicalDataTrialSet.TrialClinicalDataSetCriteriaList.Any(t=>t.TrialReadingCriterionId==inDto.TrialReadingCriterionId))
|
||||
.WhereIf(inDto.ClinicalDataTrialSetId != null, x => x.ClinicalDataTrialSetId == inDto.TrialReadingCriterionId)
|
||||
.Where(x => x.ClinicalDataTrialSet.TrialClinicalDataSetCriteriaList.Any(t => t.TrialReadingCriterionId == inDto.TrialReadingCriterionId))
|
||||
.Select(x => new GetReadingClinicalDataListOutDto()
|
||||
{
|
||||
ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel,
|
||||
SubjectId = x.SubjectId,
|
||||
ReadingId = x.ReadingId,
|
||||
ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName.LanguageName(x.ClinicalDataTrialSet.ClinicalDataSetEnName, _userInfo.IsEn_Us),
|
||||
ClinicalDataSetEnName =x.ClinicalDataTrialSet.ClinicalDataSetEnName,
|
||||
ClinicalDataSetEnName = x.ClinicalDataTrialSet.ClinicalDataSetEnName,
|
||||
ClinicalDataTrialSetId = x.ClinicalDataTrialSetId,
|
||||
IsSign = x.IsSign,
|
||||
ClinicalUploadType = x.ClinicalDataTrialSet.ClinicalUploadType,
|
||||
|
|
@ -884,7 +896,8 @@ namespace IRaCIS.Application.Services
|
|||
|
||||
var readingIds = result.Select(x => x.ReadingId).ToList();
|
||||
var clinical = await _clinicalFormRepository.Where(x => readingIds.Contains(x.ReadingId ?? default(Guid))).ToListAsync();
|
||||
result.Where(x => x.ClinicalUploadType == ClinicalUploadType.Structuring).ForEach(x => {
|
||||
result.Where(x => x.ClinicalUploadType == ClinicalUploadType.Structuring).ForEach(x =>
|
||||
{
|
||||
|
||||
x.ClinicalFromList = clinical.Where(y => y.ReadingId == x.ReadingId && y.ClinicalDataTrialSetId == x.ClinicalDataTrialSetId).Select(y => new ClinicalFromData()
|
||||
{
|
||||
|
|
@ -895,14 +908,15 @@ namespace IRaCIS.Application.Services
|
|||
});
|
||||
|
||||
// 这里处理CRC上传 阅片期的临床数据
|
||||
var readModule = await _readModuleRepository.Where(x => x.Id == inDto.ReadingId&&x.IsCRCConfirm)
|
||||
var readModule = await _readModuleRepository.Where(x => x.Id == inDto.ReadingId && x.IsCRCConfirm)
|
||||
.FirstOrDefaultAsync();
|
||||
if (readModule != null)
|
||||
{
|
||||
var moduleCriterionFromList = await _readModuleCriterionFromRepository.Where(x => x.ReadModuleId == readModule.Id)
|
||||
|
||||
.WhereIf(inDto.ClinicalDataTrialSetId != null, x => x.ClinicalForm.ClinicalDataTrialSetId == inDto.TrialReadingCriterionId)
|
||||
.Select(x => new {
|
||||
.Select(x => new
|
||||
{
|
||||
ClinicalFormId = x.ClinicalFormId,
|
||||
CheckDate = x.ClinicalForm.CheckDate,
|
||||
ClinicalDataTrialSetId = x.ClinicalForm.ClinicalDataTrialSetId
|
||||
|
|
@ -911,8 +925,8 @@ namespace IRaCIS.Application.Services
|
|||
}).ToListAsync();
|
||||
|
||||
|
||||
var clinicalresult = await _clinicalDataTrialSetRepository.Where(x => x.UploadRole == UploadRole.CRC&&x.ClinicalUploadType== ClinicalUploadType.Structuring)
|
||||
.WhereIf(readModule.ReadingSetType == ReadingSetType.ImageReading,x=>x.ClinicalDataLevel== ClinicalLevel.ImageRead)
|
||||
var clinicalresult = await _clinicalDataTrialSetRepository.Where(x => x.UploadRole == UploadRole.CRC && x.ClinicalUploadType == ClinicalUploadType.Structuring)
|
||||
.WhereIf(readModule.ReadingSetType == ReadingSetType.ImageReading, x => x.ClinicalDataLevel == ClinicalLevel.ImageRead)
|
||||
.WhereIf(readModule.ReadingSetType == ReadingSetType.TumorReading, x => x.ClinicalDataLevel == ClinicalLevel.OncologyRead)
|
||||
.Where(x => x.TrialClinicalDataSetCriteriaList.Any(y => y.TrialReadingCriterionId == readModule.TrialReadingCriterionId))
|
||||
.Select(x => new GetReadingClinicalDataListOutDto()
|
||||
|
|
@ -921,9 +935,9 @@ namespace IRaCIS.Application.Services
|
|||
ClinicalDataLevel = x.ClinicalDataLevel,
|
||||
SubjectId = inDto.SubjectId,
|
||||
ReadingId = default(Guid),
|
||||
IsCRCApplicationRevoke= readModule.IsCRCApplicationRevoke,
|
||||
IsCRCApplicationRevoke = readModule.IsCRCApplicationRevoke,
|
||||
IsCRCConfirm = readModule.IsCRCConfirm,
|
||||
IsPMConfirm=readModule.IsPMConfirm,
|
||||
IsPMConfirm = readModule.IsPMConfirm,
|
||||
|
||||
ClinicalDataSetName = x.ClinicalDataSetName.LanguageName(x.ClinicalDataSetEnName, _userInfo.IsEn_Us),
|
||||
ClinicalDataSetEnName = x.ClinicalDataSetEnName,
|
||||
|
|
@ -959,7 +973,7 @@ namespace IRaCIS.Application.Services
|
|||
|
||||
}).ToList();
|
||||
|
||||
x.IsSign = readModule.IsPMConfirm ?true : false;
|
||||
x.IsSign = readModule.IsPMConfirm ? true : false;
|
||||
x.ReadingClinicalDataState = readModule.IsPMConfirm ? ReadingClinicalDataStatus.HaveSigned : ReadingClinicalDataStatus.HaveChecked;
|
||||
|
||||
});
|
||||
|
|
@ -976,7 +990,7 @@ namespace IRaCIS.Application.Services
|
|||
result = result.Where(x => x.UploadRole == UploadRole.PM).ToList();
|
||||
break;
|
||||
case GetClinicalType.CRCConfirm:
|
||||
result = result.Where(x => x.UploadRole == UploadRole.CRC&&x.IsCRCConfirm&&!x.IsPMConfirm).ToList();
|
||||
result = result.Where(x => x.UploadRole == UploadRole.CRC && x.IsCRCConfirm && !x.IsPMConfirm).ToList();
|
||||
break;
|
||||
case GetClinicalType.HasSign:
|
||||
result = result.Where(x => x.IsSign).ToList();
|
||||
|
|
|
|||
Loading…
Reference in New Issue