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

Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

Uat_Study
he 2023-03-24 14:27:12 +08:00
parent 3f3a9093b2 638de8c386
commit c9f7a2b3f7
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
View File

@ -65,6 +65,8 @@ namespace IRaCIS.Core.Application.ViewModel
public string TrialReadingCriterionName { get; set; }
public bool IsAutoCreate { get; set; }
public bool IsNeedClinicalDataSign { get; set; }

2
IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs
View File

@ -111,6 +111,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<VisitTask, VisitTaskViewBasic>()
.ForMember(o => o.IsAutoCreate, t => t.MapFrom(u => u.TrialReadingCriterion.IsAutoCreate))
.ForMember(o => o.TrialReadingCriterionName, t => t.MapFrom(u => u.TrialReadingCriterion.CriterionName))
.ForMember(o => o.ReadingTool, t => t.MapFrom(u => u.TrialReadingCriterion.ReadingTool))
.ForMember(o => o.IsReadingTaskViewInOrder, t => t.MapFrom(u => u.TrialReadingCriterion.IsReadingTaskViewInOrder))
@ -208,6 +209,7 @@ namespace IRaCIS.Core.Application.Service
.ForMember(o => o.FullName, t => t.MapFrom(u => u.FullName));
CreateMap<TaskMedicalReview, TaskMedicalReviewView>().IncludeMembers(t => t.VisitTask)
.ForMember(o => o.IsAutoCreate, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.IsAutoCreate))
.ForMember(o => o.TrialReadingCriterionId, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.Id))
.ForMember(o => o.TrialReadingCriterionName, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.CriterionName))
.ForMember(o => o.ReadingTool, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.ReadingTool))

8
IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/DTO/SubjectCriteriaEvaluationViewModel.cs
View File

@ -25,17 +25,17 @@ namespace IRaCIS.Core.Application.ViewModel
public bool? IsImageFiltering { get; set; }
public bool? IsJoinEvaluation { get; set; }
public bool? IsJoinEvaluation { get; set; }
public string SubjectCode { get; set; }
public string TrialSiteCode { get; set; }
public SubjectStatus SubjectStatus { get; set; }
public List<EvaluationInfo> FinalEvaluationList { get; set; }=new List<EvaluationInfo>();
public List<EvaluationInfo> FinalEvaluationList { get; set; } = new List<EvaluationInfo>();
public List<EvaluationInfo> ReadingEvaluationList { get; set; }=new List<EvaluationInfo>();
public List<EvaluationInfo> ReadingEvaluationList { get; set; } = new List<EvaluationInfo>();
}
@ -43,6 +43,8 @@ namespace IRaCIS.Core.Application.ViewModel
{
public Guid? QuestionId { get; set; }
public Arm? ArmEnum { get; set; }
public string Answer { get; set; }
public string FinalTranslateDictionaryCode { get; set; } = string.Empty;

2
IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationService.cs
View File

@ -135,7 +135,7 @@ namespace IRaCIS.Core.Application.Service
{
QuestionId = u.ReadingQuestionTrialId,
Answer = u.Answer,
ArmEnum=u.VisitTask.ArmEnum,
FinalTranslateDictionaryCode = u.ReadingQuestionTrial.DictionaryCode
}).ToList()

2
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
View File

@ -302,6 +302,8 @@ namespace IRaCIS.Core.Application.Contracts
public bool IsPDProgressView { get; set; }
}
public class TrialStateChangeDTO