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
hang 2023-04-13 15:13:42 +08:00
parent f77f2ce224 74121384a7
commit 818055ca6c
9 changed files with 1692 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

216
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -1436,20 +1436,63 @@
</summary>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetIRECISTTargetLesionEvaluate(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
<!-- Badly formed XML comment ignored for member "M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetIRECISTTargetLesionEvaluate(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)" -->
<!-- Badly formed XML comment ignored for member "M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetIRECISTNoTargetLesionEvaluate(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)" -->
<!-- Badly formed XML comment ignored for member "M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetNewTargetLesionEvaluate(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)" -->
<!-- Badly formed XML comment ignored for member "M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetNewNoTargetLesionEvaluate(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)" -->
<member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetOtherNewTargetLesionEvaluate(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
<summary>
获取IRECIST靶病灶评估
获取其它既往新病灶评估
</summary>
<remarks>
if（有其它既往新病灶消失或一直不存在任何其它既往新病灶）
{
疗效为 ND
}
else if (任一病灶从非“存在”状态改为“存在”状态)
{
疗效为 iUPD
}
else if (至少有一个其它既往新病灶无法评估)
{
疗效为 NE
}
else if (至少有一个其它既往新病灶为疑似状态)
{
疗效为 疑似
}
</remarks>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetNewTargetLesionEvaluate(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
<member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetNewLesionAfterTriggeringiRECSITAssessment(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
<summary>
获取新靶病灶评估
</summary>
<remarks>
if现至少1个“存在”状态的触发iRECIST后新病灶）
{
疗效为 是
}
else if (只要有一个触发iRECIST后新病灶评估为NE)
{
疗效为 NE
}
else if (只要有一个触发iRECIST后新病灶评估为疑似)
{
疗效为 疑似
}
else
{
疗效为 否
}
</remarks>
<param name="inDto"></param>
<returns></returns>
</member>
<!-- Badly formed XML comment ignored for member "M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetNewLesionAssessment(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)" -->
<!-- Badly formed XML comment ignored for member "M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetIRECSITTargetLesionEvaluate(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)" -->
<!-- Badly formed XML comment ignored for member "M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetTargetLesionEvaluate(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)" -->
<member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetNoTargetLesionEvaluate(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
<summary>
@ -1458,13 +1501,6 @@
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.IRECIST1Point1CalculateService.GetNewLesionEvaluate(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
<summary>
获取新病灶评估
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.PCWG3CalculateService.GetDeleteLesionStatrIndex(IRaCIS.Core.Application.Service.Reading.Dto.DeleteReadingRowAnswerInDto)">
<summary>
删除病灶获取起始病灶序号
@ -7184,14 +7220,14 @@
检查日期
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTTargetLesionDto.ExistsTargetLesion">
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTTargetLesionDto.NotExistsTargetLesion">
<summary>
基线未选择任何靶病灶
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTTargetLesionDto.LastTaskIsICPD">
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTTargetLesionDto.LastTaskTarget">
<summary>
上一访视评估为iCPD
上一访视评估
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTTargetLesionDto.MeetRECISTPD">
@ -7199,14 +7235,95 @@
满足RECISTPD
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTTargetLesionDto.SODAddGreaterThan5">
<summary>
本次访视SOD增加不小于5mm
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTTargetLesionDto.LowSodAddGreaterThan20Percent">
<summary>
比整体访视期间最低点SOD增加≥20 %
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTTargetLesionDto.LowSodAddGreaterThan5">
<summary>
比整体访视期间最低点SOD绝对增加值≥5 mm
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTTargetLesionDto.HaveExistLesion">
<summary>
当前访视至少有一个“存在”状态的靶病灶
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTTargetLesionDto.HaveNeLesion">
<summary>
有任一靶病灶为NE状态
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTTargetLesionDto.AllLesionVanish">
<summary>
所有非淋巴结靶病灶消失，径线总和为0
</summary>
</member>
<!-- Badly formed XML comment ignored for member "P:IRaCIS.Core.Application.ViewModel.IRECISTTargetLesionDto.AllMinorAxisLessThan10" -->
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTTargetLesionDto.BaseLineLessThan30">
<summary>
与基线期SOD相比减小≥30 %
</summary>
</member>
<member name="T:IRaCIS.Core.Application.ViewModel.IRECISTNoTargetLesion">
<summary>
IRECIST 非靶病灶
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTNoTargetLesion.NotExistsNoTargetLesion">
<summary>
基线未选择任何非靶病灶
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTNoTargetLesion.LastNoTargetLesion">
<summary>
上次非靶病灶评估结果
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTNoTargetLesion.ExistiCPD">
<summary>
任一非靶病灶状态评估为“进一步增大（iCPD）”
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTNoTargetLesion.LastNoUPD">
<summary>
出现至少1个上一访视未评估为“显著增大（iUPD）”的病灶本次访视评估为“显著增大（iUPD）”
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTNoTargetLesion.ExistiUPD">
<summary>
任一非靶病灶状态评估为 iUPD
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTNoTargetLesion.RECISTPD">
<summary>
满足RECIST1.1PD
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTNoTargetLesion.HaveNeLesion">
<summary>
有任一非靶病灶为NE状态
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTNoTargetLesion.AllVanish">
<summary>
全部为消失
</summary>
</member>
<member name="T:IRaCIS.Core.Application.ViewModel.IRECISTNewTargetLesionDto">
<summary>
新靶病灶评估Dto
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTNewTargetLesionDto.ExistsNewTargetLesion">
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTNewTargetLesionDto.NotExistsNewTargetLesion">
<summary>
存在新靶病灶
不存在新靶病灶
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTNewTargetLesionDto.AllVanish">
@ -7214,9 +7331,9 @@
所有状态为消失
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTNewTargetLesionDto.LastTaskIsiUPD">
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTNewTargetLesionDto.LastTaskNewTargetLesion">
<summary>
上一访视新靶病灶评估为“iUPD”
上一访视新靶病灶评估
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTNewTargetLesionDto.ISODAdd5mm">
@ -7234,9 +7351,39 @@
至少有一个新靶病无法评估
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTNewNoTargetLesionDto.ExistsNewNoTargetLesion">
<member name="T:IRaCIS.Core.Application.ViewModel.IRECISTOtherNewTargetLesionDto">
<summary>
存在新非靶病灶
其他既往新病灶
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTOtherNewTargetLesionDto.NotExistsOtherNewTargetLesion">
<summary>
不存在其他既往新病灶
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTOtherNewTargetLesionDto.AllVanish">
<summary>
所有状态为消失
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTOtherNewTargetLesionDto.LastTaskNoExists">
<summary>
当任一病灶从非“存在”状态改为“存在”状态
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTOtherNewTargetLesionDto.ExixtsUnevaluableState">
<summary>
至少有一个病灶无法评估
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTOtherNewTargetLesionDto.ExixtsSuspectedState">
<summary>
至少有一个其它既往新病灶为疑似状态
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTNewNoTargetLesionDto.NotExistsNewNoTargetLesion">
<summary>
不存在新非靶病灶
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTNewNoTargetLesionDto.AllVanish">
@ -7244,9 +7391,14 @@
所有状态为消失
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTNewNoTargetLesionDto.LastTaskIsiUPD">
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTNewNoTargetLesionDto.LastTaskNewNoTargetLesion">
<summary>
上一访视新靶病灶评估为“iUPD”
上一访视新非靶病灶评估
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTNewNoTargetLesionDto.NewTargetLesion">
<summary>
当前访视的新靶病灶评估
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTNewNoTargetLesionDto.ExixtsEnlargementState">
@ -7264,6 +7416,26 @@
至少有一个病灶无法评估
</summary>
</member>
<member name="T:IRaCIS.Core.Application.ViewModel.IRECISTNewLesionAssessmentDto">
<summary>
IRECIST新病灶Dto
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTNewLesionAssessmentDto.LastTaskNewLesioniUPD">
<summary>
上一次任务的新病灶评估为iUPD
</summary>
</member>
<member name="T:IRaCIS.Core.Application.ViewModel.IRECISTTargetLesionEvaluateDto">
<summary>
IRECIST整体肿瘤评估
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.IRECISTTargetLesionEvaluateDto.LastTaskLesioniUPDOriCPD">
<summary>
上一次任务的评估为iUPD或者iCPD
</summary>
</member>
<member name="T:IRaCIS.Core.Application.ViewModel.SubjectCriteriaEvaluationView">
<summary> SubjectCriteriaEvaluationView 列表视图模型 </summary>
</member>

4
IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs
View File

@ -129,6 +129,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string TaskBlindName { get; set; } = string.Empty;
public bool IsConvertedTask { get; set; }
public bool IsAnalysisCreate { get; set; }
public bool? IsSelfAnalysis { get; set; }
@ -291,6 +293,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Func<ReadingCalculateDto, Task<string>> GetStringFun { get; set; }
public Func<ChangeAllTaskDto,Task> ChangeAllTaskFun { get; set; }
public bool IsConvertedTask { get; set; } = false;
}
}

2
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
View File

@ -1055,7 +1055,7 @@ namespace IRaCIS.Application.Services
/// <param name="tableQuestionLists"></param>
private async void FindChildQuestion(TrialReadQuestionData item, List<TrialReadQuestionData> questionlists, List<TableQuestionTrial> tableQuestionLists, List<ReadingTableQuestionAnswerInfo> tableAnswers, List<TableAnsweRowInfo> tableAnsweRowInfos, List<OrganInfo> organInfos, List<ReadingTableQuestionAnswer> baseLineTableAnswer,bool isFirstChangeTask, List<ReadingTableQuestionAnswer> lastTaskTableAnswer)
{
item.Childrens = questionlists.Where(x => x.ParentId == item.Id || x.GroupId == item.Id).ToList();
item.Childrens = questionlists.Where(x => x.ParentId == item.Id || (x.GroupId == item.Id && x.ParentId == null)).ToList();
item.TableQuestions = new TrialReadTableQuestion();
item.TableQuestions.Questions = tableQuestionLists.Where(x => x.ReadingQuestionId == item.Id).OrderBy(x => x.ShowOrder).ToList();

172
IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs
View File

@ -53,20 +53,104 @@ namespace IRaCIS.Core.Application.ViewModel
/// <summary>
/// 基线未选择任何靶病灶
/// </summary>
public bool ExistsTargetLesion { get; set; }
public bool NotExistsTargetLesion { get; set; }
/// <summary>
/// 上一访视评估为iCPD
/// 上一访视评估
/// </summary>
public bool LastTaskIsICPD { get; set; }
public string LastTaskTarget { get; set; }
/// <summary>
/// 满足RECISTPD
/// </summary>
public bool MeetRECISTPD { get; set; }
/// <summary>
/// 本次访视SOD增加不小于5mm
/// </summary>
public bool SODAddGreaterThan5 { get; set; }
/// <summary>
/// 比整体访视期间最低点SOD增加≥20 %
/// </summary>
public bool LowSodAddGreaterThan20Percent { get; set; }
/// <summary>
/// 比整体访视期间最低点SOD绝对增加值≥5 mm
/// </summary>
public bool LowSodAddGreaterThan5 { get; set; }
/// <summary>
/// 当前访视至少有一个“存在”状态的靶病灶
/// </summary>
public bool HaveExistLesion { get; set; }
/// <summary>
/// 有任一靶病灶为NE状态
/// </summary>
public bool HaveNeLesion { get; set; }
/// <summary>
/// 所有非淋巴结靶病灶消失，径线总和为0
/// </summary>
public bool AllLesionVanish { get; set; }
/// <summary>
/// 所有淋巴结靶病灶的短径缩小到 < 10 mm
/// </summary>
public bool AllMinorAxisLessThan10 { get; set; }
/// <summary>
/// 与基线期SOD相比减小≥30 %
/// </summary>
public bool BaseLineLessThan30 { get; set; }
}
/// <summary>
/// IRECIST 非靶病灶
/// </summary>
public class IRECISTNoTargetLesion
{
/// <summary>
/// 基线未选择任何非靶病灶
/// </summary>
public bool NotExistsNoTargetLesion { get; set; }
/// <summary>
/// 上次非靶病灶评估结果
/// </summary>
public string LastNoTargetLesion { get; set; }
/// <summary>
/// 任一非靶病灶状态评估为“进一步增大（iCPD）”
/// </summary>
public bool ExistiCPD { get; set; }
/// <summary>
/// 出现至少1个上一访视未评估为“显著增大（iUPD）”的病灶本次访视评估为“显著增大（iUPD）”
/// </summary>
public bool LastNoUPD { get; set; }
/// <summary>
/// 任一非靶病灶状态评估为 iUPD
/// </summary>
public bool ExistiUPD { get; set; }
/// <summary>
/// 满足RECIST1.1PD
/// </summary>
public bool RECISTPD { get; set; }
/// <summary>
/// 有任一非靶病灶为NE状态
/// </summary>
public bool HaveNeLesion { get; set; }
/// <summary>
/// 全部为消失
/// </summary>
public bool AllVanish { get; set; }
}
/// <summary>
@ -75,9 +159,9 @@ namespace IRaCIS.Core.Application.ViewModel
public class IRECISTNewTargetLesionDto
{
/// <summary>
/// 存在新靶病灶
/// 不存在新靶病灶
/// </summary>
public bool ExistsNewTargetLesion { get; set; }
public bool NotExistsNewTargetLesion { get; set; }
/// <summary>
/// 所有状态为消失
@ -85,9 +169,9 @@ namespace IRaCIS.Core.Application.ViewModel
public bool AllVanish { get; set; }
/// <summary>
/// 上一访视新靶病灶评估为“iUPD”
/// 上一访视新靶病灶评估
/// </summary>
public bool LastTaskIsiUPD { get; set; }
public string LastTaskNewTargetLesion { get; set; }
/// <summary>
/// SOD增加5mm以上
@ -105,12 +189,51 @@ namespace IRaCIS.Core.Application.ViewModel
public bool ExixtsUnevaluableState { get; set; }
}
/// <summary>
/// 其他既往新病灶
/// </summary>
public class IRECISTOtherNewTargetLesionDto
{
/// <summary>
/// 不存在其他既往新病灶
/// </summary>
public bool NotExistsOtherNewTargetLesion { get; set; }
/// <summary>
/// 所有状态为消失
/// </summary>
public bool AllVanish { get; set; }
/// <summary>
/// 当任一病灶从非“存在”状态改为“存在”状态
/// </summary>
public bool LastTaskNoExists { get; set; }
/// <summary>
/// 至少有一个病灶无法评估
/// </summary>
public bool ExixtsUnevaluableState { get; set; }
/// <summary>
/// 至少有一个其它既往新病灶为疑似状态
/// </summary>
public bool ExixtsSuspectedState { get; set; }
}
///// <summary>
///// 触发iRECIST后新病灶评估
///// </summary>
//public class NewLesionAfterTriggeringiRECSITAssessmentDto
//{
//}
public class IRECISTNewNoTargetLesionDto
{
/// <summary>
/// 存在新非靶病灶
/// 不存在新非靶病灶
/// </summary>
public bool ExistsNewNoTargetLesion { get; set; }
public bool NotExistsNewNoTargetLesion { get; set; }
/// <summary>
/// 所有状态为消失
@ -119,9 +242,14 @@ namespace IRaCIS.Core.Application.ViewModel
/// <summary>
/// 上一访视新靶病灶评估为“iUPD”
/// 上一访视新非靶病灶评估
/// </summary>
public bool LastTaskIsiUPD { get; set; }
public string LastTaskNewNoTargetLesion { get; set; }
/// <summary>
/// 当前访视的新靶病灶评估
/// </summary>
public string NewTargetLesion { get; set; }
/// <summary>
/// 任一新非靶病灶状态为“增大”
@ -138,4 +266,26 @@ namespace IRaCIS.Core.Application.ViewModel
/// </summary>
public bool ExixtsUnevaluableState { get; set; }
}
/// <summary>
/// IRECIST新病灶Dto
/// </summary>
public class IRECISTNewLesionAssessmentDto
{
/// <summary>
/// 上一次任务的新病灶评估为iUPD
/// </summary>
public bool LastTaskNewLesioniUPD { get; set; }
}
/// <summary>
/// IRECIST整体肿瘤评估
/// </summary>
public class IRECISTTargetLesionEvaluateDto
{
/// <summary>
/// 上一次任务的评估为iUPD或者iCPD
/// </summary>
public bool LastTaskLesioniUPDOriCPD { get; set; }
}
}

3
IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
View File

@ -120,7 +120,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
ReadingCalculateDto readingData = new ReadingCalculateDto()
{
SubjectId = visitTask.SubjectId,
TaskBlindName= visitTask.TaskBlindName,
TaskBlindName = visitTask.TaskBlindName,
IsConvertedTask = await _visitTaskRepository.Where(x => x.Id == visitTaskId).Select(x => x.IsConvertedTask).FirstOrDefaultAsync(),
VisitTaskId = visitTaskId,
SubjectVisitId = visitTask.SourceSubjectVisitId!.Value,
QuestionInfo = questionInfos,

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

File diff suppressed because it is too large Load Diff

228
IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
View File

@ -438,6 +438,108 @@ namespace IRaCIS.Core.Domain.Share
Yes = 1
}
/// <summary>
/// 其他既往新病灶状态
/// </summary>
public enum OtherPreviousNewLesionState
{
/// <summary>
/// 存在
/// </summary>
Exists = 0,
/// <summary>
/// 疑似
/// </summary>
Equivocal = 1,
/// <summary>
/// 无法评估
/// </summary>
NotEvaluable = 2,
/// <summary>
/// 消失
/// </summary>
Loss = 3,
}
/// <summary>
/// 其他既往新病灶评估
/// </summary>
public enum OtherPreviousNewLesionAssessment
{
iUPD = 1,
iCPD = 2,
/// <summary>
/// 疑似
/// </summary>
Equivocal = 3,
NE = 4,
ND = 5,
}
/// <summary>
/// 触发iRECIST后新病灶状态
/// </summary>
public enum NewLesionAfterTriggeringiRECSITState
{
/// <summary>
/// 存在
/// </summary>
Exist=1,
/// <summary>
/// 疑似
/// </summary>
Equivocal=2,
/// <summary>
/// 消失
/// </summary>
Loss =3,
/// <summary>
/// 无法评估
/// </summary>
NotEvaluable = 4,
}
/// <summary>
/// 触发iRECIST后新病灶评估
/// </summary>
public enum NewLesionAfterTriggeringiRECSITAssessment
{
/// <summary>
/// 是
/// </summary>
Yes = 1,
/// <summary>
/// 否
/// </summary>
No = 2,
/// <summary>
/// 疑似
/// </summary>
Equivocal = 3,
/// <summary>
/// NE
/// </summary>
NE = 4
}
/// <summary>
/// 整体肿瘤评估
/// </summary>
@ -483,7 +585,22 @@ namespace IRaCIS.Core.Domain.Share
/// </summary>
SD = 6,
iCR = 7,
iPR = 8,
iSD = 10,
iNN = 11,
iUPD = 12,
iCPD = 13,
}
@ -545,7 +662,21 @@ namespace IRaCIS.Core.Domain.Share
/// </summary>
No = 3,
/// <summary>
/// iUPD
/// </summary>
iUPD = 4,
/// <summary>
/// iCPD
/// </summary>
iCPD = 5,
/// <summary>
/// ND
/// </summary>
ND = 6
}
/// <summary>
@ -583,7 +714,12 @@ namespace IRaCIS.Core.Domain.Share
/// </summary>
NN = 4,
iCR = 5,
iNN = 6,
iUPD = 7,
iCPD = 8,
}
/// <summary>
@ -626,6 +762,16 @@ namespace IRaCIS.Core.Domain.Share
/// </summary>
ND = 5,
iCR=6,
iPR=7,
iSD=8,
iUPD=9,
iCPD=10,
}
@ -1026,6 +1172,64 @@ namespace IRaCIS.Core.Domain.Share
UpdateType = 3
}
/// <summary>
/// 新靶病灶状态
/// </summary>
public enum NewTargetLesionState
{
/// <summary>
/// 存在
/// </summary>
Exist=1,
/// <summary>
/// 消失
/// </summary>
Loss=2,
/// <summary>
/// 无法评估
/// </summary>
NotEvaluable=3,
}
/// <summary>
/// 新非靶病灶状态
/// </summary>
public enum NewNoTargetLesionState
{
/// <summary>
/// 存在
/// </summary>
Exist = 1,
/// <summary>
/// 增大
/// </summary>
Progression = 1,
/// <summary>
/// 无法评估
/// </summary>
NotEvaluable = 2,
/// <summary>
/// 消失
/// </summary>
Loss = 3,
}
/// <summary>
/// 新非靶病灶评估
/// </summary>
public enum NewNoTargetLesionAssessment
{
iUPD = 1,
iCPD = 2,
NE = 3,
ND = 4,
}
public enum QuestionMark
{
/// <summary>
@ -1252,6 +1456,24 @@ namespace IRaCIS.Core.Domain.Share
IsConverted = 44,
}
/// <summary>
/// 新靶病灶评估
/// </summary>
public enum NewTargetLesionAssessment
{
iUPD = 1,
iCPD = 2,
NE = 3,
ND = 4,
}
/// <summary>
/// 访视点肿瘤评估
/// </summary>

25
IRaCIS.Core.Domain/SQLFile/字典维护.sql Normal file
View File

@ -0,0 +1,25 @@
-- 插入字典code
declare @TrialCriterionId uniqueidentifier='54650000-3E2C-0016-75E6-08DB320098F3'
insert TrialCriterionDictionaryCode (Id,TrialCriterionId,Code,CreateTime,CreateUserId)
select NEWID(),
@TrialCriterionId,Code,'2020-01-01','00000000-0000-0000-0000-000000000000' from SystemCriterionDictionaryCode
inner join ReadingQuestionCriterionTrial on SystemCriterionDictionaryCode.SystemCriterionId=ReadingQuestionCriterionTrial.ReadingQuestionCriterionSystemId and ReadingQuestionCriterionTrial.Id=
@TrialCriterionId
where Code not in (select Code from TrialCriterionDictionaryCode where TrialCriterionId=
@TrialCriterionId)
-- 插入字典
insert into ReadingCriterionDictionary (Id,CriterionId,DictionaryId,CreateTime,CreateUserId,IsSystemCriterion,ParentCode,IsBaseLineUse,IsFollowVisitUse)
select NEWID(), @TrialCriterionId,DictionaryId,'2020-01-01','00000000-0000-0000-0000-000000000000',0,ParentCode,IsBaseLineUse,IsFollowVisitUse from ReadingCriterionDictionary
inner join ReadingQuestionCriterionTrial on ReadingCriterionDictionary.CriterionId=ReadingQuestionCriterionTrial.ReadingQuestionCriterionSystemId and ReadingQuestionCriterionTrial.Id=
@TrialCriterionId
where DictionaryId not in (select DictionaryId from ReadingCriterionDictionary where CriterionId=
@TrialCriterionId)

1
IRaCIS.Core.Infra.EFCore/Common/ReadingCommon.cs
View File

@ -164,7 +164,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
return ((int)(object)value).ToString();
}
/// <summary>
/// 字符匹配枚举
/// </summary>