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

修改一版

Uat_Study
he 2022-04-25 15:30:22 +08:00
parent e5443a5016
commit 227dec2c94
5 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
View File

@ -164,7 +164,7 @@ namespace IRaCIS.Application.Services
SubjectVisitId = subjectVisit.Id, SubjectVisitId = subjectVisit.Id,
Identification = "Edit|Visit|Status|Visit-Image Upload", Identification = "Edit|Visit|Status|Visit-Image Upload",
JsonDetail= JsonConvert.SerializeObject(new { JsonDetail= JsonConvert.SerializeObject(new {
SubmitState= "已提交", SubmitState= subjectVisit.SubmitState,
}) })

4
IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
View File

@ -143,9 +143,13 @@ namespace IRaCIS.Core.Application.Contracts
public bool IsHaveClinicalData { get; set; } public bool IsHaveClinicalData { get; set; }
public string MedicalNo { get; set; }
public int? Age { get; set; } public int? Age { get; set; }
public string Sex { get; set; } = string.Empty; public string Sex { get; set; } = string.Empty;
} }

24
IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs
View File

@ -130,19 +130,20 @@ namespace IRaCIS.Core.Application.Contracts
var subvisit = await _repository.GetQueryable<SubjectVisit>().FirstOrDefaultAsync(x => x.Id == subjectVisitId); var subvisit = await _repository.GetQueryable<SubjectVisit>().FirstOrDefaultAsync(x => x.Id == subjectVisitId);
List<DataInspection> datas = new List<DataInspection>(); // 修改访视状态
datas.Add(new DataInspection() //List<DataInspection> datas = new List<DataInspection>();
{ //datas.Add(new DataInspection()
//{
SiteId = subvisit.SiteId, // SiteId = subvisit.SiteId,
SubjectId = subvisit.SubjectId, // SubjectId = subvisit.SubjectId,
TrialId = subvisit.TrialId, // TrialId = subvisit.TrialId,
SubjectVisitId = subvisit.Id, // SubjectVisitId = subvisit.Id,
Identification = "Edit|Visit|Status|Visit-Image Upload|Add Image", // Identification = "Edit|Visit|Status|Visit-Image Upload|Add Image",
JsonDetail = subvisit.ToJcJson() // JsonDetail = subvisit.ToJcJson()
}); //});
await _inspectionService.AddListInspectionRecordAsync(datas); //await _inspectionService.AddListInspectionRecordAsync(datas);
return ResponseOutput.Ok(); return ResponseOutput.Ok();
} }
@ -193,6 +194,7 @@ namespace IRaCIS.Core.Application.Contracts
JsonDetail = subvisit.ToJcJson() JsonDetail = subvisit.ToJcJson()
}); });
await _inspectionService.AddListInspectionRecordAsync(datas); await _inspectionService.AddListInspectionRecordAsync(datas);
} }

11
IRaCIS.Core.Application/Service/QC/_MapConfig.cs
View File

@ -127,11 +127,12 @@ namespace IRaCIS.Core.Application.Service
// .ForMember(d => d.SubejctIsEnrollmentConfirm, u => u.MapFrom(t => t.Subject.IsEnrollmentConfirm)) // .ForMember(d => d.SubejctIsEnrollmentConfirm, u => u.MapFrom(t => t.Subject.IsEnrollmentConfirm))
// .ForMember(d => d.SubejctFistGiveMedicineTime, u => u.MapFrom(t => t.Subject.FistGiveMedicineTime)) // .ForMember(d => d.SubejctFistGiveMedicineTime, u => u.MapFrom(t => t.Subject.FistGiveMedicineTime))
.ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.TrialSite.TrialSiteCode)) .ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.TrialSite.TrialSiteCode))
.ForMember(d => d.QCProcessEnum, u => u.MapFrom(s => s.Trial.QCProcessEnum)) .ForMember(d => d.QCProcessEnum, u => u.MapFrom(s => s.Trial.QCProcessEnum))
.ForMember(d => d.SubjectId, u => u.MapFrom(t => t.Subject.Id)) .ForMember(d => d.SubjectId, u => u.MapFrom(t => t.Subject.Id))
.ForMember(d => d.Sex, u=> u.MapFrom(s => s.Subject.Sex)) .ForMember(d => d.MedicalNo, u => u.MapFrom(s => s.Subject.MedicalNo))
.ForMember(d => d.Age, u => u.MapFrom(t => t.Subject.Age)) .ForMember(d => d.Sex, u=> u.MapFrom(s => s.Subject.Sex))
.ForMember(d => d.IsHaveClinicalData, u => u.MapFrom(t=> t.IsBaseLine? t.PreviousHistoryList.Any() || t.PreviousOtherList.Any() || t.PreviousPDFList.Any() || t.PreviousSurgeryList.Any() :false)) .ForMember(d => d.Age, u => u.MapFrom(t => t.Subject.Age))
.ForMember(d => d.IsHaveClinicalData, u => u.MapFrom(t=> t.IsBaseLine? t.PreviousHistoryList.Any() || t.PreviousOtherList.Any() || t.PreviousPDFList.Any() || t.PreviousSurgeryList.Any() :false))
//.ForMember(d => d.VisitName, u => u.MapFrom(t =>t.InPlan? t.VisitStage.VisitName : t.VisitName)) //.ForMember(d => d.VisitName, u => u.MapFrom(t =>t.InPlan? t.VisitStage.VisitName : t.VisitName))
//.ForMember(d => d.VisitNum, u => u.MapFrom(t => t.InPlan ? t.VisitStage.VisitNum : t.VisitNum)) //.ForMember(d => d.VisitNum, u => u.MapFrom(t => t.InPlan ? t.VisitStage.VisitNum : t.VisitNum))

8
IRaCIS.Core.Application/Triggers/SubjectVisitImageDateTrigger.cs
View File

@ -16,11 +16,10 @@ namespace IRaCIS.Core.Application.Triggers
public async Task AfterSave(ITriggerContext<NoneDicomStudy> context, CancellationToken cancellationToken) public async Task AfterSave(ITriggerContext<NoneDicomStudy> context, CancellationToken cancellationToken)
{ {
var subjectVisitId = context.Entity.SubjectVisitId; var subjectVisitId = context.Entity.SubjectVisitId;
if (context.ChangeType == ChangeType.Added || context.ChangeType == ChangeType.Modified) if (context.ChangeType == ChangeType.Added || context.ChangeType == ChangeType.Modified)
{ {
await UpdateSubjectVisitImageDateAsync(context.Entity.SubjectVisitId); await UpdateSubjectVisitImageDateAsync(context.Entity.SubjectVisitId);
await _subjectVisitRepository.BatchUpdateAsync(t => t.Id == subjectVisitId, u => new SubjectVisit() await _subjectVisitRepository.BatchUpdateAsync(t => t.Id == subjectVisitId, u => new SubjectVisit()
{ {
VisitExecuted = VisitExecutedEnum.Executed VisitExecuted = VisitExecutedEnum.Executed
@ -42,7 +41,6 @@ namespace IRaCIS.Core.Application.Triggers
if (context.ChangeType == ChangeType.Added ) if (context.ChangeType == ChangeType.Added )
{ {
await UpdateSubjectVisitImageDateAsync(subjectVisitId); await UpdateSubjectVisitImageDateAsync(subjectVisitId);
await _subjectVisitRepository.BatchUpdateAsync(t => t.Id == subjectVisitId, u => new SubjectVisit() await _subjectVisitRepository.BatchUpdateAsync(t => t.Id == subjectVisitId, u => new SubjectVisit()
{ {
VisitExecuted = VisitExecutedEnum.Executed VisitExecuted = VisitExecutedEnum.Executed
@ -52,7 +50,6 @@ namespace IRaCIS.Core.Application.Triggers
if (context.ChangeType == ChangeType.Deleted) if (context.ChangeType == ChangeType.Deleted)
{ {
await UpdateSubjectVisitImageDateAsync(subjectVisitId); await UpdateSubjectVisitImageDateAsync(subjectVisitId);
await UpdateSubjectVisitSubmitStateAsync(subjectVisitId); await UpdateSubjectVisitSubmitStateAsync(subjectVisitId);
} }
@ -61,12 +58,13 @@ namespace IRaCIS.Core.Application.Triggers
public async Task UpdateSubjectVisitSubmitStateAsync(Guid subjectVisitId) public async Task UpdateSubjectVisitSubmitStateAsync(Guid subjectVisitId)
{ {
//一个访视下面有多个检查，所以需要检测 没有的时候才清空 非dicom 是检查文件 不是表记录 //一个访视下面有多个检查，所以需要检测 没有的时候才清空 非dicom 是检查文件 不是表记录
if (await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).SelectMany(t => t.StudyList).CountAsync() == 0 && if (await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).SelectMany(t => t.StudyList).CountAsync() == 0 &&
await _subjectVisitRepository.Where(t => t.Id == subjectVisitId) await _subjectVisitRepository.Where(t => t.Id == subjectVisitId)
.SelectMany(t => t.NoneDicomStudyList).SelectMany(u => u.NoneDicomFileList).CountAsync() == 0) .SelectMany(t => t.NoneDicomStudyList).SelectMany(u => u.NoneDicomFileList).CountAsync() == 0)
{ {
await _subjectVisitRepository.BatchUpdateAsync(t => t.Id == subjectVisitId && t.SubmitState == SubmitStateEnum.ToSubmit, await _subjectVisitRepository.BatchUpdateAsync(t => t.Id == subjectVisitId && t.SubmitState == SubmitStateEnum.ToSubmit,
u => new SubjectVisit() { VisitExecuted = 0, SVENDTC = null, SVSTDTC = null, SubmitState = SubmitStateEnum.None }); u => new SubjectVisit() { VisitExecuted = 0, SVENDTC = null, SVSTDTC = null, SubmitState = SubmitStateEnum.None });
} }