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

修改稽查
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
hang 2025-01-06 11:41:54 +08:00
parent cfbe3d2589
commit 293865fc3f
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
View File

@ -433,7 +433,7 @@ namespace IRaCIS.Core.Application.Services
.CountAsync(); .CountAsync();
var needSignSystemDocCount = await _systemDocumentRepository var needSignSystemDocCount = await _systemDocumentRepository.AsQueryable(true)
.Where(t => t.IsDeleted == false && !t.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.IdentityUserId && t.ConfirmTime != null) && t.NeedConfirmedUserTypeList.Any(u => u.NeedConfirmUserTypeId == _userInfo.UserTypeId)) .Where(t => t.IsDeleted == false && !t.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.IdentityUserId && t.ConfirmTime != null) && t.NeedConfirmedUserTypeList.Any(u => u.NeedConfirmUserTypeId == _userInfo.UserTypeId))
.CountAsync(); .CountAsync();

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

@ -3000,12 +3000,13 @@ namespace IRaCIS.Core.Infra.EFCore.Common
await InsertInspection<ReadingTaskQuestionMark>(entity, type, x => new InspectionConvertDTO() await InsertInspection<ReadingTaskQuestionMark>(entity, type, x => new InspectionConvertDTO()
{ {
VisitTaskId = entity.VisitTaskId, VisitTaskId = entity.VisitTaskId,
ObjectRelationParentId = entity.VisitTaskId, ObjectRelationParentId = entity.VisitTaskId,
},new { }, new
Answer= answer, {
LiverSegmentation= liverSegmentation, Answer = answer,
LiverSegmentation = liverSegmentation,
}); });
} }
@ -3331,26 +3332,31 @@ namespace IRaCIS.Core.Infra.EFCore.Common
UserRealName = userRealName, UserRealName = userRealName,
}; };
var extraIdentification = string.Empty;
var isDistinctionInterface = true;
#region 标识区分 #region 标识区分
if (type == AuditOpt.Add) if (type == AuditOpt.Add)
{ {
isDistinctionInterface = false;
//生成一致性分析任务 //生成一致性分析任务
if (entity.IsSelfAnalysis == true) if (entity.IsSelfAnalysis == true)
{ {
type = type + "/" + "SelfAnalysis"; extraIdentification = "/SelfAnalysis";
} }
else if (entity.IsSelfAnalysis == false) else if (entity.IsSelfAnalysis == false)
{ {
type = type + "/" + "GroupAnalysis"; extraIdentification = "/GroupAnalysis";
} }
else else
{ {
type = type + "/" + "NotAnalysis"; extraIdentification = "/NotAnalysis";
} }
//区分任务类型 //区分任务类型
type = type + "/" + (int)entity.ReadingCategory; extraIdentification = extraIdentification + "/" + (int)entity.ReadingCategory;
} }
@ -3360,7 +3366,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
{ {
//申请重阅 //申请重阅
case "VisitTask/applyReReading": case "VisitTask/applyReReading":
type = type + "/" + (int)entity.ReReadingApplyState; extraIdentification = "/" + (int)entity.ReReadingApplyState;
break; break;
@ -3369,12 +3375,12 @@ namespace IRaCIS.Core.Infra.EFCore.Common
if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.APM) if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.APM)
{ {
type = type + "/" + 1; extraIdentification = "/" + 1;
} }
else else
{ {
type = type + "/" + 2; extraIdentification = "/" + 2;
} }
break; break;
@ -3510,7 +3516,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
{ {
VisitTaskId = x.Id, VisitTaskId = x.Id,
IsDistinctionInterface = type == AuditOpt.Update ? true : false, IsDistinctionInterface = isDistinctionInterface,
ExtraIndentification = extraIdentification,
ObjectRelationParentId = entity.SourceSubjectVisitId != null ? entity.SourceSubjectVisitId : entity.SouceReadModuleId, ObjectRelationParentId = entity.SourceSubjectVisitId != null ? entity.SourceSubjectVisitId : entity.SouceReadModuleId,