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

修改入组和PD逻辑
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
hang
2025-06-24 10:02:11 +08:00
parent b44c92f291
commit d9326a1e8e
6 changed files with 19894 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
+12 -42
View File
@@ -1051,7 +1051,7 @@ namespace IRaCIS.Core.Application.Service
private async Task<(string enrollAnswer, bool isEnroll)> DealEnrollAnswer(Guid visitTaskId, Guid subjectVisitId, CriterionType criterionType, Guid trialReadingCriterionId)
{
var enrollAnswer = string.Empty;
var enrollAnswer = _userInfo.IsEn_Us ? "No" : "否";
var isEnroll = false;
switch (criterionType)
@@ -1074,6 +1074,16 @@ namespace IRaCIS.Core.Application.Service
break;
case CriterionType.PCWG3:
var list = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == visitTaskId &&
x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.LesionNumber && x.ReadingQuestionTrial.LesionType == LesionType.BaselineLesions).Select(t => t.Answer).ToListAsync();
bool exists = list.Any(s => int.TryParse(s, out var n) && n > 100);
if (exists)
{
enrollAnswer = _userInfo.IsEn_Us ? "Yes" : "是";
}
break;
case CriterionType.RANO_BM:
@@ -1326,15 +1336,7 @@ namespace IRaCIS.Core.Application.Service
if (answer == OverallAssessment.PD.GetEnumInt())
{
answer = _userInfo.IsEn_Us ? "Yes" : "是";
}
else if (answer == OverallAssessment.ND.GetEnumInt())
{
answer = "ND";
}
else if (answer == OverallAssessment.NE.GetEnumInt())
{
answer = "NE";
}
}
else
{
answer = _userInfo.IsEn_Us ? "No" : "否";
@@ -1347,14 +1349,6 @@ namespace IRaCIS.Core.Application.Service
{
answer = _userInfo.IsEn_Us ? "Yes" : "是";
}
else if (answer == OverallAssessment.ND.GetEnumInt())
{
answer = "ND";
}
else if (answer == OverallAssessment.NE.GetEnumInt())
{
answer = "NE";
}
else
{
answer = _userInfo.IsEn_Us ? "No" : "否";
@@ -1367,14 +1361,6 @@ namespace IRaCIS.Core.Application.Service
{
answer = _userInfo.IsEn_Us ? "Yes" : "是";
}
else if (answer == CTMRIOverallAssessment.ND.GetEnumInt())
{
answer = "ND";
}
else if (answer == CTMRIOverallAssessment.NE.GetEnumInt())
{
answer = "NE";
}
else
{
answer = _userInfo.IsEn_Us ? "No" : "否";
@@ -1387,14 +1373,6 @@ namespace IRaCIS.Core.Application.Service
{
answer = _userInfo.IsEn_Us ? "Yes" : "是";
}
else if (answer == ImagingOverallAssessment_Lugano.ND.GetEnumInt())
{
answer = "ND";
}
else if (answer == ImagingOverallAssessment_Lugano.NE.GetEnumInt())
{
answer = "NE";
}
else
{
answer = _userInfo.IsEn_Us ? "No" : "否";
@@ -1410,14 +1388,6 @@ namespace IRaCIS.Core.Application.Service
{
answer = _userInfo.IsEn_Us ? "Yes" : "是";
}
else if (answer == VisitTumorEvaluation.ND.GetEnumInt())
{
answer = "ND";
}
else if (answer == VisitTumorEvaluation.NE.GetEnumInt())
{
answer = "NE";
}
else
{
answer = _userInfo.IsEn_Us ? "No" : "否";
IRaCIS.Core.Application/Service/Visit/DTO/ClinicalStudySubjects.cs
+4
View File
@@ -31,6 +31,8 @@ namespace IRaCIS.Application.Contracts
[Comment("受试者退出")]
public bool IsSubjectQuit { get; set; }
//public DateTime? OutEnrollmentTime { get; set; }
@@ -58,6 +60,8 @@ namespace IRaCIS.Application.Contracts
public string Reason { get; set; } = string.Empty;
public Guid? FinalSubjectVisitId { get; set; }
public bool IsSubjectQuit { get; set; }
}