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

修改一版

Uat_Study
he 2022-10-20 16:26:42 +08:00
parent 2d09331903
commit fe046d8842
7 changed files with 87 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2965,6 +2965,16 @@
评估结果
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.JudgeQuestionAnswerInfo.DictionaryCode">
<summary>
字典code
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.JudgeQuestionAnswerInfo.QuestionGenre">
<summary>
问题类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingPeriodSetAddOrEdit.TrialId">
<summary>
项目ID
@ -3265,6 +3275,16 @@
整体疗效
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetAssessTypeOutDto.IsBaseLineUse">
<summary>
IsBaseUse
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetAssessTypeOutDto.IsFollowVisitUse">
<summary>
IsBaseUse
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingTableQuestionSystemQuery.TableQuestionType">
<summary>
表格问题类型
@ -4521,6 +4541,20 @@
<param name="Id"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.RC.ReadingQuestionService.SetDictionaryFollowVisitUse(IRaCIS.Core.Application.Service.Reading.Dto.SetDictionaryFollowVisitUseInDto)">
<summary>
修改是否是随访使用
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.RC.ReadingQuestionService.SetDictionaryBaseLineUse(IRaCIS.Core.Application.Service.Reading.Dto.SetDictionaryBaseLineUseInDto)">
<summary>
修改是否是基线使用
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.RC.ReadingQuestionService.GetAssessType(IRaCIS.Core.Application.Service.Reading.Dto.GetAssessTypeInDto)">
<summary>
获取标准字典
@ -7242,7 +7276,7 @@
<param name="searchKey"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Application.Services.DictionaryService.GetBasicDataAllSelect">
<member name="M:IRaCIS.Application.Services.DictionaryService.GetBasicDataAllSelect(IRaCIS.Application.Contracts.GetBasicDataAllSelectInDto)">
<summary>
获取所有下拉框 枚举 bool 数据
</summary>

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

@ -56,6 +56,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public QuestionType? QuestionType { get; set; }
/// <summary>
/// 病灶类型
/// </summary>
public LesionType? LesionType { get; set; }
public string GroupName { get; set; }
public string QuestionName { get; set; }

11
IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs
View File

@ -582,6 +582,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string Answer { get; set; }
/// <summary>
/// 字典code
/// </summary>
public string DictionaryCode { get; set; } = string.Empty;
/// <summary>
/// 问题类型
/// </summary>
public TableQuestionType? QuestionGenre { get; set; }
}
}

11
IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs
View File

@ -115,12 +115,15 @@ namespace IRaCIS.Core.Application.Service
{
Answer=y.Answer,
QuestionName=y.ReadingQuestionTrial.QuestionName,
DictionaryCode=y.ReadingQuestionTrial.DictionaryCode,
QuestionGenre=y.ReadingQuestionTrial.QuestionGenre,
}).ToList() : x.ReadingTaskQuestionAnswerList.Where(y => y.ReadingQuestionTrial.IsJudgeQuestion).Select(y => new JudgeQuestionAnswerInfo()
{
Answer = y.Answer,
QuestionName = y.ReadingQuestionTrial.QuestionName,
DictionaryCode = y.ReadingQuestionTrial.DictionaryCode,
QuestionGenre = y.ReadingQuestionTrial.QuestionGenre,
}).ToList()
}).ToListAsync();
@ -161,12 +164,14 @@ namespace IRaCIS.Core.Application.Service
{
Answer = y.Answer,
QuestionName = y.ReadingQuestionTrial.QuestionName,
DictionaryCode = y.ReadingQuestionTrial.DictionaryCode,
QuestionGenre = y.ReadingQuestionTrial.QuestionGenre,
}).ToList() : x.ReadingTaskQuestionAnswerList.Where(y => y.ReadingQuestionTrial.IsJudgeQuestion).Select(y => new JudgeQuestionAnswerInfo()
{
Answer = y.Answer,
QuestionName = y.ReadingQuestionTrial.QuestionName,
DictionaryCode = y.ReadingQuestionTrial.DictionaryCode,
QuestionGenre = y.ReadingQuestionTrial.QuestionGenre,
}).ToList()
}).ToListAsync();

6
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
View File

@ -92,7 +92,6 @@ namespace IRaCIS.Application.Services
{
GlobalTaskId = inDto.VisitTaskId,
ReadingTaskState = taskInfo.ReadingTaskState,
GlobalUpdateType = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == taskInfo.TrialReadingCriterionId).Select(x => x.GlobalUpdateType).FirstOrDefaultAsync(),
};
@ -201,10 +200,13 @@ namespace IRaCIS.Application.Services
});
var subjectVisitId = await _readModuleRepository.Where(x => x.Id == taskInfo.SouceReadModuleId).Select(x => x.SubjectVisitId).FirstOrDefaultAsync();
var isBaseLine = await _subjectVisitRepository.Where(x => x.Id == subjectVisitId).Select(x => x.IsBaseLine).FirstOrDefaultAsync();
List<GetAssessTypeOutDto> assessTypeList = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == taskInfo.TrialReadingCriterionId
&& x.ParentCode == ReadingCommon.GlobalAssess
)
.WhereIf(isBaseLine,x=>x.IsBaseLineUse)
.WhereIf(!isBaseLine,x=>x.IsFollowVisitUse)
.Select(x => new GetAssessTypeOutDto()
{
Id = x.Id,

9
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
View File

@ -387,7 +387,8 @@ namespace IRaCIS.Application.Services
IsShowInDicom = x.IsShowInDicom,
Type = x.Type,
QuestionType=x.QuestionType,
QuestionGenre=x.QuestionGenre,
LesionType=x.LesionType,
QuestionGenre =x.QuestionGenre,
DictionaryCode =x.DictionaryCode,
TypeValue = x.TypeValue,
QuestionName = x.QuestionName,
@ -406,7 +407,7 @@ namespace IRaCIS.Application.Services
QuestionId = x.Id,
IsShowInDicom = x.IsShowInDicom,
QuestionName = x.QuestionName,
LesionType = x.LesionType,
QuestionGenre = x.QuestionGenre,
DictionaryCode = x.DictionaryCode,
Type = x.Type,
@ -445,7 +446,8 @@ namespace IRaCIS.Application.Services
QuestionName = question.OrderMark + x.RowIndex.GetLesionMark(),
SplitOrMergeLesionName = x.MergeName.IsNullOrEmpty() ? x.SplitName : x.MergeName,
SplitOrMergeType = x.SplitOrMergeType,
IsCanEditPosition=x.IsCanEditPosition,
LesionType = question.LesionType,
IsCanEditPosition =x.IsCanEditPosition,
RowIndex =x.RowIndex,
}).ToList();
@ -459,6 +461,7 @@ namespace IRaCIS.Application.Services
QuestionId = x.ReadingQuestionId,
TableQuestionId = x.Id,
Type = x.Type,
LesionType = x.ReadingQuestionTrial.LesionType,
TableQuestionType = x.TableQuestionType,
DictionaryCode = x.DictionaryCode,
QuestionMark = x.QuestionMark,

40
IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
View File

@ -187,18 +187,16 @@ namespace IRaCIS.Core.Application
var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstNotNullAsync();
if ((!await _readingCriterionDictionaryRepository.AnyAsync(x => x.CriterionId == trialCriterion.Id && x.ParentCode == ReadingCommon.GlobalAssess)) && trialCriterion.ReadingQuestionCriterionSystemId != null)
if (trialCriterion.ReadingQuestionCriterionSystemId != null)
{
await _readingCriterionDictionaryRepository.BatchDeleteNoTrackingAsync(x => x.CriterionId == trialCriterion.Id && x.ParentCode == ReadingCommon.GlobalAssess);
var criterionDictionaryList = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == trialCriterion.ReadingQuestionCriterionSystemId.Value && x.ParentCode == ReadingCommon.GlobalAssess).
Select(x => new ReadingCriterionDictionary()
{
CriterionId = trialCriterion.Id,
DictionaryId = x.DictionaryId,
IsSystemCriterion = false,
ParentCode = x.ParentCode,
}).ToListAsync();
await _readingCriterionDictionaryRepository.BatchDeleteNoTrackingAsync(x => x.CriterionId == trialCriterion.Id);
var criterionDictionaryList = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == trialCriterion.ReadingQuestionCriterionSystemId.Value)
.ToListAsync();
criterionDictionaryList.ForEach(x => {
x.Dictionary = null;
x.IsSystemCriterion = false;
x.CriterionId = inDto.TrialReadingCriterionId;
});
await _readingCriterionDictionaryRepository.AddRangeAsync(criterionDictionaryList);
await _readingCriterionDictionaryRepository.SaveChangesAsync();
@ -224,18 +222,16 @@ namespace IRaCIS.Core.Application
var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstNotNullAsync();
if ((!await _readingCriterionDictionaryRepository.AnyAsync(x => x.CriterionId == trialCriterion.Id && x.ParentCode == ReadingCommon.OncologyAssess)) && trialCriterion.ReadingQuestionCriterionSystemId != null)
if (trialCriterion.ReadingQuestionCriterionSystemId != null)
{
await _readingCriterionDictionaryRepository.BatchDeleteNoTrackingAsync(x => x.CriterionId == trialCriterion.Id && x.ParentCode == ReadingCommon.OncologyAssess);
var criterionDictionaryList = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == trialCriterion.ReadingQuestionCriterionSystemId.Value && x.ParentCode == ReadingCommon.OncologyAssess).
Select(x => new ReadingCriterionDictionary()
{
CriterionId = trialCriterion.Id,
DictionaryId = x.DictionaryId,
IsSystemCriterion = false,
ParentCode = x.ParentCode,
}).ToListAsync();
await _readingCriterionDictionaryRepository.BatchDeleteNoTrackingAsync(x => x.CriterionId == trialCriterion.Id);
var criterionDictionaryList = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == trialCriterion.ReadingQuestionCriterionSystemId.Value)
.ToListAsync();
criterionDictionaryList.ForEach(x => {
x.Dictionary = null;
x.IsSystemCriterion = false;
x.CriterionId = inDto.TrialReadingCriterionId;
});
await _readingCriterionDictionaryRepository.AddRangeAsync(criterionDictionaryList);
await _readingCriterionDictionaryRepository.SaveChangesAsync();