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

修改稽查

Uat_Study
{872297557@qq.com} 2022-12-20 11:20:54 +08:00
parent 883c6b2f3c
commit 00cdea630c
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IRaCIS.Core.Domain/SQLFile/Test.sql
View File

@ -148,5 +148,8 @@ update DataInspection set VisitTaskId= substring(JsonDetail,CHARINDEX('VisitTask
update DataInspection set VisitTaskId= substring(JsonDetail,CHARINDEX('VisitTaskId":"',JsonDetail)+14,36) where EntityName='ReadingMedicineQuestionAnswer' update DataInspection set VisitTaskId= substring(JsonDetail,CHARINDEX('VisitTaskId":"',JsonDetail)+14,36) where EntityName='ReadingMedicineQuestionAnswer'
update DataInspection set SubjectVisitId=null where EntityName='ReadModule'

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

@ -873,12 +873,15 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//保证Id 唯一 //保证Id 唯一
cloneEntity.Id = IdentifierHelper.CreateGuid(firstEntity.GlobalTaskId.ToString(), firstEntity.TaskId.ToString()); cloneEntity.Id = IdentifierHelper.CreateGuid(firstEntity.GlobalTaskId.ToString(), firstEntity.TaskId.ToString());
var trialReadingCriterionId = await _dbContext.VisitTask.Where(t => t.Id == cloneEntity.GlobalTaskId).Select(t => t.TrialReadingCriterionId).FirstOrDefaultAsync();
await InsertInspection<ReadingGlobalTaskInfo>(cloneEntity, type, x => new InspectionConvertDTO() await InsertInspection<ReadingGlobalTaskInfo>(cloneEntity, type, x => new InspectionConvertDTO()
{ {
VisitTaskId = x.TaskId, VisitTaskId = x.TaskId,
TrialReadingCriterionId= trialReadingCriterionId,
ObjectRelationParentId = x.TaskId, ObjectRelationParentId = x.TaskId,
}, new { Reason = group.Where(t => t.QuestionId == null && t.GlobalAnswerType == GlobalAnswerType.Reason).FirstOrDefault()?.Answer, }, new { Reason = group.Where(t => t.QuestionId == null && t.GlobalAnswerType == GlobalAnswerType.Reason).FirstOrDefault()?.Answer,
@ -1796,7 +1799,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
ObjectRelationParentId2 = entity.TrialReadingCriterionId, ObjectRelationParentId2 = entity.TrialReadingCriterionId,
SubjectVisitId = x.SubjectVisitId, //SubjectVisitId = x.SubjectVisitId,
IsDistinctionInterface = false, IsDistinctionInterface = false,
}); });
} }
@ -2056,18 +2059,19 @@ namespace IRaCIS.Core.Infra.EFCore.Common
SiteId = inspection.SiteId, SiteId = inspection.SiteId,
SubjectId = inspection.SubjectId, SubjectId = inspection.SubjectId,
SubjectVisitId = inspection.SubjectVisitId, SubjectVisitId = inspection.SubjectVisitId,
TrialId = inspection.TrialId TrialId = inspection.TrialId,
TrialReadingCriterionId=inspection.TrialReadingCriterionId
}; };
if (inspection.VisitTaskId != null) if (inspection.VisitTaskId != null)
{ {
if (generalData.TrialId == null || generalData.SiteId == null || generalData.SubjectId == null) if (generalData.TrialId == null || generalData.SiteId == null || generalData.SubjectId == null || generalData.TrialReadingCriterionId == null)
{ {
var info = await _dbContext.VisitTask.Where(x => x.Id == inspection.VisitTaskId).Select(x => new { SubjectCode = x.Subject.Code, TrialSiteCode = x.Subject.TrialSite.TrialSiteCode, SubjectId = x.SubjectId, x.Subject.SiteId, x.TrialId, x.SourceSubjectVisitId, ReadModuleSubjectVisitId = (Guid?)x.ReadModule.SubjectVisitId }).FirstOrDefaultAsync(); var info = await _dbContext.VisitTask.Where(x => x.Id == inspection.VisitTaskId).Select(x => new { SubjectCode = x.Subject.Code, TrialSiteCode = x.Subject.TrialSite.TrialSiteCode, SubjectId = x.SubjectId, x.Subject.SiteId, x.TrialId, x.SourceSubjectVisitId, ReadModuleSubjectVisitId = (Guid?)x.ReadModule.SubjectVisitId ,x.TrialReadingCriterionId }).FirstOrDefaultAsync();
generalData.TrialReadingCriterionId= info?.TrialReadingCriterionId ?? generalData.TrialReadingCriterionId;
generalData.TrialId = info?.TrialId ?? generalData.TrialId; generalData.TrialId = info?.TrialId ?? generalData.TrialId;
generalData.SubjectId = info?.SubjectId ?? generalData.SubjectId; generalData.SubjectId = info?.SubjectId ?? generalData.SubjectId;
generalData.SiteId = info?.SiteId ?? generalData.SiteId; generalData.SiteId = info?.SiteId ?? generalData.SiteId;

2
IRaCIS.Core.Infra.EFCore/Common/Dto/SetDictionaryValueDto.cs
View File

@ -178,6 +178,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common.Dto
/// </summary> /// </summary>
public Guid? SubjectVisitId { get; set; } public Guid? SubjectVisitId { get; set; }
public Guid? TrialReadingCriterionId { get; set; }
/// <summary> /// <summary>
/// 项目名称 /// 项目名称