diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index fda29c5ae..21496c38d 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -2316,6 +2316,534 @@
+
+
+ 获取阅片的计算数据
+
+
+
+
+
+
+ 获取Sod的值
+
+
+
+
+ 基线任务Id
+
+
+
+
+ 影像是否无法融合
+
+
+
+
+ 删除病灶获取起始病灶序号（RECIST1Point1 固定是1）
+
+
+
+
+
+ 获取阅片报告
+
+
+
+
+
+
+ 获取是否是最大suvmax 病灶
+
+
+
+
+
+
+ 获取是否可选择不能融合影像
+
+
+
+
+
+
+ 测试计算
+
+
+
+
+
+
+
+ 获取最低PDD信息
+
+
+
+
+
+
+ 计算任务
+
+
+
+
+
+
+ 获取报告验证的信息(这里每个标准可能不一样 返回用object)
+
+
+
+
+
+
+ 自动计算
+
+
+
+
+
+
+
+ 获取影像是否无法融合
+
+
+
+
+
+
+ 获取报告整体整体评估
+
+
+
+
+
+
+ 获取报告是否存在疾病
+
+
+
+
+
+
+ 验证访视提交
+
+
+
+
+
+
+ 计算融合靶病灶的状态
+
+
+
+
+
+
+ 计算分裂靶病灶状态
+
+
+
+
+
+
+ 获取分裂病灶的PPd之和 不包括当前的主病灶
+
+
+
+
+
+ 将上一次的访视病灶添加到这一次
+
+
+
+
+
+
+ 获取SOD
+
+
+ 靶病灶径线之和（SOD）
+ 非淋巴结的长径 和淋巴结的短径
+
+
+
+
+
+ 非淋巴结靶病灶长径之和
+
+
+
+
+
+
+ 与基线SOD相比变化量（mm）
+
+
+
+
+
+
+ 与基线访视相比SOD变化百分比
+
+
+
+
+
+
+ 与整个访视期间SOD最低点相比增加的值（mm）
+
+
+
+ 要更新之前的
+
+
+
+
+
+ 与整个访视期间SOD最低点相比增加的百分比
+
+
+
+ 要更新之前的
+
+
+
+
+
+ 整个访视期间SOD最低点访视名称
+
+
+
+ 要更新之前的
+
+
+
+
+
+ 是否存在非淋巴结靶病灶
+
+
+
+
+
+
+ 是否存在淋巴结靶病灶且该病灶比上一访视短径增加5MM以上
+
+
+
+
+
+
+ 获取存在淋巴结靶病灶且该病灶比上一访视短径增加5MM以上的病灶
+
+
+
+
+
+
+ 被评估为NE的单个靶病灶
+
+
+
+
+
+
+ 整体肿瘤评估
+
+
+
+
+
+
+ 是否存在疾病
+
+
+
+
+
+
+ 修改最低方式点名称
+
+
+
+
+
+
+ 修改所有访视任务的答案
+
+
+
+
+
+
+
+
+ 获取基线任务的Id
+
+
+
+
+
+
+ 获取基线SOD
+
+
+
+
+
+
+ 获取最低方式
+
+
+
+
+
+
+ 获取访视任务信息
+
+
+
+
+
+
+ 获取上一个访视任务Id
+
+
+
+
+
+ 获取SPD
+
+
+
+
+
+
+ 获取脾脏垂直径
+
+
+
+
+
+
+ 与基线相比SPD变化的百分比
+
+
+
+
+
+
+ 与基线相比脾肿大增加的百分比
+ [（当前垂直径-130）-（基线垂直径-130）]/（基线垂直径-130）
+
+
+
+
+
+
+ 与最低点相比脾脏垂直径长度的增加值
+
+
+
+
+
+
+ 脾肿垂直径最低点访视
+
+
+
+
+
+
+ 获取脾脏状态
+
+
+
+
+
+
+
+ 获取最低垂直径
+
+
+
+
+
+ 获取脾脏验证
+
+
+
+
+
+
+ 获取脾脏状态
+
+
+
+
+
+
+ 获取脾脏评估
+
+
+
+
+
+
+ 获取PET5PS评分
+
+
+
+
+
+
+ 获取PET5PS评分备注
+
+
+
+
+
+
+ 与基线相比摄取值变化
+
+
+
+
+
+
+ 获取上一次FDGPET 评估
+
+
+
+
+
+
+ FDG-PET总体评估结果
+
+
+
+
+
+
+ 计算FDG-PET总体评估结果【测试】
+
+ PET5PS评分
+ 与基线相比摄取值变化
+ 骨髓中是否存在局灶性 FDG亲和病灶的证据
+
+
+
+
+ 骨髓中是否存在局灶性 FDG亲和病灶的证据
+
+
+
+
+
+
+ 获取肝脏评估
+
+
+
+
+
+
+ SuvMax所在病灶
+
+
+
+
+
+
+ 最大sum
+
+
+
+
+
+
+ 是否存在PET
+
+
+
+
+
+
+ 影像学整体肿瘤评估
+
+
+
+
+
+
+ 计算整体肿瘤评估 【测试】
+
+ CT/MRI总体评估
+ FDG-PET总体评估
+ 上一次 FDG-PET总体评估
+
+
+
+
+ 获取基线脾脏长度
+
+
+
+
+
+
+ 与最低点相比脾脏垂直径长度的增加值
+
+
+
+
+
+
+ 获取靶病灶评估
+
+
+
+
+
+
+ 获取非靶病灶评估
+
+
+
+
+
+
+ 获取新病灶评估
+
+
+
+
+
+
+ CTMRI 总体评估
+
+
+
+
+
+
+ 计算CTMRI 总体评估 【测试】
+
+ 靶病灶评估
+ 非靶病灶评估
+ 存在新病灶
+ 肝脏评估
+ 脾脏评估
+
+
+
+
+ 保留小数
+
+
+
+
+
获取阅片的计算数据
@@ -6384,6 +6912,11 @@
是否申请重阅
+
+
+ 项目Id
+
+
项目Id
@@ -6419,6 +6952,11 @@
无效的 为True无效
+
+
+ 获取不加急的
+
+
医学审核对话关闭原因
@@ -8699,6 +9237,14 @@
+
+
+ 获取下一个IR医学反馈
+
+
+
+
+
获取IR医学审核信息
diff --git a/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs
index 8aa5e7e0c..eb64a391e 100644
--- a/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs
@@ -17,6 +17,9 @@ namespace IRaCIS.Core.Application.ViewModel
public DateTime UpdateTime { get; set; }
public Guid UpdateUserId { get; set; }
+
+ public string Version { get; set; }
+
}
///InternationalizationQuery 列表查询参数模型
@@ -30,6 +33,10 @@ namespace IRaCIS.Core.Application.ViewModel
public string? ValueCN { get; set; }
+ public string? Module { get; set; }
+ //关联版本历史记录表Id
+ public Guid? PublishLogId { get; set; }
+
}
/// InternationalizationAddOrEdit 列表查询参数模型
diff --git a/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs b/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs
index f3c18f9d3..5f0743d27 100644
--- a/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs
+++ b/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs
@@ -100,6 +100,8 @@ namespace IRaCIS.Core.Application.Service
var internationalizationQueryable = _internationalizationRepository
.WhereIf(inQuery.Description != null, t => t.Description.Contains(inQuery.Description))
+ .WhereIf(inQuery.Module != null, t => t.Description.Contains(inQuery.Module))
+ .WhereIf(inQuery.PublishLogId != null, t => t.PublishLogId==inQuery.PublishLogId)
.WhereIf(inQuery.Code != null, t => t.Code.Contains(inQuery.Code))
.WhereIf(inQuery.State != null, t => t.State == inQuery.State)
.WhereIf(inQuery.InternationalizationType != null, t => t.InternationalizationType == inQuery.InternationalizationType)
diff --git a/IRaCIS.Core.Application/Service/Common/PublishLogService.cs b/IRaCIS.Core.Application/Service/Common/PublishLogService.cs
index 213c0b90a..ca2eb25a0 100644
--- a/IRaCIS.Core.Application/Service/Common/PublishLogService.cs
+++ b/IRaCIS.Core.Application/Service/Common/PublishLogService.cs
@@ -60,9 +60,16 @@ namespace IRaCIS.Core.Application.Service
VerifyMsg = "发布编号不能重复"
};
+ var verifyExp2 = new EntityVerifyExp()
+ {
+ VerifyExp = u => u.IsCurrentVersion == addOrEditPublishLog.IsCurrentVersion,
+ VerifyMsg = "当前发布版本只允许有一个",
- var entity = await _publishLogRepository.InsertOrUpdateAsync(addOrEditPublishLog, true, verifyExp1);
+ IsVerify=addOrEditPublishLog.IsCurrentVersion==true
+ };
+
+ var entity = await _publishLogRepository.InsertOrUpdateAsync(addOrEditPublishLog, true, verifyExp1, verifyExp2);
return ResponseOutput.Ok(entity.Id.ToString());
@@ -93,7 +100,7 @@ namespace IRaCIS.Core.Application.Service
public async Task> GetPublishVersionSelect()
{
- return await _publishLogRepository.ProjectTo(_mapper.ConfigurationProvider).OrderByDescending(t => t.State).ToListAsync();
+ return await _publishLogRepository.ProjectTo(_mapper.ConfigurationProvider).OrderByDescending(t => t.Version).ToListAsync();
}
}
diff --git a/IRaCIS.Core.Application/Service/Common/_MapConfig.cs b/IRaCIS.Core.Application/Service/Common/_MapConfig.cs
index 743955f1a..7312de9f9 100644
--- a/IRaCIS.Core.Application/Service/Common/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Common/_MapConfig.cs
@@ -66,7 +66,8 @@ namespace IRaCIS.Core.Application.Service
CreateMap().ReverseMap();
- CreateMap();
+ CreateMap()
+ .ForMember(o => o.Version, t => t.MapFrom(u => u.PublishLog.Version));
CreateMap().ReverseMap();
CreateMap().ReverseMap();
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
index 2159ae68e..ae62d3db5 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
@@ -880,7 +880,7 @@ namespace IRaCIS.Core.Application
// 前序 不存在 未一致性核查未通过的
.Where(t => !t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum > sv.VisitNum))
//前序 不存在 未生成任务的访视
- .Where(t => c.IsAutoCreate ? !t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(d => d.TrialReadingCriterionId == t.TrialReadingCriterionId).Any(f => f.IsGeneratedTask == false && t.VisitTaskNum > f.SubjectVisit.VisitNum) : true)
+ .Where(t => c.IsAutoCreate == false ? !t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(d => d.TrialReadingCriterionId == t.TrialReadingCriterionId).Any(f => f.IsGeneratedTask == false && t.VisitTaskNum > f.SubjectVisit.VisitNum) : true)
.Where(y => y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true))
.Count(t => t.IsUrgent),
@@ -891,7 +891,7 @@ namespace IRaCIS.Core.Application
.Where(t => !t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum > sv.VisitNum))
//前序 不存在 未生成任务的访视
//.WhereIf(g.Key.IsAutoCreate == false, t => !t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(d => d.TrialReadingCriterionId == t.TrialReadingCriterionId).Any(f => f.IsGeneratedTask == false && t.VisitTaskNum > f.SubjectVisit.VisitNum))
- .Where(t => c.IsAutoCreate ? !t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(d => d.TrialReadingCriterionId == t.TrialReadingCriterionId).Any(f => f.IsGeneratedTask == false && t.VisitTaskNum > f.SubjectVisit.VisitNum) : true)
+ .Where(t => c.IsAutoCreate==false ? !t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(d => d.TrialReadingCriterionId == t.TrialReadingCriterionId).Any(f => f.IsGeneratedTask == false && t.VisitTaskNum > f.SubjectVisit.VisitNum) : true)
.Where(y => y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true))
.Count(),
diff --git a/IRaCIS.Core.Domain/Common/Internationalization.cs b/IRaCIS.Core.Domain/Common/Internationalization.cs
index 6d7a9e864..0da0a2f35 100644
--- a/IRaCIS.Core.Domain/Common/Internationalization.cs
+++ b/IRaCIS.Core.Domain/Common/Internationalization.cs
@@ -50,6 +50,9 @@ namespace IRaCIS.Core.Domain.Models
//关联版本历史记录表Id
public Guid? PublishLogId { get; set; }
+ [JsonIgnore]
+ public PublishLog PublishLog { get; set; }
+
}
diff --git a/IRaCIS.Core.Domain/Common/PublishLog.cs b/IRaCIS.Core.Domain/Common/PublishLog.cs
index 0a58ed3a3..a93c7f9a5 100644
--- a/IRaCIS.Core.Domain/Common/PublishLog.cs
+++ b/IRaCIS.Core.Domain/Common/PublishLog.cs
@@ -21,8 +21,6 @@ namespace IRaCIS.Core.Domain.Models
[Required]
public string Version { get; set; }
-
- [Required]
public DateTime? PublishTime { get; set; }