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

修改
continuous-integration/drone/push Build is passing Details

IRC_NewDev
he 2024-11-07 10:19:25 +08:00
parent 5b3beea8fa
commit b89cfeb90c
3 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2436,6 +2436,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public string Type { get; set; } public string Type { get; set; }
public ValueUnit? Unit { get; set; }
/// <summary> /// <summary>
/// ParentId /// ParentId
/// </summary> /// </summary>
@ -2566,6 +2568,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public Guid ReadingQuestionCriterionSystemId { get; set; } public Guid ReadingQuestionCriterionSystemId { get; set; }
public ValueUnit? Unit { get; set; }
/// <summary> /// <summary>
/// 问题类型 /// 问题类型

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

@ -1,4 +1,5 @@
using IRaCIS.Core.Application.Contracts; using DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments;
using IRaCIS.Core.Application.Contracts;
using IRaCIS.Core.Application.Filter; using IRaCIS.Core.Application.Filter;
using IRaCIS.Core.Application.Helper; using IRaCIS.Core.Application.Helper;
using IRaCIS.Core.Application.Interfaces; using IRaCIS.Core.Application.Interfaces;
@ -14,6 +15,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using NPOI.POIFS.Properties;
using NPOI.SS.Formula.Functions; using NPOI.SS.Formula.Functions;
using Panda.DynamicWebApi.Attributes; using Panda.DynamicWebApi.Attributes;
using ZiggyCreatures.Caching.Fusion; using ZiggyCreatures.Caching.Fusion;
@ -1308,38 +1310,19 @@ namespace IRaCIS.Core.Application.Service
item.TableQuestions = new TrialReadTableQuestion(); item.TableQuestions = new TrialReadTableQuestion();
item.TableQuestions.Questions = tableQuestionLists.Where(x => x.ReadingQuestionId == item.Id).OrderBy(x => x.ShowOrder).ToList(); item.TableQuestions.Questions = tableQuestionLists.Where(x => x.ReadingQuestionId == item.Id).OrderBy(x => x.ShowOrder).ToList();
item.TableQuestions.Questions.ForEach(x => item.TableQuestions.Questions.ForEach(x =>
{ {
x.RelationQuestions= _mapper.Map<List<GetTrialReadingQuestionOutDto>>(tableQuestionLists.Where(z => (z.DependParentId ?? default(Guid)) == x.Id));
x.RelationQuestions = tableQuestionLists.Where(z => (z.DependParentId ?? default(Guid)) == x.Id).Select(x => new GetTrialReadingQuestionOutDto x.RelationQuestions.ForEach(y =>
{ {
Childrens = new List<GetTrialReadingQuestionOutDto>(), y.Childrens = new List<GetTrialReadingQuestionOutDto>();
ShowOrder = x.ShowOrder, y.GroupName = string.Empty;
GroupName = string.Empty, y.ImageCount = 0;
Id = x.Id, y.ParentId = item.Id;
DictionaryCode = x.DictionaryCode, y.LesionType = item.LesionType;
Type = x.Type, y.RelationQuestions = new List<GetTrialReadingQuestionOutDto>();
TableQuestionType = x.TableQuestionType, });
DependParentId = x.DependParentId,
IsDepend = x.IsDepend,
QuestionMark = x.QuestionMark,
TypeValue = x.TypeValue,
RelevanceId = x.RelevanceId,
RelevanceValue = x.RelevanceValue,
ImageCount = 0,
ParentId = item.Id,
DataTableColumn = x.DataTableColumn,
LesionType = item.LesionType,
QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
RelationQuestions = new List<GetTrialReadingQuestionOutDto>(),
Remark = x.Remark,
ValueType = x.ValueType,
Unit = x.Unit,
ClassifyAlgorithms=x.ClassifyAlgorithms,
IsCopy=x.IsCopy,
ClassifyTableQuestionId=x.ClassifyTableQuestionId,
}).ToList();
}); });
var thisAnswer = tableAnswers.Where(x => x.QuestionId == item.Id).ToList(); var thisAnswer = tableAnswers.Where(x => x.QuestionId == item.Id).ToList();

3
IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
View File

@ -353,6 +353,9 @@ namespace IRaCIS.Core.Application.Service
.ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName)) .ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName))
.ForMember(x => x.Id, y => y.MapFrom(z => z.Id)); .ForMember(x => x.Id, y => y.MapFrom(z => z.Id));
CreateMap<TableQuestionTrial, GetTrialReadingQuestionOutDto>();
//CreateMap<VisitTask, GetReadingPastResultListOutDto>() //CreateMap<VisitTask, GetReadingPastResultListOutDto>()
// .ForMember(x => x.VisitTaskId, y => y.MapFrom(z => z.Id)) // .ForMember(x => x.VisitTaskId, y => y.MapFrom(z => z.Id))
// .ForMember(x => x.JudgeResultArm, y => y.MapFrom(z => (z.JudgeResultTask==null?null:z.JudgeResultTask.ArmEnum))); // .ForMember(x => x.JudgeResultArm, y => y.MapFrom(z => (z.JudgeResultTask==null?null:z.JudgeResultTask.ArmEnum)));