修改
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
4187673b7a
commit
ec45d80b9b
Binary file not shown.
|
|
@ -7367,7 +7367,7 @@
|
||||||
新靶病灶信息
|
新靶病灶信息
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ExportVisitData.NewVisitNoTargetInfoList">
|
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ExportVisitData.NewNoVisitTargetInfoList">
|
||||||
<summary>
|
<summary>
|
||||||
新非靶病灶信息
|
新非靶病灶信息
|
||||||
</summary>
|
</summary>
|
||||||
|
|
|
||||||
|
|
@ -200,7 +200,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
return GetTargetInfoList("NewVisitTargetInfoList"); ;
|
return GetTargetInfoList("NewNoVisitTargetInfoList"); ;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -530,7 +530,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 新非靶病灶信息
|
/// 新非靶病灶信息
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public List<VisitLesionInfo> NewVisitNoTargetInfoList { get; set; } = new List<VisitLesionInfo>();
|
public List<VisitLesionInfo> NewNoVisitTargetInfoList { get; set; } = new List<VisitLesionInfo>();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -105,7 +105,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||||
|
|
||||||
string getHavePreviousNewLesions(Guid visitId)
|
string getHavePreviousNewLesions(Guid visitId)
|
||||||
{
|
{
|
||||||
var answer = answerList.Where(x => x.ReadingQuestionTrial.QuestionType == QuestionType.OtherNewTargetLesion && x.Id == visitId).Select(x => x.Answer).FirstIsNullReturnEmpty();
|
var answer = answerList.Where(x => x.ReadingQuestionTrial.QuestionType == QuestionType.OtherNewTargetLesion && x.VisitTaskId == visitId).Select(x => x.Answer).FirstIsNullReturnEmpty();
|
||||||
if(answer==string.Empty)
|
if(answer==string.Empty)
|
||||||
{
|
{
|
||||||
return string.Empty;
|
return string.Empty;
|
||||||
|
|
@ -152,7 +152,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||||
VisitTargetInfoList = getLesionInfo(LesionType.TargetLesion, x.Id,5),
|
VisitTargetInfoList = getLesionInfo(LesionType.TargetLesion, x.Id,5),
|
||||||
VisitNoTargetInfoList = getLesionInfo(LesionType.NonTargetLesions, x.Id),
|
VisitNoTargetInfoList = getLesionInfo(LesionType.NonTargetLesions, x.Id),
|
||||||
NewVisitTargetInfoList = getLesionInfo(LesionType.NewTargetLesion, x.Id,5),
|
NewVisitTargetInfoList = getLesionInfo(LesionType.NewTargetLesion, x.Id,5),
|
||||||
NewVisitNoTargetInfoList = getLesionInfo(LesionType.NewNonTargetLesion, x.Id),
|
NewNoVisitTargetInfoList = getLesionInfo(LesionType.NewNonTargetLesion, x.Id),
|
||||||
}).OrderBy(x => x.VisitNum).ToList();
|
}).OrderBy(x => x.VisitNum).ToList();
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue