diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 596fd8d33..d767e1375 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -836,6 +836,16 @@
阅片临床数据ID
+
+
+ 是否盲化
+
+
+
+
+ 是否完整
+
+
稽查泛型Dto
diff --git a/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationService.cs b/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationService.cs
index 03545bd9a..ff72f893e 100644
--- a/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationService.cs
@@ -19,6 +19,7 @@ using IRaCIS.Core.Domain.Share.Reading;
using System.Runtime.InteropServices;
using DocumentFormat.OpenXml.Bibliography;
using System.Linq.Expressions;
+using MathNet.Numerics.Statistics.Mcmc;
namespace IRaCIS.Core.Application.Service
{
@@ -495,12 +496,21 @@ namespace IRaCIS.Core.Application.Service
///
///
[UnitOfWork]
- public async Task BatchGenerateTask(BatchGenerateTaskCommand batchGenerateTaskCommand)
+ public async Task 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
- && 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);
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
///
public async Task BatchAddSubjectCriteriaEvaluationVisitStudyFilter(List batchList)
{
- var ids = batchList.Select(t => t.Id).ToList();
- await _subjectCriteriaEvaluationVisitStudyFilterRepository.BatchDeleteNoTrackingAsync(t => ids.Contains(t.Id));
- await _subjectCriteriaEvaluationVisitStudyFilterRepository.AddRangeAsync(_mapper.Map>(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>(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>(batchList));
+ }
+ #endregion
+
+
var first = batchList.First();
diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index e5b14d333..ce4efccb5 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
@@ -163,9 +163,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
{
//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)
{
- extraIdentification = "/" + 2;
+ extraIdentification = "/" + 2;
}
else
{
- extraIdentification = "/" + 1;
+ extraIdentification = "/" + 1;
}
}
@@ -946,6 +946,13 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}
+ #endregion
+
+
+ #region 热键 模板 个性化配置
+
+
+
#endregion
#region 附加评估
@@ -980,9 +987,59 @@ namespace IRaCIS.Core.Infra.EFCore.Common
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(entity, type, x => new InspectionConvertDTO()
{
IsDistinctionInterface = false,
+ IsSelfDefine=true,
+ ExtraIndentification=extraIdentification,
ObjectRelationParentId = x.SubjectVisitId,
ObjectRelationParentId2 = x.TrialReadingCriterionId,
@@ -998,11 +1055,25 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var entity = item.Entity as SubjectCriteriaEvaluationVisitStudyFilter;
+ if (entity.IsConfirmed == true)
+ {
+ extraIdentification = "/Confirm";
+ }
+ else
+ {
+ extraIdentification = "/Save";
+ }
+
await InsertInspection(entity, type, x => new InspectionConvertDTO()
{
IsDistinctionInterface = false,
- ObjectRelationParentId = x.SeriesId,
- ObjectRelationParentId2 = x.StudyId,
+ IsSelfDefine = true,
+
+ ExtraIndentification = extraIdentification,
+
+ ObjectRelationParentId = x.StudyId,
+ ObjectRelationParentId2 = x.SeriesId,//序列有的稽查没有记录，所以StudyId放前面
+
ObjectRelationParentId3 = 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")
{
reason = entity.TalkContent.Substring(entity.TalkContent.LastIndexOf(':') + 1);
}
-
+
await InsertInspection(entity, type, x => new InspectionConvertDTO()
{
@@ -1345,7 +1416,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var reason = string.Empty;
- extraIdentification = "/(" + _userInfo.UserTypeShortName + ")";
+ extraIdentification = "/(" + _userInfo.UserTypeShortName + ")";
if (_userInfo.RequestUrl.ToLower() == "qcoperation/closecheckchallenge")
{
@@ -1363,7 +1434,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
Reason = reason,
- ExtraIndentification=extraIdentification,
+ ExtraIndentification = extraIdentification,
ObjectRelationParentId = entity.SubjectVisitId,
}
@@ -1573,13 +1644,13 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var extraIdentification = string.Empty;
- var basicData = item.Entity as SystemBasicData;
- extraIdentification = (basicData.ParentId == null ? "/parent" : string.Empty);
-
+ var basicData = item.Entity as SystemBasicData;
+ extraIdentification = (basicData.ParentId == null ? "/parent" : string.Empty);
+
await InsertInspection(item.Entity as SystemBasicData, type, x => new InspectionConvertDTO()
{
IsDistinctionInterface = false,
- ExtraIndentification=extraIdentification
+ ExtraIndentification = extraIdentification
});
}
@@ -1735,7 +1806,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//待处理？
case "qcoperation/qcpassedorfailed":
- extraIdentification = "/" + (40 % (int)entity.AuditState).ToString();
+ extraIdentification = "/" + (40 % (int)entity.AuditState).ToString();
break;
@@ -1779,8 +1850,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
await InsertInspection(item.Entity as SubjectVisit, type, x => new InspectionConvertDTO()
{
- IsDistinctionInterface= isDistinctionInterface,
- Reason= reason,
+ IsDistinctionInterface = isDistinctionInterface,
+ Reason = reason,
//Subject的信息 找离的最近的Subject稽查信息
ObjectRelationParentId = x.SubjectId,
@@ -1836,7 +1907,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
extraIdentification = "/(" + _userInfo.UserTypeShortName + ")";
}
-
+
await InsertInspection(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;
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);
@@ -3079,7 +3150,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
/// 获取稽查记录的标识符 部分业务会进行特殊处理
///
///
- public async Task GetInspectionRecordIdentificationAsync( T entityObj, string type, bool IsDistinctionInterface = true,bool isSelfDefine = false)
+ public async Task GetInspectionRecordIdentificationAsync(T entityObj, string type, bool IsDistinctionInterface = true, bool isSelfDefine = false)
{
var entityTypeName = entityObj.GetType().Name;
@@ -3102,7 +3173,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
return $"{_userInfo.RequestUrl}/{entityTypeName}/{type}";
}
-
+
}
else
{
@@ -3115,12 +3186,12 @@ namespace IRaCIS.Core.Infra.EFCore.Common
{
return $"{entityTypeName}/{type}";
}
-
+
}
-
-
-
+
+
+
#region 标识符特殊处理 废弃
@@ -3129,303 +3200,303 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//switch (entityObj.GetType().Name)
//{
- //case nameof(TrialDocConfirmedUser):
- //case nameof(SystemDocConfirmedUser):
+ //case nameof(TrialDocConfirmedUser):
+ //case nameof(SystemDocConfirmedUser):
- // var softDelete = entityObj as ISoftDelete;
+ // var softDelete = entityObj as ISoftDelete;
- // if (type == AuditOpt.Update)
- // {
- // if (softDelete.IsDeleted == true)
- // {
- // type = type + "/" + 2;
- // }
- // else
- // {
- // type = type + "/" + 1;
- // }
- // }
+ // if (type == AuditOpt.Update)
+ // {
+ // if (softDelete.IsDeleted == true)
+ // {
+ // type = type + "/" + 2;
+ // }
+ // else
+ // {
+ // type = type + "/" + 1;
+ // }
+ // }
- // break;
+ // break;
- //case nameof(SystemBasicData):
- // var basicData = entityObj as SystemBasicData;
- // type = type + (basicData.ParentId == null ? "/parent" : string.Empty);
- // break;
+ //case nameof(SystemBasicData):
+ // var basicData = entityObj as SystemBasicData;
+ // type = type + (basicData.ParentId == null ? "/parent" : string.Empty);
+ // break;
- //case nameof(Trial):
- // var trial = entityObj as Trial;
- // Guid id = trial.Id;
- // var oldentity = await _dbContext.Trial.Where(x => x.Id == id).Select(t => new { t.IsTrialBasicLogicConfirmed, t.IsTrialProcessConfirmed, t.IsTrialUrgentConfirmed }).FirstOrDefaultAsync();
- // switch (_userInfo.RequestUrl.ToLower())
- // {
- // case "configtrialbasicinfo/configtrialbasicinfoconfirm":
- // type = type + "/" + oldentity.IsTrialBasicLogicConfirmed.ToString();
- // break;
- // //case "configtrialbasicinfo/configtrialprocessinfoconfirm":
- // // type = type + "/" + oldentity.IsTrialProcessConfirmed.ToString();
- // // break;
- // case "configtrialbasicinfo/configtrialurgentinfoconfirm":
- // type = type + "/" + oldentity.IsTrialUrgentConfirmed.ToString();
- // break;
- // }
- // break;
+ //case nameof(Trial):
+ // var trial = entityObj as Trial;
+ // Guid id = trial.Id;
+ // var oldentity = await _dbContext.Trial.Where(x => x.Id == id).Select(t => new { t.IsTrialBasicLogicConfirmed, t.IsTrialProcessConfirmed, t.IsTrialUrgentConfirmed }).FirstOrDefaultAsync();
+ // switch (_userInfo.RequestUrl.ToLower())
+ // {
+ // case "configtrialbasicinfo/configtrialbasicinfoconfirm":
+ // type = type + "/" + oldentity.IsTrialBasicLogicConfirmed.ToString();
+ // break;
+ // //case "configtrialbasicinfo/configtrialprocessinfoconfirm":
+ // // type = type + "/" + oldentity.IsTrialProcessConfirmed.ToString();
+ // // break;
+ // case "configtrialbasicinfo/configtrialurgentinfoconfirm":
+ // type = type + "/" + oldentity.IsTrialUrgentConfirmed.ToString();
+ // break;
+ // }
+ // break;
- //case nameof(ReadingQuestionTrial):
+ //case nameof(ReadingQuestionTrial):
- // var trialReadingQuestion = entityObj as ReadingQuestionTrial;
+ // var trialReadingQuestion = entityObj as ReadingQuestionTrial;
- // switch (_userInfo.RequestUrl)
- // {
- // case "ReadingImageTask/setTrialCriterionJudgeQuestionAnswerGroup":
+ // switch (_userInfo.RequestUrl)
+ // {
+ // case "ReadingImageTask/setTrialCriterionJudgeQuestionAnswerGroup":
- // if (trialReadingQuestion.JudgeType == JudgeTypeEnum.None)
- // {
- // type = type + "/" + "Reset";
- // }
+ // if (trialReadingQuestion.JudgeType == JudgeTypeEnum.None)
+ // {
+ // type = type + "/" + "Reset";
+ // }
- // break;
- // }
- // break;
+ // break;
+ // }
+ // break;
- #region 访视相关
+ #region 访视相关
- //// 对话消息区分用户类型
- //case nameof(CheckChallengeDialog):
- // type = type + "/(" + _userInfo.UserTypeShortName + ")";
+ //// 对话消息区分用户类型
+ //case nameof(CheckChallengeDialog):
+ // type = type + "/(" + _userInfo.UserTypeShortName + ")";
- // var checkDialog = entityObj as CheckChallengeDialog;
+ // var checkDialog = entityObj as CheckChallengeDialog;
- // switch (_userInfo.RequestUrl.ToLower())
- // {
- // case "qcoperation/closecheckchallenge":
+ // switch (_userInfo.RequestUrl.ToLower())
+ // {
+ // case "qcoperation/closecheckchallenge":
- // inspection.Reason = checkDialog.TalkContent.Substring(checkDialog.TalkContent.LastIndexOf(':') + 1);
- // break;
- // }
+ // inspection.Reason = checkDialog.TalkContent.Substring(checkDialog.TalkContent.LastIndexOf(':') + 1);
+ // 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();
- // //设置核查通过
- // case "qcoperation/setcheckpass":
+ // break;
- // inspection.Reason = sv.ManualPassReason;
- // break;
+ // //设置核查通过
+ // case "qcoperation/setcheckpass":
- // //领取或者取消QC任务
- // case "qcoperation/obtainorcancelqctask":
- // type = type + "/" + sv.IsTake.ToString();
- // break;
+ // inspection.Reason = sv.ManualPassReason;
+ // break;
- // //确认重阅 区分用户类型
- // case "visittask/confirmrereading":
+ // //领取或者取消QC任务
+ // case "qcoperation/obtainorcancelqctask":
+ // type = type + "/" + sv.IsTake.ToString();
+ // break;
- // if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.APM)
- // {
- // type = type + "/" + 1;
+ // //确认重阅 区分用户类型
+ // case "visittask/confirmrereading":
- // }
- // else
- // {
- // //SPM
- // type = type + "/" + 2;
- // }
- // break;
- // }
+ // if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.APM)
+ // {
+ // type = type + "/" + 1;
- // if (sv.CheckChallengeState == CheckChanllengeTypeEnum.CRCWaitPMReply || sv.CheckChallengeState == CheckChanllengeTypeEnum.PMWaitCRCReply)
- // {
- // //发送对话 修改质疑状态 不需要区分接口
- // IsDistinctionInterface = false;
+ // }
+ // else
+ // {
+ // //SPM
+ // type = type + "/" + 2;
+ // }
+ // break;
+ // }
- // type = type + "/ModifyCheckChallengeState";
- // }
- // break;
+ // if (sv.CheckChallengeState == CheckChanllengeTypeEnum.CRCWaitPMReply || sv.CheckChallengeState == CheckChanllengeTypeEnum.PMWaitCRCReply)
+ // {
+ // //发送对话 修改质疑状态 不需要区分接口
+ // IsDistinctionInterface = false;
- //case nameof(NoneDicomStudy):
- // switch (_userInfo.RequestUrl.ToLower())
- // {
- // case "nonedicomstudy/addorupdatenonedicomstudy":
- // type = type + "/(" + _userInfo.UserTypeShortName + ")";
- // break;
- // }
- // break;
- #endregion
+ // type = type + "/ModifyCheckChallengeState";
+ // }
+ // break;
+ //case nameof(NoneDicomStudy):
+ // switch (_userInfo.RequestUrl.ToLower())
+ // {
+ // case "nonedicomstudy/addorupdatenonedicomstudy":
+ // type = type + "/(" + _userInfo.UserTypeShortName + ")";
+ // break;
+ // }
+ // break;
+ #endregion
- #region 阅片任务相关
- ////任务表
- //case nameof(VisitTask):
+ #region 阅片任务相关
- // 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";
- // }
- // //区分任务类型
- // type = type + "/" + (int)visitTask.ReadingCategory;
+ // if (type == AuditOpt.Add)
+ // {
+ // //生成一致性分析任务
+ // 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)
- // {
- // type = type + "/" + 1;
+ // //同意重阅
+ // case "VisitTask/ConfirmReReading":
- // }
- // else
- // {
- // type = type + "/" + 2;
- // }
+ // if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.APM)
+ // {
+ // type = type + "/" + 1;
- // break;
- // }
+ // }
+ // else
+ // {
+ // type = type + "/" + 2;
+ // }
- // }
+ // break;
+ // }
+ // }
- // #endregion
+ // #endregion
- // break;
- ////重阅记录表
- //case nameof(VisitTaskReReading):
+ // break;
- // var visitTaskReReading = entityObj as VisitTaskReReading;
+ ////重阅记录表
+ //case nameof(VisitTaskReReading):
- // switch (_userInfo.RequestUrl)
- // {
- // case "VisitTask/applyReReading":
- // type = type + "/" + (int)visitTaskReReading.RequestReReadingType;
- // break;
+ // var visitTaskReReading = entityObj as VisitTaskReReading;
- // 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)
- // {
- // type = type + "/" + 1;
+ // case "VisitTask/ConfirmReReading":
- // }
- // else
- // {
- // type = type + "/" + 2;
- // }
+ // if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.APM)
+ // {
+ // type = type + "/" + 1;
- // if (visitTaskReReading.RequestReReadingResultEnum == RequestReReadingResult.Agree)
- // {
- // type = type + "/" + 1;
+ // }
+ // else
+ // {
+ // type = type + "/" + 2;
+ // }
- // }
- // else if (visitTaskReReading.RequestReReadingResultEnum == RequestReReadingResult.Reject)
- // {
- // type = type + "/" + 2;
- // }
- // break;
- // }
+ // if (visitTaskReReading.RequestReReadingResultEnum == RequestReReadingResult.Agree)
+ // {
+ // type = type + "/" + 1;
- // break;
+ // }
+ // else if (visitTaskReReading.RequestReReadingResultEnum == RequestReReadingResult.Reject)
+ // {
+ // type = type + "/" + 2;
+ // }
+ // break;
+ // }
- ////一致性分析规则
- //case nameof(TaskConsistentRule):
+ // break;
- // var taskConsistentRule = entityObj as TaskConsistentRule;
+ ////一致性分析规则
+ //case nameof(TaskConsistentRule):
- // //自身一致性分析
- // if (taskConsistentRule.IsSelfAnalysis == true)
- // {
- // type = type + "/" + 1;
+ // var taskConsistentRule = entityObj as TaskConsistentRule;
- // }
- // //组件一致性分析
- // else
- // {
- // type = type + "/" + 2;
- // }
+ // //自身一致性分析
+ // if (taskConsistentRule.IsSelfAnalysis == true)
+ // {
+ // type = type + "/" + 1;
- // break;
- #endregion
+ // }
+ // //组件一致性分析
+ // else
+ // {
+ // type = type + "/" + 2;
+ // }
+ // break;
+ #endregion
- ////标准 器官病灶表
- //case nameof(CriterionNidus):
- // var criterionNidus = entityObj as CriterionNidus;
+ ////标准 器官病灶表
+ //case nameof(CriterionNidus):
- // if (criterionNidus.IsSystemCriterion == false)
- // {
- // type = type + "/IsTrial";
- // }
+ // var criterionNidus = entityObj as CriterionNidus;
- // break;
+ // if (criterionNidus.IsSystemCriterion == false)
+ // {
+ // type = type + "/IsTrial";
+ // }
- ////系统 项目公用
- //case nameof(ReadingCriterionDictionary):
+ // break;
- // var readingCriterionDictionary = entityObj as ReadingCriterionDictionary;
+ ////系统 项目公用
+ //case nameof(ReadingCriterionDictionary):
- // if (readingCriterionDictionary.IsSystemCriterion)
- // {
- // type = $"{type}/{readingCriterionDictionary.ParentCode}";
- // }
+ // var readingCriterionDictionary = entityObj as ReadingCriterionDictionary;
- // break;
+ // if (readingCriterionDictionary.IsSystemCriterion)
+ // {
+ // type = $"{type}/{readingCriterionDictionary.ParentCode}";
+ // }
+
+ // break;
//}
#endregion
-
+
}