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

修改一版

Uat_Study
he 2022-04-26 11:19:45 +08:00
parent 0b5d41c8b7
commit 83c46a5e14
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
IRaCIS.Core.Application/Triggers/SubjectVisitTrigger.cs
View File

@ -1,4 +1,5 @@
using EntityFrameworkCore.Triggered; using EntityFrameworkCore.Triggered;
using IRaCIS.Core.Domain.Common;
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Application.Triggers namespace IRaCIS.Core.Application.Triggers
@ -70,7 +71,23 @@ namespace IRaCIS.Core.Application.Triggers
.SelectMany(t => t.NoneDicomStudyList).SelectMany(u => u.NoneDicomFileList).CountAsync() == 0) .SelectMany(t => t.NoneDicomStudyList).SelectMany(u => u.NoneDicomFileList).CountAsync() == 0)
{ {
var subjectvisit =await _subjectVisitRepository.FirstOrDefaultAsync(x => x.Id == subjectVisitId&&x.SubmitState == SubmitStateEnum.ToSubmit);
subjectvisit.SubmitState = SubmitStateEnum.None;
List<DataInspection> datas = new List<DataInspection>();
datas.Add(new DataInspection()
{
Identification = "Edit|Visit|Status|Visit-Image Upload|Add Image",
TrialId = subjectvisit.TrialId,
SiteId = subjectvisit.SiteId,
SubjectId = subjectvisit.SubjectId,
SubjectVisitId = subjectvisit.Id,
Reason = "删除影像",
JsonDetail = subjectvisit.ToJcJson(),
});
await _subjectVisitRepository.AddListInspectionRecordAsync(datas);
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 });
} }

14
IRaCIS.Core.Infra.EFCore/Repository/Repository.cs
View File

@ -554,7 +554,7 @@ namespace IRaCIS.Core.Infra.EFCore
public async Task<string> SetEnum(Guid trilaid, string Identification, string json) public async Task<string> SetEnum(Guid trilaid, string Identification, string json)
{ {
var list = await (from u in _dbContext.FrontAuditConfig.Where(x => x.Identification == Identification) var list = await (from u in _dbContext.FrontAuditConfig.Where(x => x.Identification == Identification)
join p in _dbContext.FrontAuditConfig.Where(x => x.Code == "AuditState" || (x.DictionaryCode != null && x.DictionaryCode != string.Empty && x.DictionaryType != null && x.DictionaryType != string.Empty)) on u.Id equals p.ParentId join p in _dbContext.FrontAuditConfig.Where(x => x.Code != "AuditState" || (x.DictionaryCode != null && x.DictionaryCode != string.Empty && x.DictionaryType != null && x.DictionaryType != string.Empty)) on u.Id equals p.ParentId
select new select new
{ {
Key = p.Code, Key = p.Code,
@ -746,10 +746,11 @@ namespace IRaCIS.Core.Infra.EFCore
await UpdateSubjectVisit(data.SubjectVisitId, SubmitStateEnum.ToSubmit, "上传Dicom影像"); await UpdateSubjectVisit(data.SubjectVisitId, SubmitStateEnum.ToSubmit, "上传Dicom影像");
} }
// 非Dicom影像 // 非Dicom影像
else if (typeof(TEntity) == typeof(NoneDicomStudy)) else if (typeof(TEntity) == typeof(NoneDicomStudyFile))
{ {
DicomStudy data = entity as DicomStudy; NoneDicomStudyFile data = entity as NoneDicomStudyFile;
await UpdateSubjectVisit(data.SubjectVisitId, SubmitStateEnum.ToSubmit, "上传非Dicom影像"); var subjectVisitId =await _dbContext.NoneDicomStudy.Where(x => x.Id == data.NoneDicomStudyId).Select(x => x.SubjectVisitId).FirstOrDefaultAsync();
await UpdateSubjectVisit(subjectVisitId, SubmitStateEnum.ToSubmit, "上传非Dicom影像");
} }
// 修改访视状态记录稽查 // 修改访视状态记录稽查
@ -761,8 +762,8 @@ namespace IRaCIS.Core.Infra.EFCore
subjectvisit.SubmitState = submit; subjectvisit.SubmitState = submit;
} }
List<DataInspection> inspections = new List<DataInspection>();
inspections.Add(new DataInspection() datas.Add(new DataInspection()
{ {
Identification = "Edit|Visit|Status|Visit-Image Upload|Add Image", Identification = "Edit|Visit|Status|Visit-Image Upload|Add Image",
TrialId = subjectvisit.TrialId, TrialId = subjectvisit.TrialId,
@ -770,6 +771,7 @@ namespace IRaCIS.Core.Infra.EFCore
SubjectId = subjectvisit.SubjectId, SubjectId = subjectvisit.SubjectId,
SubjectVisitId = subjectvisit.Id, SubjectVisitId = subjectvisit.Id,
Reason = reason, Reason = reason,
CreateTime= createtime.AddMilliseconds(100),
JsonDetail = subjectvisit.ToJcJson(), JsonDetail = subjectvisit.ToJcJson(),
}); });