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

Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

IRC_NewDev
hang 2024-03-08 13:37:22 +08:00
parent a41824414e c54b0abbd7
commit 0d4f694fcf
7 changed files with 16 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorExistJoin_US.html
View File

@ -25,7 +25,7 @@
Protocol ID: {2}
</div>
<div>
Study name: {1}
Study Name: {1}
</div>
<div>
User ID: {4}

2
IRaCIS.Core.API/wwwroot/EmailTemplate/TrialDoctorFirstJoin_US.html
View File

@ -25,7 +25,7 @@
Protocol ID: {2}
</div>
<div>
Study name: {1}
Study Name: {1}
</div>
<div>
User ID: {4}

2
IRaCIS.Core.API/wwwroot/EmailTemplate/TrialSiteSurveyReject_US.html
View File

@ -22,7 +22,7 @@
Protocol ID: {2}
</div>
<div>
Study name: {3}
Study Name: {3}
</div>
<div>
Site ID: {4}

2
IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserExistJoin_US.html
View File

@ -25,7 +25,7 @@
Protocol ID: {2}
</div>
<div>
Study name: {1}
Study Name: {1}
</div>
<div>
User ID: {4}

2
IRaCIS.Core.API/wwwroot/EmailTemplate/TrialUserFirstJoin_US.html
View File

@ -25,7 +25,7 @@
Protocol ID: {2}
</div>
<div>
Study name: {1}
Study Name: {1}
</div>
<div>
User ID: {4}

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

@ -770,36 +770,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string RowMark { get; set; } = string.Empty;
/// <summary>
/// InstanceId
/// </summary>
public Guid? OtherInstanceId { get; set; }
/// <summary>
/// SeriesId
/// </summary>
public Guid? OtherSeriesId { get; set; }
/// <summary>
/// StudyId
/// </summary>
public Guid? OtherStudyId { get; set; }
public string? OtherMarkTool { get; set; }
public string? OtherPicturePath { get; set; }
public int? OtherNumberOfFrames { get; set; }
public string? OtherMeasureData { get; set; } = string.Empty;
}
public class CopyTableAnswerRowInfo : ReadingTableAnswerRowInfoBase

26
IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
View File

@ -2105,30 +2105,26 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var taskinfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync();
ReadingCalculateDto inDto = await _generalCalculateService.GetReadingCalculateDto(visitTaskId);
if (spleenLength == 0)
var result = SpleenAssessment.NotEvaluable;
if (spleenLength < 0)
{
return SpleenAssessment.NotEvaluable.GetEnumInt();
}
if (inDto.IsBaseLine)
else if (0 < spleenLength && spleenLength <= 130)
{
if (spleenLength <= 130)
{
return SpleenAssessment.Normal.GetEnumInt();
}
else
{
return SpleenAssessment.Swelling.GetEnumInt();
}
}
return SpleenAssessment.Normal.GetEnumInt();
}
else if (inDto.IsBaseLine)
{
return SpleenAssessment.Swelling.GetEnumInt();
}
var lowSpleenLength = await this.GetLowSpleenLength(taskinfo);
var result = SpleenAssessment.Stabilization;
var presentSpd = spleenLength;