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

Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
hang
2024-10-30 16:06:05 +08:00
parent c0de59b3aa 4e29d4094e
commit d22ef17e91
11 changed files with 18379 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+70
View File
@@ -9272,6 +9272,16 @@
分类问题类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.ClassifyEditType">
<summary>
分类编辑类型 是否可编辑
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.ClassifyShowType">
<summary>
分类显示类型 是否显示
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionTrialAddOrEdit.CustomCalculateMark">
<summary>
自定义计算标记
@@ -9390,6 +9400,16 @@
分类问题类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionSystemAddOrEdit.ClassifyEditType">
<summary>
分类编辑类型 是否可编辑
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionSystemAddOrEdit.ClassifyShowType">
<summary>
分类显示类型 是否显示
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionSystemAddOrEdit.QuestionClassify">
<summary>
问题分类
@@ -9823,6 +9843,16 @@
分类问题类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.ClassifyEditType">
<summary>
分类编辑类型 是否可编辑
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.ClassifyShowType">
<summary>
分类显示类型 是否显示
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ExportIdentification">
<summary>
导出标识
@@ -9833,6 +9863,16 @@
分类问题类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ClassifyEditType">
<summary>
分类编辑类型 是否可编辑
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ClassifyShowType">
<summary>
分类显示类型 是否显示
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.ClassifyAlgorithms">
<summary>
分类算法
@@ -10118,6 +10158,16 @@
是否是裁判问题
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetCalculateTableQuestionsOutDto.ClassifyEditType">
<summary>
分类编辑类型 是否可编辑
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetCalculateTableQuestionsOutDto.ClassifyShowType">
<summary>
分类显示类型 是否显示
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialGroupNameListInDto.CriterionId">
<summary>
标准ID
@@ -10213,6 +10263,16 @@
分类问题类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.ClassifyEditType">
<summary>
分类编辑类型 是否可编辑
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.ClassifyShowType">
<summary>
分类显示类型 是否显示
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.ExportIdentification">
<summary>
导出标识
@@ -10433,6 +10493,16 @@
分类问题类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.ClassifyEditType">
<summary>
分类编辑类型 是否可编辑
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.ClassifyShowType">
<summary>
分类显示类型 是否显示
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.ExportIdentification">
<summary>
导出标识
IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+70
View File
@@ -327,6 +327,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public ClassifyType? ClassifyType { get; set; }
/// <summary>
/// 分类编辑类型 是否可编辑
/// </summary>
public ClassifyEditType? ClassifyEditType { get; set; }
/// <summary>
/// 分类显示类型 是否显示
/// </summary>
public ClassifyShowType? ClassifyShowType { get; set; }
public string ClassifyAlgorithms { get; set; } = string.Empty;
@@ -496,6 +506,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public ClassifyType? ClassifyType { get; set; }
/// <summary>
/// 分类编辑类型 是否可编辑
/// </summary>
public ClassifyEditType? ClassifyEditType { get; set; }
/// <summary>
/// 分类显示类型 是否显示
/// </summary>
public ClassifyShowType? ClassifyShowType { get; set; }
public string ClassifyAlgorithms { get; set; } = string.Empty;
/// <summary>
@@ -1167,6 +1187,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 分类问题类型
/// </summary>
public ClassifyType? ClassifyType { get; set; }
/// <summary>
/// 分类编辑类型 是否可编辑
/// </summary>
public ClassifyEditType? ClassifyEditType { get; set; }
/// <summary>
/// 分类显示类型 是否显示
/// </summary>
public ClassifyShowType? ClassifyShowType { get; set; }
public List<string> ParentTriggerValueList { get; set; } = new List<string>();
public List<string> RelevanceValueList { get; set; } = new List<string>();
public List<CalculateInfo> CalculateQuestionList { get; set; }
@@ -1187,6 +1217,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public ClassifyType? ClassifyType { get; set; }
/// <summary>
/// 分类编辑类型 是否可编辑
/// </summary>
public ClassifyEditType? ClassifyEditType { get; set; }
/// <summary>
/// 分类显示类型 是否显示
/// </summary>
public ClassifyShowType? ClassifyShowType { get; set; }
/// <summary>
/// 分类算法
/// </summary>
@@ -1730,6 +1770,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
[Comment("分类类型")]
public ClassifyType? ClassifyType { get; set; }
/// <summary>
/// 分类编辑类型 是否可编辑
/// </summary>
public ClassifyEditType? ClassifyEditType { get; set; }
/// <summary>
/// 分类显示类型 是否显示
/// </summary>
public ClassifyShowType? ClassifyShowType { get; set; }
[Comment("分类算法")]
public string ClassifyAlgorithms { get; set; } = string.Empty;
@@ -1946,6 +1996,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public ClassifyType? ClassifyType { get; set; }
/// <summary>
/// 分类编辑类型 是否可编辑
/// </summary>
public ClassifyEditType? ClassifyEditType { get; set; }
/// <summary>
/// 分类显示类型 是否显示
/// </summary>
public ClassifyShowType? ClassifyShowType { get; set; }
/// <summary>
/// 导出标识
/// </summary>
@@ -2192,6 +2252,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public ClassifyType? ClassifyType { get; set; }
/// <summary>
/// 分类编辑类型 是否可编辑
/// </summary>
public ClassifyEditType? ClassifyEditType { get; set; }
/// <summary>
/// 分类显示类型 是否显示
/// </summary>
public ClassifyShowType? ClassifyShowType { get; set; }
/// <summary>
/// 导出标识
/// </summary>
IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs
+8 -1
View File
@@ -49,6 +49,13 @@ namespace IRaCIS.Core.Application.Service
&& x.TaskState == TaskState.Effect).OrderByDescending(x => x.VisitTaskNum).Select(x => x.VisitTaskNum).FirstOrDefaultAsync();
decimal thisVisitNum = 0;
var readModule = await _readModuleRepository.Where(x => x.Id == inDto.Id).Include(x=>x.SubjectVisit).FirstOrDefaultAsync();
if(readModule!=null)
{
thisVisitNum = readModule.SubjectVisit.VisitNum;
}
var visitQuery = _subjectVisitRepository.Where(x => x.SubjectId == inDto.SubjectId && x.LatestScanDate != null && !x.IsLostVisit);
var finalVisitNum = await visitQuery.Where(x => x.IsFinalVisit).Select(x => x.VisitNum).FirstOrDefaultAsync();
@@ -56,7 +63,7 @@ namespace IRaCIS.Core.Application.Service
var readModulequery = _readModuleRepository.AsQueryable().Where(x => x.TrialReadingCriterionId == inDto.TrialReadingCriterionId);
var resultlist = await visitQuery.WhereIf(finalVisitNum != null && finalVisitNum != 0, x => x.VisitNum <= finalVisitNum)
.Where(x => x.VisitNum > mixReadVisitNum)
.Where(x => x.VisitNum > mixReadVisitNum|| x.VisitNum==thisVisitNum)
.Where(x => !x.IsBaseLine) // 排除基线
.WhereIf(inDto.ReadingSetType == ReadingSetType.TumorReading, x => readModulequery.Where(y => y.SubjectVisitId == x.Id && y.TrialReadingCriterionId == inDto.TrialReadingCriterionId && y.ReadingSetType == ReadingSetType.ImageReading).Count() > 0)
.WhereIf(inDto.ReadingSetType == ReadingSetType.ImageReading, x => readModulequery.Where(y => y.Id != inDto.Id && y.SubjectVisitId == x.Id && y.TrialReadingCriterionId == inDto.TrialReadingCriterionId && y.ReadingSetType == ReadingSetType.ImageReading).Count() == 0)