Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is running
Details
continuous-integration/drone/push Build is running
Details
commit
1adb7e6e2a
|
@ -5715,6 +5715,13 @@
|
||||||
影像阅片临床数据签名
|
影像阅片临床数据签名
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="M:IRaCIS.Core.Application.Service.ReadingClinicalDataService.GetVisitClinicalDataName(IRaCIS.Core.Application.Service.Reading.Dto.GetVisitClinicalDataNameInDto)">
|
||||||
|
<summary>
|
||||||
|
获取访视临床数据名称
|
||||||
|
</summary>
|
||||||
|
<param name="inDto"></param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
<member name="M:IRaCIS.Core.Application.Service.ReadingClinicalDataService.GetTrialClinicalDataSelect(IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataSelectIndto)">
|
<member name="M:IRaCIS.Core.Application.Service.ReadingClinicalDataService.GetTrialClinicalDataSelect(IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataSelectIndto)">
|
||||||
<summary>
|
<summary>
|
||||||
获取下拉菜单
|
获取下拉菜单
|
||||||
|
@ -7073,6 +7080,11 @@
|
||||||
是否查询所有的一致性分析临床数据 (为否只查询PDF)
|
是否查询所有的一致性分析临床数据 (为否只查询PDF)
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingOrTaskClinicalDataListInDto.IsGetTaskClinicalData">
|
||||||
|
<summary>
|
||||||
|
是否是阅片页面获取临床数据 (阅片其他访视任务需要获取受试者级别的)
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="T:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingClinicalDataListIndto">
|
<member name="T:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingClinicalDataListIndto">
|
||||||
<summary>
|
<summary>
|
||||||
获取访视列表
|
获取访视列表
|
||||||
|
@ -7268,6 +7280,11 @@
|
||||||
上传时间
|
上传时间
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="T:IRaCIS.Core.Application.Service.Reading.Dto.GetVisitClinicalDataNameInDto">
|
||||||
|
<summary>
|
||||||
|
获取临床数据名称
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataSelectIndto.TrialId">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialClinicalDataSelectIndto.TrialId">
|
||||||
<summary>
|
<summary>
|
||||||
项目ID
|
项目ID
|
||||||
|
|
|
@ -174,6 +174,8 @@ namespace IRaCIS.Application.Contracts
|
||||||
public class SelectionReviewerDTO : DoctorDTO
|
public class SelectionReviewerDTO : DoctorDTO
|
||||||
{
|
{
|
||||||
public int DoctorTrialState { get; set; }
|
public int DoctorTrialState { get; set; }
|
||||||
|
|
||||||
|
public bool IsEnroll { get; set; } = false;
|
||||||
public string OptUserName { get; set; } = string.Empty;
|
public string OptUserName { get; set; } = string.Empty;
|
||||||
public DateTime? OptTime { get; set; }
|
public DateTime? OptTime { get; set; }
|
||||||
public string? OptTimeStr => OptTime?.ToString("yyyy-MM-dd HH:mm:ss");
|
public string? OptTimeStr => OptTime?.ToString("yyyy-MM-dd HH:mm:ss");
|
||||||
|
|
|
@ -103,6 +103,8 @@ namespace IRaCIS.Core.Application.Service
|
||||||
var doctorStateList = await _enrollDetailRepository.Where(x => x.TrialId == inQuery.TrialId && x.EnrollStatus == EnrollStatus.HasApplyDownloadResume)
|
var doctorStateList = await _enrollDetailRepository.Where(x => x.TrialId == inQuery.TrialId && x.EnrollStatus == EnrollStatus.HasApplyDownloadResume)
|
||||||
.ProjectTo<DoctorStateModelDTO>(_mapper.ConfigurationProvider).ToListAsync();
|
.ProjectTo<DoctorStateModelDTO>(_mapper.ConfigurationProvider).ToListAsync();
|
||||||
|
|
||||||
|
var doctorEnrollList =await _enrollRepository.Where(x => x.TrialId == inQuery.TrialId && x.EnrollStatus >= EnrollStatus.InviteIntoGroup)
|
||||||
|
.ToListAsync();
|
||||||
result.CurrentPageData.ToList().ForEach(doctor =>
|
result.CurrentPageData.ToList().ForEach(doctor =>
|
||||||
{
|
{
|
||||||
//简历申请列表 --处理已经申请的
|
//简历申请列表 --处理已经申请的
|
||||||
|
@ -110,6 +112,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
if (doctorState != null)
|
if (doctorState != null)
|
||||||
{
|
{
|
||||||
doctor.DoctorTrialState = (int)EnrollStatus.HasApplyDownloadResume;
|
doctor.DoctorTrialState = (int)EnrollStatus.HasApplyDownloadResume;
|
||||||
|
doctor.IsEnroll = doctorEnrollList.Any(x => x.DoctorId == doctor.Id);
|
||||||
doctor.OptTime = doctorState.OptTime;
|
doctor.OptTime = doctorState.OptTime;
|
||||||
doctor.OptUserName = doctorState.OptUserName;
|
doctor.OptUserName = doctorState.OptUserName;
|
||||||
}
|
}
|
||||||
|
|
|
@ -73,6 +73,13 @@ namespace IRaCIS.Core.Application.Service
|
||||||
//插入中间表
|
//插入中间表
|
||||||
basicInfoModel.TitleIds.ForEach(titleId => doctor.DoctorDicRelationList.Add(new DoctorDictionary() { DoctorId = doctor.Id, KeyName = StaticData.Title, DictionaryId = titleId }));
|
basicInfoModel.TitleIds.ForEach(titleId => doctor.DoctorDicRelationList.Add(new DoctorDictionary() { DoctorId = doctor.Id, KeyName = StaticData.Title, DictionaryId = titleId }));
|
||||||
|
|
||||||
|
// 新增给默认值
|
||||||
|
doctor.CooperateStatus = ContractorStatusEnum.Noncooperation;
|
||||||
|
doctor.ReviewStatus = ReviewerInformationConfirmStatus.ConfirmRefuse;
|
||||||
|
doctor.AcceptingNewTrial = false;
|
||||||
|
doctor.ActivelyReading = false;
|
||||||
|
doctor.IsVirtual = false;
|
||||||
|
|
||||||
|
|
||||||
await _doctorRepository.AddAsync(doctor);
|
await _doctorRepository.AddAsync(doctor);
|
||||||
//_doctorRepository.Add(doctor);
|
//_doctorRepository.Add(doctor);
|
||||||
|
|
|
@ -88,6 +88,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
OtherClinicalExperienceCN = systemInfoDcotor.OtherClinicalExperienceCN,
|
OtherClinicalExperienceCN = systemInfoDcotor.OtherClinicalExperienceCN,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#region 概述
|
||||||
///没有就加
|
///没有就加
|
||||||
var summarizeCount = await _doctorSummarizeRepository.Where(x => x.DoctorId == inDto.DoctorId && x.TrialId == inDto.TrialId).CountAsync();
|
var summarizeCount = await _doctorSummarizeRepository.Where(x => x.DoctorId == inDto.DoctorId && x.TrialId == inDto.TrialId).CountAsync();
|
||||||
if (summarizeCount == 0)
|
if (summarizeCount == 0)
|
||||||
|
@ -95,17 +96,48 @@ namespace IRaCIS.Core.Application.Service
|
||||||
var main = await _doctorSummarizeRepository.Where(x => x.DoctorId == inDto.DoctorId && x.IsMain && x.TrialId == null).ProjectTo<SummarizeInfoDto>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
|
var main = await _doctorSummarizeRepository.Where(x => x.DoctorId == inDto.DoctorId && x.IsMain && x.TrialId == null).ProjectTo<SummarizeInfoDto>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
|
||||||
if (main != null)
|
if (main != null)
|
||||||
{
|
{
|
||||||
main.Id=null;
|
main.Id = null;
|
||||||
main.TrialId = inDto.TrialId;
|
main.TrialId = inDto.TrialId;
|
||||||
main.IsMain = false;
|
main.IsMain = false;
|
||||||
var entity = await _doctorSummarizeRepository.InsertOrUpdateAsync(main, true);
|
var entity = await _doctorSummarizeRepository.InsertOrUpdateAsync(main, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
doctorInfo = await _doctorRepository.AddAsync(doctor, true);
|
doctorInfo = await _doctorRepository.AddAsync(doctor, true);
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#region 临床试验
|
||||||
|
|
||||||
|
var trialExperienceList = await _trialExperienceRepository.Where(o => o.DoctorId == inDto.DoctorId)
|
||||||
|
.Where(x => x.ExperienceDataType == ExperienceDataType.System || x.ExperienceDataType == ExperienceDataType.SystemAuto).Include(x => x.ExperienceCriteriaList).ToListAsync();
|
||||||
|
List<TrialExperienceCriteria> criteriaList = new List<TrialExperienceCriteria>();
|
||||||
|
foreach (var item in trialExperienceList)
|
||||||
|
{
|
||||||
|
item.Trial = null;
|
||||||
|
item.TrialId = inDto.TrialId;
|
||||||
|
item.ExperienceDataType = ExperienceDataType.Trial;
|
||||||
|
item.Id = NewId.NextGuid();
|
||||||
|
item.ExperienceCriteriaList.ForEach(x => {
|
||||||
|
|
||||||
|
criteriaList.Add(new TrialExperienceCriteria()
|
||||||
|
{
|
||||||
|
DoctorId = item.DoctorId,
|
||||||
|
EvaluationCriteriaId = x.EvaluationCriteriaId,
|
||||||
|
TrialExperienceId = item.Id
|
||||||
|
});
|
||||||
|
});
|
||||||
|
item.ExperienceCriteriaList = new List<TrialExperienceCriteria>();
|
||||||
|
}
|
||||||
|
await _trialExperienceCriteriaRepository.AddRangeAsync(criteriaList);
|
||||||
|
await _trialExperienceRepository.AddRangeAsync(trialExperienceList);
|
||||||
|
await _trialExperienceRepository.SaveChangesAsync();
|
||||||
|
#endregion
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return doctorInfo;
|
return doctorInfo;
|
||||||
|
@ -124,23 +156,12 @@ namespace IRaCIS.Core.Application.Service
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// 当前项目没有则复制
|
// 先添加
|
||||||
if (!(await _trialExperienceRepository.AnyAsync(x => x.TrialId == inDto.TrialId &&x.ExperienceDataType== ExperienceDataType.Trial)))
|
await GetTrialDoctorInfo(new GetTrialDoctorInfoInDto()
|
||||||
{
|
{
|
||||||
var trialExperienceList = await _trialExperienceRepository.Where(o => o.DoctorId == inDto.DoctorId)
|
DoctorId = inDto.DoctorId,
|
||||||
.Where(x => x.ExperienceDataType == ExperienceDataType.System || x.ExperienceDataType == ExperienceDataType.SystemAuto).ToListAsync();
|
TrialId = inDto.TrialId.Value,
|
||||||
foreach (var item in trialExperienceList)
|
});
|
||||||
{
|
|
||||||
item.Trial = null;
|
|
||||||
item.TrialId = inDto.TrialId;
|
|
||||||
item.ExperienceDataType = ExperienceDataType.Trial;
|
|
||||||
item.Id = NewId.NextGuid();
|
|
||||||
}
|
|
||||||
|
|
||||||
await _trialExperienceRepository.AddRangeAsync(trialExperienceList);
|
|
||||||
await _trialExperienceRepository.SaveChangesAsync();
|
|
||||||
}
|
|
||||||
|
|
||||||
var doctorClinicalTrialExperienceList = await _trialExperienceRepository
|
var doctorClinicalTrialExperienceList = await _trialExperienceRepository
|
||||||
.Where(o => o.DoctorId == inDto.DoctorId)
|
.Where(o => o.DoctorId == inDto.DoctorId)
|
||||||
.Where(x => x.ExperienceDataType == ExperienceDataType.Trial|| x.ExperienceDataType == ExperienceDataType.TrialAuto)
|
.Where(x => x.ExperienceDataType == ExperienceDataType.Trial|| x.ExperienceDataType == ExperienceDataType.TrialAuto)
|
||||||
|
|
|
@ -36,6 +36,8 @@ namespace IRaCIS.Core.Application.Service
|
||||||
|
|
||||||
#region 临床数据基本增删改
|
#region 临床数据基本增删改
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 新增或者修改
|
/// 新增或者修改
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -605,6 +607,25 @@ namespace IRaCIS.Core.Application.Service
|
||||||
|
|
||||||
|
|
||||||
#region 临床数据相关查询
|
#region 临床数据相关查询
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取访视临床数据名称
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="inDto"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpPost]
|
||||||
|
public async Task<GetVisitClinicalDataNameOutDto> GetVisitClinicalDataName(GetVisitClinicalDataNameInDto inDto)
|
||||||
|
{
|
||||||
|
var clinicalDataNames = await _readingClinicalDataRepository.Where(x => x.ReadingId == inDto.Id).Select(x =>
|
||||||
|
_userInfo.IsEn_Us ? x.ClinicalDataTrialSet.ClinicalDataSetEnName : x.ClinicalDataTrialSet.ClinicalDataSetName).Distinct().ToListAsync();
|
||||||
|
|
||||||
|
return new GetVisitClinicalDataNameOutDto()
|
||||||
|
{
|
||||||
|
ClinicalDataName = string.Join(',', clinicalDataNames),
|
||||||
|
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取下拉菜单
|
/// 获取下拉菜单
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -681,6 +702,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
{
|
{
|
||||||
var readingNameOrTaskBlindName = string.Empty;
|
var readingNameOrTaskBlindName = string.Empty;
|
||||||
var subjectCode = string.Empty;
|
var subjectCode = string.Empty;
|
||||||
|
inDto.IsGetTaskClinicalData = true;
|
||||||
if (inDto.ReadingId == null)
|
if (inDto.ReadingId == null)
|
||||||
{
|
{
|
||||||
var visitTask = await _visitTaskRepository.AsQueryable().Include(x => x.Subject)
|
var visitTask = await _visitTaskRepository.AsQueryable().Include(x => x.Subject)
|
||||||
|
@ -701,23 +723,6 @@ namespace IRaCIS.Core.Application.Service
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
var readingIds = result.Select(x => x.ReadingId).ToList();
|
|
||||||
|
|
||||||
var previousHistoryList = await _previousHistoryRepository.Where(x => readingIds.Contains(x.SubjectVisitId)).ProjectTo<PreviousHistoryView>(_mapper.ConfigurationProvider).ToListAsync();
|
|
||||||
var previousOtherList = await _previousOtherRepository.Where(x => readingIds.Contains(x.SubjectVisitId)).ProjectTo<PreviousOtherView>(_mapper.ConfigurationProvider).ToListAsync();
|
|
||||||
var previousSurgeryList = await _previousSurgeryRepository.Where(x => readingIds.Contains(x.SubjectVisitId)).ProjectTo<PreviousSurgeryView>(_mapper.ConfigurationProvider).ToListAsync();
|
|
||||||
foreach (var item in result)
|
|
||||||
{
|
|
||||||
item.ClinicalTableData = new ClinicalDataTable()
|
|
||||||
{
|
|
||||||
PreviousHistoryList = previousHistoryList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(),
|
|
||||||
PreviousOtherList = previousOtherList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(),
|
|
||||||
PreviousSurgeryList = previousSurgeryList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(),
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
Dictionary<ClinicalLevel, int> keys = new Dictionary<ClinicalLevel, int>() {
|
Dictionary<ClinicalLevel, int> keys = new Dictionary<ClinicalLevel, int>() {
|
||||||
{ClinicalLevel.SubjectVisit,0 },
|
{ClinicalLevel.SubjectVisit,0 },
|
||||||
{ClinicalLevel.ImageRead,2 },
|
{ClinicalLevel.ImageRead,2 },
|
||||||
|
@ -809,6 +814,27 @@ namespace IRaCIS.Core.Application.Service
|
||||||
isSelfAnalysis = true;
|
isSelfAnalysis = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//下面改用readingIdList筛选 不然
|
||||||
|
List<Guid> readingIdList = new List<Guid>() {};
|
||||||
|
if (inDto.IsGetTaskClinicalData)
|
||||||
|
{
|
||||||
|
var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == inDto.ReadingId.Value).FirstOrDefaultAsync();
|
||||||
|
if (subjectVisit != null && !subjectVisit.IsBaseLine)
|
||||||
|
{
|
||||||
|
var baseId = await _subjectVisitRepository.Where(x => x.SubjectId == subjectVisit.SubjectId && x.IsBaseLine).Select(x => x.Id).FirstOrDefaultAsync();
|
||||||
|
readingIdList.Add(baseId);
|
||||||
|
}
|
||||||
|
|
||||||
|
var readModuleInfo = await _readModuleRepository.Where(x => x.Id == inDto.ReadingId.Value).FirstOrDefaultAsync();
|
||||||
|
if (readModuleInfo != null && readModuleInfo.ReadingSetType == ReadingSetType.ImageReading)
|
||||||
|
{
|
||||||
|
var baseId = await _subjectVisitRepository.Where(x => x.SubjectId == readModuleInfo.SubjectId && x.IsBaseLine).Select(x => x.Id).FirstOrDefaultAsync();
|
||||||
|
readingIdList.Add(baseId);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
// 一致性分析
|
// 一致性分析
|
||||||
if (isSelfAnalysis)
|
if (isSelfAnalysis)
|
||||||
{
|
{
|
||||||
|
@ -817,7 +843,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
.WhereIf(inDto.ReadingClinicalDataId != null, x => x.Id == inDto.ReadingClinicalDataId)
|
.WhereIf(inDto.ReadingClinicalDataId != null, x => x.Id == inDto.ReadingClinicalDataId)
|
||||||
.WhereIf(inDto.ClinicalDataTrialSetId != null, x => x.ClinicalDataTrialSetId == inDto.ClinicalDataTrialSetId)
|
.WhereIf(inDto.ClinicalDataTrialSetId != null, x => x.ClinicalDataTrialSetId == inDto.ClinicalDataTrialSetId)
|
||||||
.WhereIf(inDto.SelectIsSign, x => x.IsSign == true)
|
.WhereIf(inDto.SelectIsSign, x => x.IsSign == true)
|
||||||
.Where(x => x.ReadingId == inDto.ReadingId)
|
.Where(x => x.ReadingId == inDto.ReadingId||(readingIdList.Contains(x.ReadingId)&&x.ClinicalDataTrialSet.ClinicalDataLevel== ClinicalLevel.Subject))
|
||||||
.WhereIf(inDto.TrialReadingCriterionId != null, x => x.ClinicalDataTrialSet.TrialClinicalDataSetCriteriaList.Any(t => t.TrialReadingCriterionId == inDto.TrialReadingCriterionId))
|
.WhereIf(inDto.TrialReadingCriterionId != null, x => x.ClinicalDataTrialSet.TrialClinicalDataSetCriteriaList.Any(t => t.TrialReadingCriterionId == inDto.TrialReadingCriterionId))
|
||||||
.Select(x => new GetReadingClinicalDataListOutDto()
|
.Select(x => new GetReadingClinicalDataListOutDto()
|
||||||
{
|
{
|
||||||
|
@ -858,7 +884,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
.WhereIf(inDto.ReadingClinicalDataId != null, x => x.Id == inDto.ReadingClinicalDataId)
|
.WhereIf(inDto.ReadingClinicalDataId != null, x => x.Id == inDto.ReadingClinicalDataId)
|
||||||
.WhereIf(inDto.ClinicalDataTrialSetId != null, x => x.ClinicalDataTrialSetId == inDto.ClinicalDataTrialSetId)
|
.WhereIf(inDto.ClinicalDataTrialSetId != null, x => x.ClinicalDataTrialSetId == inDto.ClinicalDataTrialSetId)
|
||||||
.WhereIf(inDto.SelectIsSign, x => x.IsSign == true)
|
.WhereIf(inDto.SelectIsSign, x => x.IsSign == true)
|
||||||
.Where(x => x.ReadingId == inDto.ReadingId)
|
.Where(x => x.ReadingId == inDto.ReadingId || (readingIdList.Contains(x.ReadingId) && x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Subject))
|
||||||
.WhereIf(inDto.TrialReadingCriterionId != null, x => x.ClinicalDataTrialSet.TrialClinicalDataSetCriteriaList.Any(t => t.TrialReadingCriterionId == inDto.TrialReadingCriterionId))
|
.WhereIf(inDto.TrialReadingCriterionId != null, x => x.ClinicalDataTrialSet.TrialClinicalDataSetCriteriaList.Any(t => t.TrialReadingCriterionId == inDto.TrialReadingCriterionId))
|
||||||
.Where(x => x.ClinicalDataTrialSet.ClinicalUploadType != ClinicalUploadType.PDF || x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Study)
|
.Where(x => x.ClinicalDataTrialSet.ClinicalUploadType != ClinicalUploadType.PDF || x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Study)
|
||||||
.Select(x => new GetReadingClinicalDataListOutDto()
|
.Select(x => new GetReadingClinicalDataListOutDto()
|
||||||
|
@ -901,7 +927,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
.WhereIf(inDto.ReadingClinicalDataId != null, x => x.Id == inDto.ReadingClinicalDataId)
|
.WhereIf(inDto.ReadingClinicalDataId != null, x => x.Id == inDto.ReadingClinicalDataId)
|
||||||
.WhereIf(inDto.ClinicalDataTrialSetId != null, x => x.ClinicalDataTrialSetId == inDto.ClinicalDataTrialSetId)
|
.WhereIf(inDto.ClinicalDataTrialSetId != null, x => x.ClinicalDataTrialSetId == inDto.ClinicalDataTrialSetId)
|
||||||
.WhereIf(inDto.SelectIsSign, x => x.IsSign == true)
|
.WhereIf(inDto.SelectIsSign, x => x.IsSign == true)
|
||||||
.Where(x => x.ReadingId == inDto.ReadingId)
|
.Where(x => x.ReadingId == inDto.ReadingId || (readingIdList.Contains(x.ReadingId) && x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Subject))
|
||||||
.WhereIf(inDto.TrialReadingCriterionId != null, x => x.ClinicalDataTrialSet.TrialClinicalDataSetCriteriaList.Any(t => t.TrialReadingCriterionId == inDto.TrialReadingCriterionId))
|
.WhereIf(inDto.TrialReadingCriterionId != null, x => x.ClinicalDataTrialSet.TrialClinicalDataSetCriteriaList.Any(t => t.TrialReadingCriterionId == inDto.TrialReadingCriterionId))
|
||||||
.Select(x => new GetReadingClinicalDataListOutDto()
|
.Select(x => new GetReadingClinicalDataListOutDto()
|
||||||
{
|
{
|
||||||
|
@ -1061,17 +1087,17 @@ namespace IRaCIS.Core.Application.Service
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var previousHistoryList = await _previousHistoryRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).ProjectTo<PreviousHistoryView>(_mapper.ConfigurationProvider).ToListAsync();
|
var previousHistoryList = await _previousHistoryRepository.Where(x => x.SubjectVisitId == inDto.ReadingId || (readingIdList.Contains(x.SubjectVisitId) && x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Subject)).ProjectTo<PreviousHistoryView>(_mapper.ConfigurationProvider).ToListAsync();
|
||||||
var previousOtherList = await _previousOtherRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).ProjectTo<PreviousOtherView>(_mapper.ConfigurationProvider).ToListAsync();
|
var previousOtherList = await _previousOtherRepository.Where(x => x.SubjectVisitId == inDto.ReadingId || (readingIdList.Contains(x.SubjectVisitId) && x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Subject)).ProjectTo<PreviousOtherView>(_mapper.ConfigurationProvider).ToListAsync();
|
||||||
var previousSurgeryList = await _previousSurgeryRepository.Where(x => x.SubjectVisitId == inDto.ReadingId).ProjectTo<PreviousSurgeryView>(_mapper.ConfigurationProvider).ToListAsync();
|
var previousSurgeryList = await _previousSurgeryRepository.Where(x => x.SubjectVisitId == inDto.ReadingId || (readingIdList.Contains(x.SubjectVisitId) && x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Subject)).ProjectTo<PreviousSurgeryView>(_mapper.ConfigurationProvider).ToListAsync();
|
||||||
|
|
||||||
foreach (var item in result)
|
foreach (var item in result)
|
||||||
{
|
{
|
||||||
item.ClinicalTableData = new ClinicalDataTable()
|
item.ClinicalTableData = new ClinicalDataTable()
|
||||||
{
|
{
|
||||||
PreviousHistoryList = previousHistoryList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(),
|
PreviousHistoryList = previousHistoryList.Where(x => x.SubjectVisitId == item.ReadingId).ToList(),
|
||||||
PreviousOtherList = previousOtherList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(),
|
PreviousOtherList = previousOtherList.Where(x => x.SubjectVisitId == item.ReadingId).ToList(),
|
||||||
PreviousSurgeryList = previousSurgeryList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(),
|
PreviousSurgeryList = previousSurgeryList.Where(x => x.SubjectVisitId == item.ReadingId).ToList(),
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -259,6 +259,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool IsGetAllConsistencyAnalysis { get; set; } = true;
|
public bool IsGetAllConsistencyAnalysis { get; set; } = true;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 是否是阅片页面获取临床数据 (阅片其他访视任务需要获取受试者级别的)
|
||||||
|
/// </summary>
|
||||||
|
public bool IsGetTaskClinicalData { get; set; } = false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class GetConsistencyAnalysisReadingClinicalDataListInDto
|
public class GetConsistencyAnalysisReadingClinicalDataListInDto
|
||||||
|
@ -556,6 +561,18 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
public DateTime CreateTime { get; set; }
|
public DateTime CreateTime { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取临床数据名称
|
||||||
|
/// </summary>
|
||||||
|
public class GetVisitClinicalDataNameInDto
|
||||||
|
{
|
||||||
|
public Guid Id { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class GetVisitClinicalDataNameOutDto
|
||||||
|
{
|
||||||
|
public string ClinicalDataName { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
public class GetTrialClinicalDataSelectIndto
|
public class GetTrialClinicalDataSelectIndto
|
||||||
{
|
{
|
||||||
|
|
|
@ -89,6 +89,7 @@ public class Doctor : BaseFullAuditEntity
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// GCP机构
|
/// GCP机构
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
[MaxLength]
|
||||||
public string GCPAgencies { get; set; }
|
public string GCPAgencies { get; set; }
|
||||||
|
|
||||||
public Guid GCPId { get; set; }
|
public Guid GCPId { get; set; }
|
||||||
|
@ -215,6 +216,7 @@ public class Doctor : BaseFullAuditEntity
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 银行名称
|
/// 银行名称
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
[MaxLength]
|
||||||
public string BankName { get; set; } = string.Empty;
|
public string BankName { get; set; } = string.Empty;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -7,6 +7,11 @@ public class PreviousHistory : BaseAddAuditEntity
|
||||||
#region 导航属性
|
#region 导航属性
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
public SubjectVisit SubjectVisit { get; set; }
|
public SubjectVisit SubjectVisit { get; set; }
|
||||||
|
|
||||||
|
[JsonIgnore]
|
||||||
|
[ForeignKey("ClinicalDataTrialSetId")]
|
||||||
|
|
||||||
|
public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; }
|
||||||
#endregion
|
#endregion
|
||||||
public DateTime? StartTime { get; set; }
|
public DateTime? StartTime { get; set; }
|
||||||
|
|
||||||
|
|
|
@ -8,6 +8,11 @@ public class PreviousOther : BaseAddAuditEntity
|
||||||
|
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
public SubjectVisit SubjectVisit { get; set; }
|
public SubjectVisit SubjectVisit { get; set; }
|
||||||
|
|
||||||
|
[JsonIgnore]
|
||||||
|
[ForeignKey("ClinicalDataTrialSetId")]
|
||||||
|
|
||||||
|
public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; }
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
public DateTime? StartTime { get; set; }
|
public DateTime? StartTime { get; set; }
|
||||||
|
|
|
@ -6,10 +6,14 @@ public class PreviousSurgery : BaseAddAuditEntity
|
||||||
{
|
{
|
||||||
|
|
||||||
#region 导航属性
|
#region 导航属性
|
||||||
|
[JsonIgnore]
|
||||||
|
[ForeignKey("ClinicalDataTrialSetId")]
|
||||||
|
|
||||||
|
public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; }
|
||||||
#endregion
|
#endregion
|
||||||
public DateTime? OperationTime { get; set; }
|
public DateTime? OperationTime { get; set; }
|
||||||
|
|
||||||
|
|
||||||
public Guid SubjectVisitId { get; set; }
|
public Guid SubjectVisitId { get; set; }
|
||||||
|
|
||||||
public bool IsSubjectLevel { get; set; }
|
public bool IsSubjectLevel { get; set; }
|
||||||
|
|
18204
IRaCIS.Core.Infra.EFCore/Migrations/20241125080659_trialExperience.Designer.cs
generated
Normal file
18204
IRaCIS.Core.Infra.EFCore/Migrations/20241125080659_trialExperience.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,92 @@
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class trialExperience : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AddColumn<bool>(
|
||||||
|
name: "IsAddTrialExperienceToTrial",
|
||||||
|
table: "Doctor",
|
||||||
|
type: "bit",
|
||||||
|
nullable: false,
|
||||||
|
defaultValue: false);
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_PreviousSurgery_ClinicalDataTrialSetId",
|
||||||
|
table: "PreviousSurgery",
|
||||||
|
column: "ClinicalDataTrialSetId");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_PreviousOther_ClinicalDataTrialSetId",
|
||||||
|
table: "PreviousOther",
|
||||||
|
column: "ClinicalDataTrialSetId");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "IX_PreviousHistory_ClinicalDataTrialSetId",
|
||||||
|
table: "PreviousHistory",
|
||||||
|
column: "ClinicalDataTrialSetId");
|
||||||
|
|
||||||
|
migrationBuilder.AddForeignKey(
|
||||||
|
name: "FK_PreviousHistory_ClinicalDataTrialSet_ClinicalDataTrialSetId",
|
||||||
|
table: "PreviousHistory",
|
||||||
|
column: "ClinicalDataTrialSetId",
|
||||||
|
principalTable: "ClinicalDataTrialSet",
|
||||||
|
principalColumn: "Id",
|
||||||
|
onDelete: ReferentialAction.Cascade);
|
||||||
|
|
||||||
|
migrationBuilder.AddForeignKey(
|
||||||
|
name: "FK_PreviousOther_ClinicalDataTrialSet_ClinicalDataTrialSetId",
|
||||||
|
table: "PreviousOther",
|
||||||
|
column: "ClinicalDataTrialSetId",
|
||||||
|
principalTable: "ClinicalDataTrialSet",
|
||||||
|
principalColumn: "Id",
|
||||||
|
onDelete: ReferentialAction.Cascade);
|
||||||
|
|
||||||
|
migrationBuilder.AddForeignKey(
|
||||||
|
name: "FK_PreviousSurgery_ClinicalDataTrialSet_ClinicalDataTrialSetId",
|
||||||
|
table: "PreviousSurgery",
|
||||||
|
column: "ClinicalDataTrialSetId",
|
||||||
|
principalTable: "ClinicalDataTrialSet",
|
||||||
|
principalColumn: "Id",
|
||||||
|
onDelete: ReferentialAction.Cascade);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropForeignKey(
|
||||||
|
name: "FK_PreviousHistory_ClinicalDataTrialSet_ClinicalDataTrialSetId",
|
||||||
|
table: "PreviousHistory");
|
||||||
|
|
||||||
|
migrationBuilder.DropForeignKey(
|
||||||
|
name: "FK_PreviousOther_ClinicalDataTrialSet_ClinicalDataTrialSetId",
|
||||||
|
table: "PreviousOther");
|
||||||
|
|
||||||
|
migrationBuilder.DropForeignKey(
|
||||||
|
name: "FK_PreviousSurgery_ClinicalDataTrialSet_ClinicalDataTrialSetId",
|
||||||
|
table: "PreviousSurgery");
|
||||||
|
|
||||||
|
migrationBuilder.DropIndex(
|
||||||
|
name: "IX_PreviousSurgery_ClinicalDataTrialSetId",
|
||||||
|
table: "PreviousSurgery");
|
||||||
|
|
||||||
|
migrationBuilder.DropIndex(
|
||||||
|
name: "IX_PreviousOther_ClinicalDataTrialSetId",
|
||||||
|
table: "PreviousOther");
|
||||||
|
|
||||||
|
migrationBuilder.DropIndex(
|
||||||
|
name: "IX_PreviousHistory_ClinicalDataTrialSetId",
|
||||||
|
table: "PreviousHistory");
|
||||||
|
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "IsAddTrialExperienceToTrial",
|
||||||
|
table: "Doctor");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
18202
IRaCIS.Core.Infra.EFCore/Migrations/20241125083643_MaxLength.Designer.cs
generated
Normal file
18202
IRaCIS.Core.Infra.EFCore/Migrations/20241125083643_MaxLength.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,54 @@
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class MaxLength : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AlterColumn<string>(
|
||||||
|
name: "GCPAgencies",
|
||||||
|
table: "Doctor",
|
||||||
|
type: "nvarchar(max)",
|
||||||
|
nullable: false,
|
||||||
|
oldClrType: typeof(string),
|
||||||
|
oldType: "nvarchar(400)",
|
||||||
|
oldMaxLength: 400);
|
||||||
|
|
||||||
|
migrationBuilder.AlterColumn<string>(
|
||||||
|
name: "BankName",
|
||||||
|
table: "Doctor",
|
||||||
|
type: "nvarchar(max)",
|
||||||
|
nullable: false,
|
||||||
|
oldClrType: typeof(string),
|
||||||
|
oldType: "nvarchar(400)",
|
||||||
|
oldMaxLength: 400);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AlterColumn<string>(
|
||||||
|
name: "GCPAgencies",
|
||||||
|
table: "Doctor",
|
||||||
|
type: "nvarchar(400)",
|
||||||
|
maxLength: 400,
|
||||||
|
nullable: false,
|
||||||
|
oldClrType: typeof(string),
|
||||||
|
oldType: "nvarchar(max)");
|
||||||
|
|
||||||
|
migrationBuilder.AlterColumn<string>(
|
||||||
|
name: "BankName",
|
||||||
|
table: "Doctor",
|
||||||
|
type: "nvarchar(400)",
|
||||||
|
maxLength: 400,
|
||||||
|
nullable: false,
|
||||||
|
oldClrType: typeof(string),
|
||||||
|
oldType: "nvarchar(max)");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
18199
IRaCIS.Core.Infra.EFCore/Migrations/20241125085235_doctorino.Designer.cs
generated
Normal file
18199
IRaCIS.Core.Infra.EFCore/Migrations/20241125085235_doctorino.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,29 @@
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class doctorino : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropColumn(
|
||||||
|
name: "IsAddTrialExperienceToTrial",
|
||||||
|
table: "Doctor");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AddColumn<bool>(
|
||||||
|
name: "IsAddTrialExperienceToTrial",
|
||||||
|
table: "Doctor",
|
||||||
|
type: "bit",
|
||||||
|
nullable: false,
|
||||||
|
defaultValue: false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -1325,8 +1325,7 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
|
|
||||||
b.Property<string>("BankName")
|
b.Property<string>("BankName")
|
||||||
.IsRequired()
|
.IsRequired()
|
||||||
.HasMaxLength(400)
|
.HasColumnType("nvarchar(max)");
|
||||||
.HasColumnType("nvarchar(400)");
|
|
||||||
|
|
||||||
b.Property<string>("BankNum")
|
b.Property<string>("BankNum")
|
||||||
.IsRequired()
|
.IsRequired()
|
||||||
|
@ -1399,8 +1398,7 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
|
|
||||||
b.Property<string>("GCPAgencies")
|
b.Property<string>("GCPAgencies")
|
||||||
.IsRequired()
|
.IsRequired()
|
||||||
.HasMaxLength(400)
|
.HasColumnType("nvarchar(max)");
|
||||||
.HasColumnType("nvarchar(400)");
|
|
||||||
|
|
||||||
b.Property<Guid>("GCPId")
|
b.Property<Guid>("GCPId")
|
||||||
.HasColumnType("uniqueidentifier");
|
.HasColumnType("uniqueidentifier");
|
||||||
|
@ -3631,6 +3629,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
|
|
||||||
b.HasKey("Id");
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("ClinicalDataTrialSetId");
|
||||||
|
|
||||||
b.HasIndex("CreateUserId");
|
b.HasIndex("CreateUserId");
|
||||||
|
|
||||||
b.HasIndex("SubjectVisitId");
|
b.HasIndex("SubjectVisitId");
|
||||||
|
@ -3688,6 +3688,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
|
|
||||||
b.HasKey("Id");
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("ClinicalDataTrialSetId");
|
||||||
|
|
||||||
b.HasIndex("CreateUserId");
|
b.HasIndex("CreateUserId");
|
||||||
|
|
||||||
b.HasIndex("SubjectVisitId");
|
b.HasIndex("SubjectVisitId");
|
||||||
|
@ -3796,6 +3798,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
|
|
||||||
b.HasKey("Id");
|
b.HasKey("Id");
|
||||||
|
|
||||||
|
b.HasIndex("ClinicalDataTrialSetId");
|
||||||
|
|
||||||
b.HasIndex("CreateUserId");
|
b.HasIndex("CreateUserId");
|
||||||
|
|
||||||
b.HasIndex("SubjectVisitId");
|
b.HasIndex("SubjectVisitId");
|
||||||
|
@ -14598,6 +14602,12 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
|
|
||||||
modelBuilder.Entity("IRaCIS.Core.Domain.Models.PreviousHistory", b =>
|
modelBuilder.Entity("IRaCIS.Core.Domain.Models.PreviousHistory", b =>
|
||||||
{
|
{
|
||||||
|
b.HasOne("IRaCIS.Core.Domain.Models.ClinicalDataTrialSet", "ClinicalDataTrialSet")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("ClinicalDataTrialSetId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
b.HasOne("IRaCIS.Core.Domain.Models.User", "CreateUser")
|
b.HasOne("IRaCIS.Core.Domain.Models.User", "CreateUser")
|
||||||
.WithMany()
|
.WithMany()
|
||||||
.HasForeignKey("CreateUserId")
|
.HasForeignKey("CreateUserId")
|
||||||
|
@ -14610,6 +14620,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
.OnDelete(DeleteBehavior.Cascade)
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
.IsRequired();
|
.IsRequired();
|
||||||
|
|
||||||
|
b.Navigation("ClinicalDataTrialSet");
|
||||||
|
|
||||||
b.Navigation("CreateUser");
|
b.Navigation("CreateUser");
|
||||||
|
|
||||||
b.Navigation("SubjectVisit");
|
b.Navigation("SubjectVisit");
|
||||||
|
@ -14617,6 +14629,12 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
|
|
||||||
modelBuilder.Entity("IRaCIS.Core.Domain.Models.PreviousOther", b =>
|
modelBuilder.Entity("IRaCIS.Core.Domain.Models.PreviousOther", b =>
|
||||||
{
|
{
|
||||||
|
b.HasOne("IRaCIS.Core.Domain.Models.ClinicalDataTrialSet", "ClinicalDataTrialSet")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("ClinicalDataTrialSetId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
b.HasOne("IRaCIS.Core.Domain.Models.User", "CreateUser")
|
b.HasOne("IRaCIS.Core.Domain.Models.User", "CreateUser")
|
||||||
.WithMany()
|
.WithMany()
|
||||||
.HasForeignKey("CreateUserId")
|
.HasForeignKey("CreateUserId")
|
||||||
|
@ -14629,6 +14647,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
.OnDelete(DeleteBehavior.Cascade)
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
.IsRequired();
|
.IsRequired();
|
||||||
|
|
||||||
|
b.Navigation("ClinicalDataTrialSet");
|
||||||
|
|
||||||
b.Navigation("CreateUser");
|
b.Navigation("CreateUser");
|
||||||
|
|
||||||
b.Navigation("SubjectVisit");
|
b.Navigation("SubjectVisit");
|
||||||
|
@ -14655,6 +14675,12 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
|
|
||||||
modelBuilder.Entity("IRaCIS.Core.Domain.Models.PreviousSurgery", b =>
|
modelBuilder.Entity("IRaCIS.Core.Domain.Models.PreviousSurgery", b =>
|
||||||
{
|
{
|
||||||
|
b.HasOne("IRaCIS.Core.Domain.Models.ClinicalDataTrialSet", "ClinicalDataTrialSet")
|
||||||
|
.WithMany()
|
||||||
|
.HasForeignKey("ClinicalDataTrialSetId")
|
||||||
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
|
.IsRequired();
|
||||||
|
|
||||||
b.HasOne("IRaCIS.Core.Domain.Models.User", "CreateUser")
|
b.HasOne("IRaCIS.Core.Domain.Models.User", "CreateUser")
|
||||||
.WithMany()
|
.WithMany()
|
||||||
.HasForeignKey("CreateUserId")
|
.HasForeignKey("CreateUserId")
|
||||||
|
@ -14667,6 +14693,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
.OnDelete(DeleteBehavior.Cascade)
|
.OnDelete(DeleteBehavior.Cascade)
|
||||||
.IsRequired();
|
.IsRequired();
|
||||||
|
|
||||||
|
b.Navigation("ClinicalDataTrialSet");
|
||||||
|
|
||||||
b.Navigation("CreateUser");
|
b.Navigation("CreateUser");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue