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

修改重置阅片稽查3
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
hang 2025-06-13 09:53:59 +08:00
parent 738ad29c0b
commit 483c7c68e8
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,7 +188,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//TrialDicList = string.Join(",", trialDics) //TrialDicList = string.Join(",", trialDics)
ImageFormatListStr = string.Join("|", entity.ImageFormatList), ImageFormatListStr = string.Join("|", entity.ImageFormatList),
StudyNamesStr = string.Join("|", entity.StudyNameList.Where(x => x.IsChoose).Select(x=>_userInfo.IsEn_Us?x.EnName:x.Name )), StudyNamesStr = string.Join("|", entity.StudyNameList.Where(x => x.IsChoose).Select(x => _userInfo.IsEn_Us ? x.EnName : x.Name)),
CriterionNames = string.Join(",", criterionNameList.Union(memoryCriterionNameList).Distinct()), CriterionNames = string.Join(",", criterionNameList.Union(memoryCriterionNameList).Distinct()),
@ -1738,11 +1738,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var entity = item.Entity as IdentityUser; var entity = item.Entity as IdentityUser;
await InsertInspection<IdentityUser>(entity, type, x => new InspectionConvertDTO await InsertInspection<IdentityUser>(entity, type, x => new InspectionConvertDTO
{ {
IsDistinctionInterface = type == AuditOpt.Update ? true : false, IsDistinctionInterface = type == AuditOpt.Update ? true : false,
}); });
} }
// 项目参与人员 // 项目参与人员
@ -1777,7 +1777,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
identityUser.Phone, identityUser.Phone,
identityUser.OrganizationName, identityUser.OrganizationName,
}); });
} }
} }
// 项目人员 // 项目人员
@ -1795,7 +1795,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//var user = await _dbContext.Users.Include(x => x.UserTypeRole).FirstOrDefaultAsync(x => x.Id == entity.UserId); //var user = await _dbContext.Users.Include(x => x.UserTypeRole).FirstOrDefaultAsync(x => x.Id == entity.UserId);
await InsertInspection<TrialUserRole>(entity, type, x => new InspectionConvertDTO await InsertInspection<TrialUserRole>(entity, type, x => new InspectionConvertDTO
{ {
IsDistinctionInterface = false, IsDistinctionInterface = false,
TrialId = x.TrialId, TrialId = x.TrialId,
ObjectRelationParentId = x.TrialId, ObjectRelationParentId = x.TrialId,
ExtraIndentification = extraIndentification, ExtraIndentification = extraIndentification,
@ -2027,7 +2027,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
{ {
extraIdentification = "/2"; extraIdentification = "/2";
} }
break; break;
} }
@ -3241,7 +3241,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
u.ShowOrder u.ShowOrder
} }
).OrderBy(t => t.ShowOrder).ToList() ).OrderBy(t => t.ShowOrder).ToList()
},_userInfo.AuditIdentification); }, _userInfo.AuditIdentification);
////添加/修改病灶接口 只会对单个病灶进行操作 ////添加/修改病灶接口 只会对单个病灶进行操作
@ -3512,7 +3512,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//PM 申请重阅，区分不了是否有SPM参与 //PM 申请重阅，区分不了是否有SPM参与
if (entity.ReReadingApplyState== ReReadingApplyState.TrialGroupHaveApplyed) if (entity.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed)
{ {
//var hasSPM = _dbContext.VisitTaskReReading.Any(t => t.OriginalReReadingTaskId == entity.Id); //var hasSPM = _dbContext.VisitTaskReReading.Any(t => t.OriginalReReadingTaskId == entity.Id);
@ -3577,7 +3577,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
break; break;
case "ReadingImageTask/resetReadingTask/VisitTask/Update": case "ReadingImageTask/resetReadingTask":
//跳转阅片结果需要该参数 //跳转阅片结果需要该参数
obj.IsReadingReset = true; obj.IsReadingReset = true;
@ -3609,7 +3609,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//增加进入阅片中的稽查 //增加进入阅片中的稽查
//重置阅片也会从待阅片 变为阅片中，因为复制病灶依赖这个改变 //重置阅片也会从待阅片 变为阅片中，因为复制病灶依赖这个改变
if(obj.IsReadingReset == false) if (obj.IsReadingReset != true)
{ {
if (entity.ReadingTaskState == ReadingTaskState.Reading) if (entity.ReadingTaskState == ReadingTaskState.Reading)
{ {
@ -3621,11 +3621,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
} }
} }
if (entity.IsReadClinicalData == true) if (entity.IsReadClinicalData == true)
{ {
if (_dbContext.VisitTask.Where(t => t.Id == entity.Id).Any(t => t.IsReadClinicalData ==false)) if (_dbContext.VisitTask.Where(t => t.Id == entity.Id).Any(t => t.IsReadClinicalData == false))
{ {
isDistinctionInterface = false; isDistinctionInterface = false;
extraIdentification = "/ReadClinicalData"; extraIdentification = "/ReadClinicalData";
@ -3752,7 +3752,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
/// <param name="expression">表达式</param> /// <param name="expression">表达式</param>
/// <param name="otherItem">其他对象</param> /// <param name="otherItem">其他对象</param>
/// <returns></returns> /// <returns></returns>
public async Task InsertInspection<T>(T entityObj, string type, Expression<Func<T, InspectionConvertDTO>> expression = null, object otherItem = null,string auditIdentification = "") where T : Entity public async Task InsertInspection<T>(T entityObj, string type, Expression<Func<T, InspectionConvertDTO>> expression = null, object otherItem = null, string auditIdentification = "") where T : Entity
{ {
InspectionConvertDTO inspection = new InspectionConvertDTO(); InspectionConvertDTO inspection = new InspectionConvertDTO();
@ -3979,7 +3979,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
/// 获取稽查记录的标识符 部分业务会进行特殊处理 /// 获取稽查记录的标识符 部分业务会进行特殊处理
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public string GetInspectionRecordIdentification<T>(T entityObj, string type, bool IsDistinctionInterface = true, bool isSelfDefine = false,string auditIdentification="") public string GetInspectionRecordIdentification<T>(T entityObj, string type, bool IsDistinctionInterface = true, bool isSelfDefine = false, string auditIdentification = "")
{ {
//var entityType = _dbContext.Model.FindEntityType(entityObj.GetType()); //var entityType = _dbContext.Model.FindEntityType(entityObj.GetType());
//var tableName = entityType.GetTableName(); //var tableName = entityType.GetTableName();
@ -3998,11 +3998,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//自定义 标识后面 补充由代码上层的 extraIdentification 附加 //自定义 标识后面 补充由代码上层的 extraIdentification 附加
if (isSelfDefine) if (isSelfDefine)
{ {
result= $"{_userInfo.RequestUrl}/{entityTypeName}"; result = $"{_userInfo.RequestUrl}/{entityTypeName}";
} }
else else
{ {
result= $"{_userInfo.RequestUrl}/{entityTypeName}/{type}"; result = $"{_userInfo.RequestUrl}/{entityTypeName}/{type}";
} }

2
IRaCIS.Core.Infra.EFCore/Common/AuditingDto.cs
View File

@ -63,7 +63,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
public string SelectResult { get; set; } public string SelectResult { get; set; }
public bool IsReadingReset { get;set; } public bool? IsReadingReset { get;set; }
} }
public class InspectionConvertDTO : DataInspection public class InspectionConvertDTO : DataInspection
{ {