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

修改

IRC_NewDev
he 2024-03-06 17:11:09 +08:00
parent f88ef2f3fc
commit d8f0fba8e2
3 changed files with 105 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -154,12 +154,11 @@
<param name="inQuery"></param> <param name="inQuery"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.ConfirmGenerateSelfConsistentTask(IRaCIS.Core.Application.ViewModel.ConsistentConfirmGenerateCommand,IRaCIS.Core.Application.Service.IVisitTaskHelpeService)"> <member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.ConfirmGenerateSelfConsistentTask(IRaCIS.Core.Application.ViewModel.ConsistentConfirmGenerateCommand)">
<summary> <summary>
确认生成自身一致性分析任务 确认生成自身一致性分析任务
</summary> </summary>
<param name="inCommand"></param> <param name="inCommand"></param>
<param name="_visitTaskCommonService"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.GetGroupConsistentRuleSubjectList(IRaCIS.Core.Application.ViewModel.GroupConsistentQuery)"> <member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.GetGroupConsistentRuleSubjectList(IRaCIS.Core.Application.ViewModel.GroupConsistentQuery)">
@ -169,12 +168,11 @@
<param name="inQuery"></param> <param name="inQuery"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.ConfirmGenerateGroupConsistentTask(IRaCIS.Core.Application.ViewModel.GroupConsistentConfirmGenrateCommand,IRaCIS.Core.Application.Service.IVisitTaskHelpeService)"> <member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.ConfirmGenerateGroupConsistentTask(IRaCIS.Core.Application.ViewModel.GroupConsistentConfirmGenrateCommand)">
<summary> <summary>
确认生成组间一致性分析任务 确认生成组间一致性分析任务
</summary> </summary>
<param name="inCommand"></param> <param name="inCommand"></param>
<param name="_visitTaskCommonService"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.GetIQueryableDoctorSelfConsistentSubjectView(IRaCIS.Core.Domain.Models.TaskConsistentRule,System.Guid,System.Collections.Generic.List{System.Guid})"> <member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.GetIQueryableDoctorSelfConsistentSubjectView(IRaCIS.Core.Domain.Models.TaskConsistentRule,System.Guid,System.Collections.Generic.List{System.Guid})">
@ -186,6 +184,14 @@
<param name="subejctIdList"></param> <param name="subejctIdList"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.GetGroupConsistentQueryAsync(IRaCIS.Core.Domain.Models.TaskConsistentRule,System.Collections.Generic.List{System.Guid})">
<summary>
组间一致性分析 满足条件的subject 筛选
</summary>
<param name="filterObj"></param>
<param name="subejctIdList"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.GetSelfConsistentDoctorStatList(IRaCIS.Core.Application.ViewModel.TaskConsistentRuleQuery)"> <member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.GetSelfConsistentDoctorStatList(IRaCIS.Core.Application.ViewModel.TaskConsistentRuleQuery)">
<summary> <summary>
自身一致性分配 配置+ 统计已经生成数量统计表 自身一致性分配 配置+ 统计已经生成数量统计表
@ -193,6 +199,28 @@
<param name="inQuery"></param> <param name="inQuery"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.GetSelfConsistentRuleMatchSubjectIdListAsync(IRaCIS.Core.Application.ViewModel.SelfConsistentSimpleQuery)">
<summary>
获取自身一致性分析 符合条件的subject 数组
</summary>
<param name="inQuery"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.GetGroupConsistentRuleMatchSubjectIdListAsync(IRaCIS.Core.Application.ViewModel.GroupConsistentSimpleQuery)">
<summary>
获取组件一致性分析符合条件的subject 数组
</summary>
<param name="inQuery"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.TaskConsistentRuleService.GetRandomSubjectIdList(System.Collections.Generic.List{System.Guid},System.Int32)">
<summary>
随机算法，选择指定数量的 subject
</summary>
<param name="matchSubjectIdList"></param>
<param name="countToSelect"></param>
<returns></returns>
</member>
<member name="T:IRaCIS.Core.Application.Service.TaskMedicalReviewRuleService"> <member name="T:IRaCIS.Core.Application.Service.TaskMedicalReviewRuleService">
<summary> <summary>
医学审核生成规则 废弃 医学审核生成规则 废弃
@ -5006,6 +5034,11 @@
问题分类 问题分类
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.CreateTime">
<summary>
CreateTime
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.QuestionId"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.QuestionId">
<summary> <summary>
第一层的Question 第一层的Question
@ -5076,11 +5109,6 @@
MeasureData MeasureData
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.CreateTime">
<summary>
CreateTime
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.IsCurrentTaskAdd"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.IsCurrentTaskAdd">
<summary> <summary>
是否是当前任务添加 是否是当前任务添加
@ -5116,6 +5144,21 @@
来自于哪个标记 来自于哪个标记
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.OtherInstanceId">
<summary>
InstanceId
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.OtherSeriesId">
<summary>
SeriesId
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableAnswerRowInfoBase.OtherStudyId">
<summary>
StudyId
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.CopyTableAnswerDto.QuestionMark"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.CopyTableAnswerDto.QuestionMark">
<summary> <summary>
问题标识 问题标识

42
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
View File

@ -615,6 +615,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
{ {
public Guid Id { get; set; } public Guid Id { get; set; }
/// <summary>
/// CreateTime
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary> /// <summary>
/// 第一层的Question /// 第一层的Question
/// </summary> /// </summary>
@ -690,11 +696,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public string MeasureData { get; set; } = string.Empty; public string MeasureData { get; set; } = string.Empty;
/// <summary>
/// CreateTime
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary> /// <summary>
/// 是否是当前任务添加 /// 是否是当前任务添加
/// </summary> /// </summary>
@ -760,6 +761,37 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string ReportMark { get; set; } = string.Empty; public string ReportMark { get; set; } = string.Empty;
public string RowMark { get; set; } = string.Empty; public string RowMark { get; set; } = string.Empty;
/// <summary>
/// InstanceId
/// </summary>
public Guid? OtherInstanceId { get; set; }
/// <summary>
/// SeriesId
/// </summary>
public Guid? OtherSeriesId { get; set; }
/// <summary>
/// StudyId
/// </summary>
public Guid? OtherStudyId { get; set; }
public string? OtherMarkTool { get; set; }
public string? OtherPicturePath { get; set; }
public int? OtherNumberOfFrames { get; set; }
public string? OtherMeasureData { get; set; } = string.Empty;
} }
public class CopyTableAnswerRowInfo : ReadingTableAnswerRowInfoBase public class CopyTableAnswerRowInfo : ReadingTableAnswerRowInfoBase

8
IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
View File

@ -1200,7 +1200,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
TrialId = x.TrialId TrialId = x.TrialId
}).ToListAsync(); }).ToListAsync();
var tableRowAnswers = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == LastVisitTaskId).ProjectTo<CopyTableAnswerRowInfo>(_mapper.ConfigurationProvider).ToListAsync(); var tableRowAnswers = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == LastVisitTaskId).OrderBy(x=>x.RowIndex).ProjectTo<CopyTableAnswerRowInfo>(_mapper.ConfigurationProvider).ToListAsync();
tableRowAnswers.ForEach(x => tableRowAnswers.ForEach(x =>
@ -1233,8 +1233,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
tableRowAnswers.ForEach(x => tableRowAnswers.ForEach(x =>
{ {
x.SplitRowId = tableRowAnswers.Where(y => y.OriginalId == x.SplitRowId).Select(y => y.Id).FirstOrDefault(); x.SplitRowId = tableRowAnswers.Where(y => y.OriginalId == x.SplitRowId).FirstOrDefault()?.Id;
x.MergeRowId = tableRowAnswers.Where(y => y.OriginalId == x.MergeRowId).Select(y => y.Id).FirstOrDefault(); x.MergeRowId = tableRowAnswers.Where(y => y.OriginalId == x.MergeRowId).FirstOrDefault()?.Id;
}); });
@ -1331,6 +1331,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
questionMarkList.ForEach(x => { questionMarkList.ForEach(x => {
x.Id = NewId.NextGuid(); x.Id = NewId.NextGuid();
}); });
var addList = _mapper.Map<List<ReadingTableAnswerRowInfo>>(tableRowAnswers); var addList = _mapper.Map<List<ReadingTableAnswerRowInfo>>(tableRowAnswers);
await _readingTaskQuestionMarkRepository.AddRangeAsync(questionMarkList); await _readingTaskQuestionMarkRepository.AddRangeAsync(questionMarkList);