稽查修改代码
parent
56331ea150
commit
63eeb88066
|
@ -836,6 +836,16 @@
|
||||||
阅片临床数据ID
|
阅片临床数据ID
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.ReadingClinicalDataSignIndto.IsBlind">
|
||||||
|
<summary>
|
||||||
|
是否盲化
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.ReadingClinicalDataSignIndto.IsComplete">
|
||||||
|
<summary>
|
||||||
|
是否完整
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="T:IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto`1">
|
<member name="T:IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto`1">
|
||||||
<summary>
|
<summary>
|
||||||
稽查泛型Dto
|
稽查泛型Dto
|
||||||
|
|
|
@ -19,6 +19,7 @@ using IRaCIS.Core.Domain.Share.Reading;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
using DocumentFormat.OpenXml.Bibliography;
|
using DocumentFormat.OpenXml.Bibliography;
|
||||||
using System.Linq.Expressions;
|
using System.Linq.Expressions;
|
||||||
|
using MathNet.Numerics.Statistics.Mcmc;
|
||||||
|
|
||||||
namespace IRaCIS.Core.Application.Service
|
namespace IRaCIS.Core.Application.Service
|
||||||
{
|
{
|
||||||
|
@ -495,12 +496,21 @@ namespace IRaCIS.Core.Application.Service
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[UnitOfWork]
|
[UnitOfWork]
|
||||||
public async Task BatchGenerateTask(BatchGenerateTaskCommand batchGenerateTaskCommand)
|
public async Task<IResponseOutput> BatchGenerateTask(BatchGenerateTaskCommand batchGenerateTaskCommand)
|
||||||
{
|
{
|
||||||
|
|
||||||
await _subjectCriteriaEvaluationVisitFilterRepository.BatchUpdateNoTrackingAsync(t => t.SubjectId == batchGenerateTaskCommand.SubjectId
|
var trakingList= await _subjectCriteriaEvaluationVisitFilterRepository.Where(t => t.SubjectId == batchGenerateTaskCommand.SubjectId
|
||||||
&& t.TrialReadingCriterionId == batchGenerateTaskCommand.TrialReadingCriterionId
|
&& t.TrialReadingCriterionId == batchGenerateTaskCommand.TrialReadingCriterionId
|
||||||
&& batchGenerateTaskCommand.SubjectVisitIdList.Contains(t.SubjectVisitId), u => new SubjectCriteriaEvaluationVisitFilter { IsGeneratedTask = true });
|
&& batchGenerateTaskCommand.SubjectVisitIdList.Contains(t.SubjectVisitId),true).ToListAsync();
|
||||||
|
|
||||||
|
foreach (var item in trakingList)
|
||||||
|
{
|
||||||
|
item.IsGeneratedTask = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
//await _subjectCriteriaEvaluationVisitFilterRepository.BatchUpdateNoTrackingAsync(t => t.SubjectId == batchGenerateTaskCommand.SubjectId
|
||||||
|
//&& t.TrialReadingCriterionId == batchGenerateTaskCommand.TrialReadingCriterionId
|
||||||
|
//&& batchGenerateTaskCommand.SubjectVisitIdList.Contains(t.SubjectVisitId), u => new SubjectCriteriaEvaluationVisitFilter { IsGeneratedTask = true });
|
||||||
|
|
||||||
//自动生成任务
|
//自动生成任务
|
||||||
|
|
||||||
|
@ -513,6 +523,10 @@ namespace IRaCIS.Core.Application.Service
|
||||||
var generateVisitIdList = idList.Except(haveGenerateVisitIdList);
|
var generateVisitIdList = idList.Except(haveGenerateVisitIdList);
|
||||||
|
|
||||||
await _IVisitTaskHelpeService.BaseCritrionGenerateVisitTask(batchGenerateTaskCommand.TrialId, batchGenerateTaskCommand.TrialReadingCriterionId, true, generateVisitIdList.Select(t => (Guid)t).ToList());
|
await _IVisitTaskHelpeService.BaseCritrionGenerateVisitTask(batchGenerateTaskCommand.TrialId, batchGenerateTaskCommand.TrialReadingCriterionId, true, generateVisitIdList.Select(t => (Guid)t).ToList());
|
||||||
|
|
||||||
|
await _subjectCriteriaEvaluationVisitFilterRepository.SaveChangesAsync();
|
||||||
|
|
||||||
|
return ResponseOutput.Ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -573,10 +587,35 @@ namespace IRaCIS.Core.Application.Service
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public async Task<IResponseOutput> BatchAddSubjectCriteriaEvaluationVisitStudyFilter(List<SubjectCriteriaEvaluationVisitStudyFilterAddOrEdit> batchList)
|
public async Task<IResponseOutput> BatchAddSubjectCriteriaEvaluationVisitStudyFilter(List<SubjectCriteriaEvaluationVisitStudyFilterAddOrEdit> batchList)
|
||||||
{
|
{
|
||||||
var ids = batchList.Select(t => t.Id).ToList();
|
|
||||||
await _subjectCriteriaEvaluationVisitStudyFilterRepository.BatchDeleteNoTrackingAsync(t => ids.Contains(t.Id));
|
|
||||||
|
|
||||||
await _subjectCriteriaEvaluationVisitStudyFilterRepository.AddRangeAsync(_mapper.Map<List<SubjectCriteriaEvaluationVisitStudyFilter>>(batchList));
|
var ids = batchList.Where(t => t.Id != null).Select(t => t.Id).ToList();
|
||||||
|
#region 稽查修改前
|
||||||
|
|
||||||
|
//await _subjectCriteriaEvaluationVisitStudyFilterRepository.BatchDeleteNoTrackingAsync(t => ids.Contains(t.Id));
|
||||||
|
|
||||||
|
//await _subjectCriteriaEvaluationVisitStudyFilterRepository.AddRangeAsync(_mapper.Map<List<SubjectCriteriaEvaluationVisitStudyFilter>>(batchList));
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
|
||||||
|
#region 查询再更新
|
||||||
|
if (ids.Count > 0)
|
||||||
|
{
|
||||||
|
var list = await _subjectCriteriaEvaluationVisitStudyFilterRepository.Where(t => ids.Contains(t.Id), true).ToListAsync();
|
||||||
|
|
||||||
|
foreach (var item in list)
|
||||||
|
{
|
||||||
|
item.IsReading = batchList.FirstOrDefault(t => t.Id == item.Id)?.IsReading ?? item.IsReading;
|
||||||
|
item.IsConfirmed = batchList.FirstOrDefault(t => t.Id == item.Id)?.IsConfirmed ?? item.IsConfirmed;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
await _subjectCriteriaEvaluationVisitStudyFilterRepository.AddRangeAsync(_mapper.Map<List<SubjectCriteriaEvaluationVisitStudyFilter>>(batchList));
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
var first = batchList.First();
|
var first = batchList.First();
|
||||||
|
|
|
@ -163,9 +163,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
{
|
{
|
||||||
//TrialDicList = string.Join(",", trialDics)
|
//TrialDicList = string.Join(",", trialDics)
|
||||||
|
|
||||||
CriterionNames = string.Join(",", criterionNameList.Union(memoryCriterionNameList).Distinct()) ,
|
CriterionNames = string.Join(",", criterionNameList.Union(memoryCriterionNameList).Distinct()),
|
||||||
|
|
||||||
ClinicalDataSetNames = string.Join(",", clinicalDataSetNameList.Union(memoryClinicalDataSetNameList).Distinct().OrderBy(t=>t)) ,
|
ClinicalDataSetNames = string.Join(",", clinicalDataSetNameList.Union(memoryClinicalDataSetNameList).Distinct().OrderBy(t => t)),
|
||||||
|
|
||||||
|
|
||||||
}); ;
|
}); ;
|
||||||
|
@ -821,11 +821,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
{
|
{
|
||||||
if (entity.IsDeleted == true)
|
if (entity.IsDeleted == true)
|
||||||
{
|
{
|
||||||
extraIdentification = "/" + 2;
|
extraIdentification = "/" + 2;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
extraIdentification = "/" + 1;
|
extraIdentification = "/" + 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -946,6 +946,13 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
|
||||||
|
#region 热键 模板 个性化配置
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region 附加评估
|
#region 附加评估
|
||||||
|
@ -980,9 +987,59 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
|
|
||||||
var entity = item.Entity as SubjectCriteriaEvaluationVisitFilter;
|
var entity = item.Entity as SubjectCriteriaEvaluationVisitFilter;
|
||||||
|
|
||||||
|
|
||||||
|
if (type == AuditOpt.Add)
|
||||||
|
{
|
||||||
|
if (entity.IsGeneratedTask)
|
||||||
|
{
|
||||||
|
extraIdentification = "/AutoGenerate";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
extraIdentification = "/Add";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (type == AuditOpt.Update)
|
||||||
|
{
|
||||||
|
|
||||||
|
//手动生成任务
|
||||||
|
|
||||||
|
if (entity.IsGeneratedTask)
|
||||||
|
{
|
||||||
|
//Update
|
||||||
|
extraIdentification = "/ManualGenerate";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//回退接口
|
||||||
|
else if (_userInfo.RequestUrl == "SubjectCriteriaEvaluation/confirmBackCriteriaVisitTask")
|
||||||
|
{
|
||||||
|
extraIdentification = "/Back";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
//筛选影像保存接口
|
||||||
|
//if (_userInfo.RequestUrl == "SubjectCriteriaEvaluation/batchAddSubjectCriteriaEvaluationVisitStudyFilter")
|
||||||
|
//{
|
||||||
|
extraIdentification = "/Update";
|
||||||
|
//}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
await InsertInspection<SubjectCriteriaEvaluationVisitFilter>(entity, type, x => new InspectionConvertDTO()
|
await InsertInspection<SubjectCriteriaEvaluationVisitFilter>(entity, type, x => new InspectionConvertDTO()
|
||||||
{
|
{
|
||||||
IsDistinctionInterface = false,
|
IsDistinctionInterface = false,
|
||||||
|
IsSelfDefine=true,
|
||||||
|
ExtraIndentification=extraIdentification,
|
||||||
ObjectRelationParentId = x.SubjectVisitId,
|
ObjectRelationParentId = x.SubjectVisitId,
|
||||||
ObjectRelationParentId2 = x.TrialReadingCriterionId,
|
ObjectRelationParentId2 = x.TrialReadingCriterionId,
|
||||||
|
|
||||||
|
@ -998,11 +1055,25 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
|
|
||||||
var entity = item.Entity as SubjectCriteriaEvaluationVisitStudyFilter;
|
var entity = item.Entity as SubjectCriteriaEvaluationVisitStudyFilter;
|
||||||
|
|
||||||
|
if (entity.IsConfirmed == true)
|
||||||
|
{
|
||||||
|
extraIdentification = "/Confirm";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
extraIdentification = "/Save";
|
||||||
|
}
|
||||||
|
|
||||||
await InsertInspection<SubjectCriteriaEvaluationVisitStudyFilter>(entity, type, x => new InspectionConvertDTO()
|
await InsertInspection<SubjectCriteriaEvaluationVisitStudyFilter>(entity, type, x => new InspectionConvertDTO()
|
||||||
{
|
{
|
||||||
IsDistinctionInterface = false,
|
IsDistinctionInterface = false,
|
||||||
ObjectRelationParentId = x.SeriesId,
|
IsSelfDefine = true,
|
||||||
ObjectRelationParentId2 = x.StudyId,
|
|
||||||
|
ExtraIndentification = extraIdentification,
|
||||||
|
|
||||||
|
ObjectRelationParentId = x.StudyId,
|
||||||
|
ObjectRelationParentId2 = x.SeriesId,//序列有的稽查没有记录,所以StudyId放前面
|
||||||
|
|
||||||
ObjectRelationParentId3 = x.TrialReadingCriterionId,
|
ObjectRelationParentId3 = x.TrialReadingCriterionId,
|
||||||
|
|
||||||
TrialReadingCriterionId = x.TrialReadingCriterionId,
|
TrialReadingCriterionId = x.TrialReadingCriterionId,
|
||||||
|
@ -1313,14 +1384,14 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
|
|
||||||
// 对话消息区分用户类型
|
// 对话消息区分用户类型
|
||||||
|
|
||||||
extraIdentification = "/(" + _userInfo.UserTypeShortName + ")";
|
extraIdentification = "/(" + _userInfo.UserTypeShortName + ")";
|
||||||
|
|
||||||
|
|
||||||
if (_userInfo.RequestUrl.ToLower() == "qcoperation/closeqcchallenge")
|
if (_userInfo.RequestUrl.ToLower() == "qcoperation/closeqcchallenge")
|
||||||
{
|
{
|
||||||
reason = entity.TalkContent.Substring(entity.TalkContent.LastIndexOf(':') + 1);
|
reason = entity.TalkContent.Substring(entity.TalkContent.LastIndexOf(':') + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
await InsertInspection<QCChallengeDialog>(entity, type, x => new InspectionConvertDTO()
|
await InsertInspection<QCChallengeDialog>(entity, type, x => new InspectionConvertDTO()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -1345,7 +1416,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
|
|
||||||
var reason = string.Empty;
|
var reason = string.Empty;
|
||||||
|
|
||||||
extraIdentification = "/(" + _userInfo.UserTypeShortName + ")";
|
extraIdentification = "/(" + _userInfo.UserTypeShortName + ")";
|
||||||
|
|
||||||
if (_userInfo.RequestUrl.ToLower() == "qcoperation/closecheckchallenge")
|
if (_userInfo.RequestUrl.ToLower() == "qcoperation/closecheckchallenge")
|
||||||
{
|
{
|
||||||
|
@ -1363,7 +1434,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
|
|
||||||
Reason = reason,
|
Reason = reason,
|
||||||
|
|
||||||
ExtraIndentification=extraIdentification,
|
ExtraIndentification = extraIdentification,
|
||||||
ObjectRelationParentId = entity.SubjectVisitId,
|
ObjectRelationParentId = entity.SubjectVisitId,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1573,13 +1644,13 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
|
|
||||||
var extraIdentification = string.Empty;
|
var extraIdentification = string.Empty;
|
||||||
|
|
||||||
var basicData = item.Entity as SystemBasicData;
|
var basicData = item.Entity as SystemBasicData;
|
||||||
extraIdentification = (basicData.ParentId == null ? "/parent" : string.Empty);
|
extraIdentification = (basicData.ParentId == null ? "/parent" : string.Empty);
|
||||||
|
|
||||||
await InsertInspection<SystemBasicData>(item.Entity as SystemBasicData, type, x => new InspectionConvertDTO()
|
await InsertInspection<SystemBasicData>(item.Entity as SystemBasicData, type, x => new InspectionConvertDTO()
|
||||||
{
|
{
|
||||||
IsDistinctionInterface = false,
|
IsDistinctionInterface = false,
|
||||||
ExtraIndentification=extraIdentification
|
ExtraIndentification = extraIdentification
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1735,7 +1806,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
//待处理?
|
//待处理?
|
||||||
case "qcoperation/qcpassedorfailed":
|
case "qcoperation/qcpassedorfailed":
|
||||||
|
|
||||||
extraIdentification = "/" + (40 % (int)entity.AuditState).ToString();
|
extraIdentification = "/" + (40 % (int)entity.AuditState).ToString();
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -1779,8 +1850,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
|
|
||||||
await InsertInspection<SubjectVisit>(item.Entity as SubjectVisit, type, x => new InspectionConvertDTO()
|
await InsertInspection<SubjectVisit>(item.Entity as SubjectVisit, type, x => new InspectionConvertDTO()
|
||||||
{
|
{
|
||||||
IsDistinctionInterface= isDistinctionInterface,
|
IsDistinctionInterface = isDistinctionInterface,
|
||||||
Reason= reason,
|
Reason = reason,
|
||||||
|
|
||||||
//Subject的信息 找离的最近的Subject稽查信息
|
//Subject的信息 找离的最近的Subject稽查信息
|
||||||
ObjectRelationParentId = x.SubjectId,
|
ObjectRelationParentId = x.SubjectId,
|
||||||
|
@ -1836,7 +1907,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
extraIdentification = "/(" + _userInfo.UserTypeShortName + ")";
|
extraIdentification = "/(" + _userInfo.UserTypeShortName + ")";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
await InsertInspection<NoneDicomStudy>(item.Entity as NoneDicomStudy, type, x => new InspectionConvertDTO()
|
await InsertInspection<NoneDicomStudy>(item.Entity as NoneDicomStudy, type, x => new InspectionConvertDTO()
|
||||||
{
|
{
|
||||||
|
@ -2870,7 +2941,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
var generalId = (inspection.GeneralId != null && inspection.GeneralId != Guid.Empty) ? inspection.GeneralId : entityObj.Id;
|
var generalId = (inspection.GeneralId != null && inspection.GeneralId != Guid.Empty) ? inspection.GeneralId : entityObj.Id;
|
||||||
inspection.GeneralId = generalId;
|
inspection.GeneralId = generalId;
|
||||||
|
|
||||||
inspection.Identification = await GetInspectionRecordIdentificationAsync(entityObj, type, inspection.IsDistinctionInterface,inspection.IsSelfDefine) + inspection.ExtraIndentification;
|
inspection.Identification = await GetInspectionRecordIdentificationAsync(entityObj, type, inspection.IsDistinctionInterface, inspection.IsSelfDefine) + inspection.ExtraIndentification;
|
||||||
|
|
||||||
//将实体对象属性 映射到稽查实体
|
//将实体对象属性 映射到稽查实体
|
||||||
MapEntityPropertyToAuditEntity(entityObj, inspection);
|
MapEntityPropertyToAuditEntity(entityObj, inspection);
|
||||||
|
@ -3079,7 +3150,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
/// 获取稽查记录的标识符 部分业务会进行特殊处理
|
/// 获取稽查记录的标识符 部分业务会进行特殊处理
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public async Task<string> GetInspectionRecordIdentificationAsync<T>( T entityObj, string type, bool IsDistinctionInterface = true,bool isSelfDefine = false)
|
public async Task<string> GetInspectionRecordIdentificationAsync<T>(T entityObj, string type, bool IsDistinctionInterface = true, bool isSelfDefine = false)
|
||||||
{
|
{
|
||||||
var entityTypeName = entityObj.GetType().Name;
|
var entityTypeName = entityObj.GetType().Name;
|
||||||
|
|
||||||
|
@ -3102,7 +3173,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
return $"{_userInfo.RequestUrl}/{entityTypeName}/{type}";
|
return $"{_userInfo.RequestUrl}/{entityTypeName}/{type}";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -3115,12 +3186,12 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
{
|
{
|
||||||
return $"{entityTypeName}/{type}";
|
return $"{entityTypeName}/{type}";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#region 标识符特殊处理 废弃
|
#region 标识符特殊处理 废弃
|
||||||
|
@ -3129,303 +3200,303 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
||||||
|
|
||||||
//switch (entityObj.GetType().Name)
|
//switch (entityObj.GetType().Name)
|
||||||
//{
|
//{
|
||||||
//case nameof(TrialDocConfirmedUser):
|
//case nameof(TrialDocConfirmedUser):
|
||||||
//case nameof(SystemDocConfirmedUser):
|
//case nameof(SystemDocConfirmedUser):
|
||||||
|
|
||||||
// var softDelete = entityObj as ISoftDelete;
|
// var softDelete = entityObj as ISoftDelete;
|
||||||
|
|
||||||
// if (type == AuditOpt.Update)
|
// if (type == AuditOpt.Update)
|
||||||
// {
|
// {
|
||||||
// if (softDelete.IsDeleted == true)
|
// if (softDelete.IsDeleted == true)
|
||||||
// {
|
// {
|
||||||
// type = type + "/" + 2;
|
// type = type + "/" + 2;
|
||||||
// }
|
// }
|
||||||
// else
|
// else
|
||||||
// {
|
// {
|
||||||
// type = type + "/" + 1;
|
// type = type + "/" + 1;
|
||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
|
|
||||||
// break;
|
// break;
|
||||||
|
|
||||||
//case nameof(SystemBasicData):
|
//case nameof(SystemBasicData):
|
||||||
// var basicData = entityObj as SystemBasicData;
|
// var basicData = entityObj as SystemBasicData;
|
||||||
// type = type + (basicData.ParentId == null ? "/parent" : string.Empty);
|
// type = type + (basicData.ParentId == null ? "/parent" : string.Empty);
|
||||||
// break;
|
// break;
|
||||||
|
|
||||||
//case nameof(Trial):
|
//case nameof(Trial):
|
||||||
// var trial = entityObj as Trial;
|
// var trial = entityObj as Trial;
|
||||||
// Guid id = trial.Id;
|
// Guid id = trial.Id;
|
||||||
// var oldentity = await _dbContext.Trial.Where(x => x.Id == id).Select(t => new { t.IsTrialBasicLogicConfirmed, t.IsTrialProcessConfirmed, t.IsTrialUrgentConfirmed }).FirstOrDefaultAsync();
|
// var oldentity = await _dbContext.Trial.Where(x => x.Id == id).Select(t => new { t.IsTrialBasicLogicConfirmed, t.IsTrialProcessConfirmed, t.IsTrialUrgentConfirmed }).FirstOrDefaultAsync();
|
||||||
// switch (_userInfo.RequestUrl.ToLower())
|
// switch (_userInfo.RequestUrl.ToLower())
|
||||||
// {
|
// {
|
||||||
// case "configtrialbasicinfo/configtrialbasicinfoconfirm":
|
// case "configtrialbasicinfo/configtrialbasicinfoconfirm":
|
||||||
// type = type + "/" + oldentity.IsTrialBasicLogicConfirmed.ToString();
|
// type = type + "/" + oldentity.IsTrialBasicLogicConfirmed.ToString();
|
||||||
// break;
|
// break;
|
||||||
// //case "configtrialbasicinfo/configtrialprocessinfoconfirm":
|
// //case "configtrialbasicinfo/configtrialprocessinfoconfirm":
|
||||||
// // type = type + "/" + oldentity.IsTrialProcessConfirmed.ToString();
|
// // type = type + "/" + oldentity.IsTrialProcessConfirmed.ToString();
|
||||||
// // break;
|
// // break;
|
||||||
// case "configtrialbasicinfo/configtrialurgentinfoconfirm":
|
// case "configtrialbasicinfo/configtrialurgentinfoconfirm":
|
||||||
// type = type + "/" + oldentity.IsTrialUrgentConfirmed.ToString();
|
// type = type + "/" + oldentity.IsTrialUrgentConfirmed.ToString();
|
||||||
// break;
|
// break;
|
||||||
// }
|
// }
|
||||||
// break;
|
// break;
|
||||||
|
|
||||||
//case nameof(ReadingQuestionTrial):
|
//case nameof(ReadingQuestionTrial):
|
||||||
|
|
||||||
// var trialReadingQuestion = entityObj as ReadingQuestionTrial;
|
// var trialReadingQuestion = entityObj as ReadingQuestionTrial;
|
||||||
|
|
||||||
// switch (_userInfo.RequestUrl)
|
// switch (_userInfo.RequestUrl)
|
||||||
// {
|
// {
|
||||||
// case "ReadingImageTask/setTrialCriterionJudgeQuestionAnswerGroup":
|
// case "ReadingImageTask/setTrialCriterionJudgeQuestionAnswerGroup":
|
||||||
|
|
||||||
// if (trialReadingQuestion.JudgeType == JudgeTypeEnum.None)
|
// if (trialReadingQuestion.JudgeType == JudgeTypeEnum.None)
|
||||||
// {
|
// {
|
||||||
// type = type + "/" + "Reset";
|
// type = type + "/" + "Reset";
|
||||||
// }
|
// }
|
||||||
|
|
||||||
// break;
|
// break;
|
||||||
// }
|
// }
|
||||||
// break;
|
// break;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#region 访视相关
|
#region 访视相关
|
||||||
|
|
||||||
//// 对话消息区分用户类型
|
//// 对话消息区分用户类型
|
||||||
//case nameof(CheckChallengeDialog):
|
//case nameof(CheckChallengeDialog):
|
||||||
// type = type + "/(" + _userInfo.UserTypeShortName + ")";
|
// type = type + "/(" + _userInfo.UserTypeShortName + ")";
|
||||||
|
|
||||||
// var checkDialog = entityObj as CheckChallengeDialog;
|
// var checkDialog = entityObj as CheckChallengeDialog;
|
||||||
|
|
||||||
// switch (_userInfo.RequestUrl.ToLower())
|
// switch (_userInfo.RequestUrl.ToLower())
|
||||||
// {
|
// {
|
||||||
// case "qcoperation/closecheckchallenge":
|
// case "qcoperation/closecheckchallenge":
|
||||||
|
|
||||||
// inspection.Reason = checkDialog.TalkContent.Substring(checkDialog.TalkContent.LastIndexOf(':') + 1);
|
// inspection.Reason = checkDialog.TalkContent.Substring(checkDialog.TalkContent.LastIndexOf(':') + 1);
|
||||||
// break;
|
// break;
|
||||||
// }
|
// }
|
||||||
|
|
||||||
// break;
|
// break;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//case nameof(SubjectVisit):
|
|
||||||
// var sv = entityObj as SubjectVisit;
|
|
||||||
// switch (_userInfo.RequestUrl.ToLower())
|
|
||||||
// {
|
|
||||||
// //待处理?
|
|
||||||
// case "qcoperation/qcpassedorfailed":
|
|
||||||
|
|
||||||
// type = type + "/" + (40 % (int)sv.AuditState).ToString();
|
//case nameof(SubjectVisit):
|
||||||
|
// var sv = entityObj as SubjectVisit;
|
||||||
|
// switch (_userInfo.RequestUrl.ToLower())
|
||||||
|
// {
|
||||||
|
// //待处理?
|
||||||
|
// case "qcoperation/qcpassedorfailed":
|
||||||
|
|
||||||
// break;
|
// type = type + "/" + (40 % (int)sv.AuditState).ToString();
|
||||||
|
|
||||||
// //设置核查通过
|
// break;
|
||||||
// case "qcoperation/setcheckpass":
|
|
||||||
|
|
||||||
// inspection.Reason = sv.ManualPassReason;
|
// //设置核查通过
|
||||||
// break;
|
// case "qcoperation/setcheckpass":
|
||||||
|
|
||||||
// //领取或者取消QC任务
|
// inspection.Reason = sv.ManualPassReason;
|
||||||
// case "qcoperation/obtainorcancelqctask":
|
// break;
|
||||||
// type = type + "/" + sv.IsTake.ToString();
|
|
||||||
// break;
|
|
||||||
|
|
||||||
// //确认重阅 区分用户类型
|
// //领取或者取消QC任务
|
||||||
// case "visittask/confirmrereading":
|
// case "qcoperation/obtainorcancelqctask":
|
||||||
|
// type = type + "/" + sv.IsTake.ToString();
|
||||||
|
// break;
|
||||||
|
|
||||||
// if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.APM)
|
// //确认重阅 区分用户类型
|
||||||
// {
|
// case "visittask/confirmrereading":
|
||||||
// type = type + "/" + 1;
|
|
||||||
|
|
||||||
// }
|
// if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.APM)
|
||||||
// else
|
// {
|
||||||
// {
|
// type = type + "/" + 1;
|
||||||
// //SPM
|
|
||||||
// type = type + "/" + 2;
|
|
||||||
// }
|
|
||||||
// break;
|
|
||||||
// }
|
|
||||||
|
|
||||||
// if (sv.CheckChallengeState == CheckChanllengeTypeEnum.CRCWaitPMReply || sv.CheckChallengeState == CheckChanllengeTypeEnum.PMWaitCRCReply)
|
// }
|
||||||
// {
|
// else
|
||||||
// //发送对话 修改质疑状态 不需要区分接口
|
// {
|
||||||
// IsDistinctionInterface = false;
|
// //SPM
|
||||||
|
// type = type + "/" + 2;
|
||||||
|
// }
|
||||||
|
// break;
|
||||||
|
// }
|
||||||
|
|
||||||
// type = type + "/ModifyCheckChallengeState";
|
// if (sv.CheckChallengeState == CheckChanllengeTypeEnum.CRCWaitPMReply || sv.CheckChallengeState == CheckChanllengeTypeEnum.PMWaitCRCReply)
|
||||||
// }
|
// {
|
||||||
// break;
|
// //发送对话 修改质疑状态 不需要区分接口
|
||||||
|
// IsDistinctionInterface = false;
|
||||||
|
|
||||||
//case nameof(NoneDicomStudy):
|
// type = type + "/ModifyCheckChallengeState";
|
||||||
// switch (_userInfo.RequestUrl.ToLower())
|
// }
|
||||||
// {
|
// break;
|
||||||
// case "nonedicomstudy/addorupdatenonedicomstudy":
|
|
||||||
// type = type + "/(" + _userInfo.UserTypeShortName + ")";
|
|
||||||
// break;
|
|
||||||
// }
|
|
||||||
// break;
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
|
//case nameof(NoneDicomStudy):
|
||||||
|
// switch (_userInfo.RequestUrl.ToLower())
|
||||||
|
// {
|
||||||
|
// case "nonedicomstudy/addorupdatenonedicomstudy":
|
||||||
|
// type = type + "/(" + _userInfo.UserTypeShortName + ")";
|
||||||
|
// break;
|
||||||
|
// }
|
||||||
|
// break;
|
||||||
|
#endregion
|
||||||
|
|
||||||
#region 阅片任务相关
|
|
||||||
|
|
||||||
////任务表
|
#region 阅片任务相关
|
||||||
//case nameof(VisitTask):
|
|
||||||
|
|
||||||
// var visitTask = entityObj as VisitTask;
|
////任务表
|
||||||
|
//case nameof(VisitTask):
|
||||||
|
|
||||||
|
// var visitTask = entityObj as VisitTask;
|
||||||
|
|
||||||
// #region 标识区分
|
|
||||||
|
|
||||||
|
// #region 标识区分
|
||||||
|
|
||||||
|
|
||||||
// if (type == AuditOpt.Add)
|
|
||||||
// {
|
|
||||||
// //生成一致性分析任务
|
|
||||||
// if (visitTask.IsSelfAnalysis == true)
|
|
||||||
// {
|
|
||||||
// type = type + "/" + "SelfAnalysis";
|
|
||||||
// }
|
|
||||||
// else if (visitTask.IsSelfAnalysis == false)
|
|
||||||
// {
|
|
||||||
// type = type + "/" + "GroupAnalysis";
|
|
||||||
// }
|
|
||||||
// else
|
|
||||||
// {
|
|
||||||
// type = type + "/" + "NotAnalysis";
|
|
||||||
// }
|
|
||||||
|
|
||||||
// //区分任务类型
|
// if (type == AuditOpt.Add)
|
||||||
// type = type + "/" + (int)visitTask.ReadingCategory;
|
// {
|
||||||
|
// //生成一致性分析任务
|
||||||
|
// if (visitTask.IsSelfAnalysis == true)
|
||||||
|
// {
|
||||||
|
// type = type + "/" + "SelfAnalysis";
|
||||||
|
// }
|
||||||
|
// else if (visitTask.IsSelfAnalysis == false)
|
||||||
|
// {
|
||||||
|
// type = type + "/" + "GroupAnalysis";
|
||||||
|
// }
|
||||||
|
// else
|
||||||
|
// {
|
||||||
|
// type = type + "/" + "NotAnalysis";
|
||||||
|
// }
|
||||||
|
|
||||||
|
// //区分任务类型
|
||||||
|
// type = type + "/" + (int)visitTask.ReadingCategory;
|
||||||
|
|
||||||
// }
|
|
||||||
// else
|
|
||||||
// {
|
|
||||||
// switch (_userInfo.RequestUrl)
|
|
||||||
// {
|
|
||||||
// //申请重阅
|
|
||||||
// case "VisitTask/applyReReading":
|
|
||||||
// type = type + "/" + (int)visitTask.ReReadingApplyState;
|
|
||||||
// break;
|
|
||||||
|
|
||||||
|
// }
|
||||||
|
// else
|
||||||
|
// {
|
||||||
|
// switch (_userInfo.RequestUrl)
|
||||||
|
// {
|
||||||
|
// //申请重阅
|
||||||
|
// case "VisitTask/applyReReading":
|
||||||
|
// type = type + "/" + (int)visitTask.ReReadingApplyState;
|
||||||
|
// break;
|
||||||
|
|
||||||
// //同意重阅
|
|
||||||
// case "VisitTask/ConfirmReReading":
|
|
||||||
|
|
||||||
// if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.APM)
|
// //同意重阅
|
||||||
// {
|
// case "VisitTask/ConfirmReReading":
|
||||||
// type = type + "/" + 1;
|
|
||||||
|
|
||||||
// }
|
// if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.APM)
|
||||||
// else
|
// {
|
||||||
// {
|
// type = type + "/" + 1;
|
||||||
// type = type + "/" + 2;
|
|
||||||
// }
|
|
||||||
|
|
||||||
// break;
|
// }
|
||||||
// }
|
// else
|
||||||
|
// {
|
||||||
|
// type = type + "/" + 2;
|
||||||
|
// }
|
||||||
|
|
||||||
// }
|
// break;
|
||||||
|
// }
|
||||||
|
|
||||||
|
// }
|
||||||
|
|
||||||
// #endregion
|
|
||||||
|
|
||||||
|
// #endregion
|
||||||
|
|
||||||
|
|
||||||
// break;
|
|
||||||
|
|
||||||
////重阅记录表
|
// break;
|
||||||
//case nameof(VisitTaskReReading):
|
|
||||||
|
|
||||||
// var visitTaskReReading = entityObj as VisitTaskReReading;
|
////重阅记录表
|
||||||
|
//case nameof(VisitTaskReReading):
|
||||||
|
|
||||||
// switch (_userInfo.RequestUrl)
|
// var visitTaskReReading = entityObj as VisitTaskReReading;
|
||||||
// {
|
|
||||||
// case "VisitTask/applyReReading":
|
|
||||||
// type = type + "/" + (int)visitTaskReReading.RequestReReadingType;
|
|
||||||
// break;
|
|
||||||
|
|
||||||
// case "VisitTask/ConfirmReReading":
|
// switch (_userInfo.RequestUrl)
|
||||||
|
// {
|
||||||
|
// case "VisitTask/applyReReading":
|
||||||
|
// type = type + "/" + (int)visitTaskReReading.RequestReReadingType;
|
||||||
|
// break;
|
||||||
|
|
||||||
// if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.APM)
|
// case "VisitTask/ConfirmReReading":
|
||||||
// {
|
|
||||||
// type = type + "/" + 1;
|
|
||||||
|
|
||||||
// }
|
// if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.APM)
|
||||||
// else
|
// {
|
||||||
// {
|
// type = type + "/" + 1;
|
||||||
// type = type + "/" + 2;
|
|
||||||
// }
|
|
||||||
|
|
||||||
// if (visitTaskReReading.RequestReReadingResultEnum == RequestReReadingResult.Agree)
|
// }
|
||||||
// {
|
// else
|
||||||
// type = type + "/" + 1;
|
// {
|
||||||
|
// type = type + "/" + 2;
|
||||||
|
// }
|
||||||
|
|
||||||
// }
|
// if (visitTaskReReading.RequestReReadingResultEnum == RequestReReadingResult.Agree)
|
||||||
// else if (visitTaskReReading.RequestReReadingResultEnum == RequestReReadingResult.Reject)
|
// {
|
||||||
// {
|
// type = type + "/" + 1;
|
||||||
// type = type + "/" + 2;
|
|
||||||
// }
|
|
||||||
// break;
|
|
||||||
// }
|
|
||||||
|
|
||||||
// break;
|
// }
|
||||||
|
// else if (visitTaskReReading.RequestReReadingResultEnum == RequestReReadingResult.Reject)
|
||||||
|
// {
|
||||||
|
// type = type + "/" + 2;
|
||||||
|
// }
|
||||||
|
// break;
|
||||||
|
// }
|
||||||
|
|
||||||
////一致性分析规则
|
// break;
|
||||||
//case nameof(TaskConsistentRule):
|
|
||||||
|
|
||||||
// var taskConsistentRule = entityObj as TaskConsistentRule;
|
////一致性分析规则
|
||||||
|
//case nameof(TaskConsistentRule):
|
||||||
|
|
||||||
// //自身一致性分析
|
// var taskConsistentRule = entityObj as TaskConsistentRule;
|
||||||
// if (taskConsistentRule.IsSelfAnalysis == true)
|
|
||||||
// {
|
|
||||||
// type = type + "/" + 1;
|
|
||||||
|
|
||||||
// }
|
// //自身一致性分析
|
||||||
// //组件一致性分析
|
// if (taskConsistentRule.IsSelfAnalysis == true)
|
||||||
// else
|
// {
|
||||||
// {
|
// type = type + "/" + 1;
|
||||||
// type = type + "/" + 2;
|
|
||||||
// }
|
|
||||||
|
|
||||||
// break;
|
// }
|
||||||
#endregion
|
// //组件一致性分析
|
||||||
|
// else
|
||||||
|
// {
|
||||||
|
// type = type + "/" + 2;
|
||||||
|
// }
|
||||||
|
|
||||||
|
// break;
|
||||||
|
#endregion
|
||||||
|
|
||||||
////标准 器官病灶表
|
|
||||||
//case nameof(CriterionNidus):
|
|
||||||
|
|
||||||
// var criterionNidus = entityObj as CriterionNidus;
|
////标准 器官病灶表
|
||||||
|
//case nameof(CriterionNidus):
|
||||||
|
|
||||||
// if (criterionNidus.IsSystemCriterion == false)
|
// var criterionNidus = entityObj as CriterionNidus;
|
||||||
// {
|
|
||||||
// type = type + "/IsTrial";
|
|
||||||
// }
|
|
||||||
|
|
||||||
// break;
|
// if (criterionNidus.IsSystemCriterion == false)
|
||||||
|
// {
|
||||||
|
// type = type + "/IsTrial";
|
||||||
|
// }
|
||||||
|
|
||||||
////系统 项目公用
|
// break;
|
||||||
//case nameof(ReadingCriterionDictionary):
|
|
||||||
|
|
||||||
// var readingCriterionDictionary = entityObj as ReadingCriterionDictionary;
|
////系统 项目公用
|
||||||
|
//case nameof(ReadingCriterionDictionary):
|
||||||
|
|
||||||
// if (readingCriterionDictionary.IsSystemCriterion)
|
// var readingCriterionDictionary = entityObj as ReadingCriterionDictionary;
|
||||||
// {
|
|
||||||
// type = $"{type}/{readingCriterionDictionary.ParentCode}";
|
|
||||||
// }
|
|
||||||
|
|
||||||
// break;
|
// if (readingCriterionDictionary.IsSystemCriterion)
|
||||||
|
// {
|
||||||
|
// type = $"{type}/{readingCriterionDictionary.ParentCode}";
|
||||||
|
// }
|
||||||
|
|
||||||
|
// break;
|
||||||
|
|
||||||
|
|
||||||
//}
|
//}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue