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

修改

Uat_Study
he 2023-05-16 10:03:12 +08:00
parent 40599918ba
commit 1bb95bd1b5
5 changed files with 117 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs
View File

@ -466,6 +466,19 @@ namespace IRaCIS.Core.Application.Service
TrialCriterionId= readingQuestionCriterionTrial.Id,
OrganInfoId = x.Id,
TrialId = readingQuestionCriterionTrial.TrialId,
TULAT=x.TULAT,
Classification=x.Classification,
ClassificationEN=x.ClassificationEN,
IsCanEditPosition=x.IsCanEditPosition,
Part=x.Part,
IsLymphNodes=x.IsLymphNodes,
PartEN=x.PartEN,
ShowOrder=x.ShowOrder,
TULATEN=x.TULATEN,
TULOC=x.TULOC,
TULOCEN=x.TULOCEN,
OrganType=x.OrganType,
}).ToListAsync();
organTrialInfoList.ForEach(x => x.Id = NewId.NextGuid());

9
IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
View File

@ -1319,7 +1319,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var value = await GetSODData(inDto);
if (value == null || inDto.IsBaseLine)
if (value == null || inDto.IsBaseLine || !inDto.IsConvertedTask||inDto.BeforeConvertedTaskId!=null)
{
return null;
}
@ -1336,6 +1336,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
/// <returns></returns>
public async Task<decimal?> GetiSODData(ReadingCalculateDto inDto)
{
if (!inDto.IsConvertedTask || inDto.BeforeConvertedTaskId != null)
{
return null;
}
if (iSODData != null)
{
return iSODData.Value;
@ -1389,7 +1394,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var value = await GetiSODData(inDto);
if (value == null || inDto.IsBaseLine)
if (value == null || inDto.IsBaseLine || !inDto.IsConvertedTask || inDto.BeforeConvertedTaskId != null)
{
return null;
}

30
IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs
View File

@ -30,33 +30,33 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 部位
/// </summary>
public string Part { get; set; }
public string Part { get; set; } = string.Empty;
/// <summary>
/// 部位 英文
/// </summary>
public string PartEN { get; set; } = string.Empty;
/// <summary>
/// 部位 英文
/// </summary>
public string PartEN { get; set; } = string.Empty;
/// <summary>
/// TULOC 器官
/// </summary>
public string TULOC { get; set; }
public string TULOC { get; set; } = string.Empty;
/// <summary>
/// TULOC 器官 英文
/// </summary>
public string TULOCEN { get; set; } = string.Empty;
/// <summary>
/// TULOC 器官 英文
/// </summary>
public string TULOCEN { get; set; } = string.Empty;
/// <summary>
/// 位置
/// </summary>
public string TULAT { get; set; }
public string TULAT { get; set; } = string.Empty;
/// <summary>
/// 位置 英文
/// </summary>
public string TULATEN { get; set; } = string.Empty;
/// <summary>
/// 位置 英文
/// </summary>
public string TULATEN { get; set; } = string.Empty;
/// <summary>
/// 备注

63
IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs
View File

@ -49,7 +49,68 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public Guid TrialCriterionId { get; set; }
[JsonIgnore]
/// <summary>
/// 部位
/// </summary>
public string Part { get; set; } = string.Empty;
/// <summary>
/// 部位 英文
/// </summary>
public string PartEN { get; set; } = string.Empty;
/// <summary>
/// TULOC 器官
/// </summary>
public string TULOC { get; set; } = string.Empty;
/// <summary>
/// TULOC 器官 英文
/// </summary>
public string TULOCEN { get; set; } = string.Empty;
/// <summary>
/// 位置
/// </summary>
public string TULAT { get; set; } = string.Empty;
/// <summary>
/// 位置 英文
/// </summary>
public string TULATEN { get; set; } = string.Empty;
/// <summary>
/// 是否是淋巴结
/// </summary>
public IsLymph IsLymphNodes { get; set; }
/// <summary>
/// 是否可编辑位置
/// </summary>
public bool IsCanEditPosition { get; set; }
/// <summary>
/// 分类
/// </summary>
public string Classification { get; set; } = string.Empty;
/// <summary>
/// 分类 英文
/// </summary>
public string ClassificationEN { get; set; } = string.Empty;
/// <summary>
/// 序号
/// </summary>
public int ShowOrder { get; set; } = 0;
/// <summary>
/// 器官类型
/// </summary>
public OrganType? OrganType { get; set; }
[JsonIgnore]
[ForeignKey("OrganInfoId")]
public OrganInfo OrganInfo { get; set; }

21
IRaCIS.Core.Domain/SQLFile/Test.sql
View File

@ -1038,4 +1038,23 @@ go
update ClinicalDataTrialSet set ClinicalDataTrialSet.ClinicalDataSetEnName=clinicalDataSystemSet.ClinicalDataSetEnName from clinicalDataSystemSet
inner join ClinicalDataTrialSet on ClinicalDataTrialSet.SystemClinicalDataSetId=clinicalDataSystemSet.Id
inner join ClinicalDataTrialSet on ClinicalDataTrialSet.SystemClinicalDataSetId=clinicalDataSystemSet.Id
---------------维护项目器官表 将器官信息在项目表里面存冗余
update OrganTrialInfo set
OrganTrialInfo.PartEN=OrganInfo.PartEN ,
OrganTrialInfo.Part=OrganInfo.Part,
OrganTrialInfo.TULOC=OrganInfo.TULOC,
OrganTrialInfo.TULOCEN=OrganInfo.TULOCEN,
OrganTrialInfo.TULAT=OrganInfo.TULAT,
OrganTrialInfo.TULATEN=OrganInfo.TULATEN,
OrganTrialInfo.IsLymphNodes=OrganInfo.IsLymphNodes,
OrganTrialInfo.IsCanEditPosition=OrganInfo.IsCanEditPosition,
OrganTrialInfo.Classification=OrganInfo.Classification,
OrganTrialInfo.ClassificationEN=OrganInfo.ClassificationEN,
OrganTrialInfo.ShowOrder=OrganInfo.ShowOrder,
OrganTrialInfo.OrganType=OrganInfo.OrganType
from OrganInfo inner join OrganTrialInfo
on OrganInfo.Id=OrganTrialInfo.OrganInfoId where OrganTrialInfo.OrganType is null