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

修改一版

Uat_Study
he 2022-05-10 15:28:05 +08:00
parent dbca00a1e8
commit fa72980130
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
View File

@ -103,7 +103,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
CreateTime = data.CreateTime, CreateTime = data.CreateTime,
CreateUserId = data.CreateUserId, CreateUserId = data.CreateUserId,
ModuleType = leftmoduleTypec.Id, ModuleType = leftmoduleTypec.Id,
BlindName = data.BlindName, BlindName = leftsubjectVisit.BlindName,
TrialId = data.TrialId, TrialId = data.TrialId,
SiteId = data.SiteId, SiteId = data.SiteId,
SubjectId = data.SubjectId, SubjectId = data.SubjectId,
@ -122,7 +122,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
LastName = leftsubject.LastName, LastName = leftsubject.LastName,
Id = data.Id, Id = data.Id,
ParentJson = leftparent.JsonDetail, ParentJson = leftparent.JsonDetail,
VisitName = data.SubjectVisitName, VisitName = leftsubjectVisit.VisitName,
CreateUser = leftuser.UserName, CreateUser = leftuser.UserName,
UserFirstName = leftuser.FirstName, UserFirstName = leftuser.FirstName,
UserLastName = leftuser.LastName, UserLastName = leftuser.LastName,
@ -179,10 +179,14 @@ namespace IRaCIS.Core.Application.Service.Inspection
/// <returns></returns> /// <returns></returns>
public async Task RecordSing(SignDTO SignInfo) public async Task RecordSing(SignDTO SignInfo)
{ {
var verifyResult = await VerifySignatureAsync(SignInfo); if (SignInfo != null)
var signId = await AddSignRecordAsync(SignInfo); {
_userInfo.SignId = signId; var verifyResult = await VerifySignatureAsync(SignInfo);
await _repository.BatchUpdateAsync<TrialSign>(t => t.Id == signId, u => new TrialSign() { IsCompleted = true }); var signId = await AddSignRecordAsync(SignInfo);
_userInfo.SignId = signId;
await _repository.BatchUpdateAsync<TrialSign>(t => t.Id == signId, u => new TrialSign() { IsCompleted = true });
}
} }
/// <summary> /// <summary>

15
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -231,6 +231,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(NoneDicomStudy))) foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(NoneDicomStudy)))
{ {
var entity = item.Entity as NoneDicomStudy; var entity = item.Entity as NoneDicomStudy;
var filecount =await _dbContext.NoneDicomStudyFile.Where(x => x.NoneDicomStudyId == entity.Id).CountAsync();
switch (GetRequestUrl().ToLower()) switch (GetRequestUrl().ToLower())
{ {
case "nonedicomstudy/addorupdatenonedicomstudy": case "nonedicomstudy/addorupdatenonedicomstudy":
@ -241,15 +242,27 @@ namespace IRaCIS.Core.Infra.EFCore.Common
await InsertInspection<NoneDicomStudy>(item, type, x => new DataInspection() await InsertInspection<NoneDicomStudy>(item, type, x => new DataInspection()
{ {
GeneralId = x.Id, GeneralId = x.Id,
},new {
FileCount= filecount,
}); });
} }
// 非Dicom文件 // 非Dicom文件
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(NoneDicomStudyFile))) foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(NoneDicomStudyFile)))
{ {
var entity = item.Entity as NoneDicomStudyFile;
var noneDicomStudy = entity.NoneDicomStudy;
if (noneDicomStudy == null)
{
noneDicomStudy = await _dbContext.NoneDicomStudy.FirstOrDefaultAsync(x => x.Id == entity.NoneDicomStudyId);
}
noneDicomStudy = noneDicomStudy ?? new NoneDicomStudy();
await InsertInspection<NoneDicomStudyFile>(item, type, x => new DataInspection() await InsertInspection<NoneDicomStudyFile>(item, type, x => new DataInspection()
{ {
GeneralId = x.Id, GeneralId = x.Id,
TrialId= noneDicomStudy.TrialId,
SubjectId=noneDicomStudy.SubjectId,
SubjectVisitId=noneDicomStudy.SubjectVisitId,
}); });
} }
@ -356,7 +369,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
/// <param name="mapData">要赋值的对象</param> /// <param name="mapData">要赋值的对象</param>
public void MapData(dynamic data, dynamic mapData) public void MapData(dynamic data, dynamic mapData)
{ {
List<string> column = new List<string>() { "TrialId", "SiteId", "SubjectId", "SubjectVisitId", "CreateUserName", "TrialName", "SiteName", "SubjectCode", "SubjectVisitName", "RoleName", "SiteCode", "ResearchProgramNo" }; List<string> column = new List<string>() { "TrialId", "SiteId", "SubjectId", "SubjectVisitId", "CreateUserName", "TrialName", "SiteName", "SubjectCode", "VisitName","SubjectVisitName", "RoleName", "SiteCode", "ResearchProgramNo" };
foreach (var item in column) foreach (var item in column)
{ {
try try