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

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
hang 2025-12-02 10:54:31 +08:00
parent fafc075735 09ee238e50
commit 53b2b9156f
2 changed files with 421 additions and 384 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
IRaCIS.Core.Application/Service/Common/Export/IVUS_OCTExportService.cs
View File

@ -390,9 +390,17 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
{ {
var ivus = _mapper.Map<IvusExportDto>(task); var ivus = _mapper.Map<IvusExportDto>(task);
//靶段
ivus.TARGETV = task.QuestionAnswerList.Where(t => t.QuestionName == "靶段").FirstOrDefault()?.QuestionValue ?? string.Empty;
//靶段
ivus.TARGETV = task.QuestionAnswerList.Where(t => t.QuestionType == QuestionType.TargetSegment).FirstOrDefault()?.QuestionValue ?? string.Empty;
var marks = task.QuestionAnswerList.Where(t => t.QuestionType == QuestionType.TargetSegmentRemarks).FirstOrDefault()?.QuestionValue ?? string.Empty;
if (marks.IsNotNullOrEmpty())
{
ivus.TARGETV = ivus.TARGETV + "_" + marks;
}
//斑块编号 //斑块编号
ivus.PLAQUE = lesion.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.PlaqueNumber).FirstOrDefault()?.QuestionValue ?? string.Empty; ivus.PLAQUE = lesion.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.PlaqueNumber).FirstOrDefault()?.QuestionValue ?? string.Empty;
@ -407,10 +415,10 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
//回撤中的图像帧数 //回撤中的图像帧数
ivus.PFC = task.QuestionAnswerList.Where(t => t.QuestionName == "回撤中的图像帧数").FirstOrDefault()?.QuestionValue ?? string.Empty; ivus.PFC = task.QuestionAnswerList.Where(t => t.QuestionType == QuestionType.PullbackFrameCount).FirstOrDefault()?.QuestionValue ?? string.Empty;
//分析图像帧数 //分析图像帧数
ivus.FC = task.QuestionAnswerList.Where(t => t.QuestionName == "分析图像帧数").FirstOrDefault()?.QuestionValue ?? string.Empty; ivus.FC = task.QuestionAnswerList.Where(t => t.QuestionType == QuestionType.AnalysisFrameCount).FirstOrDefault()?.QuestionValue ?? string.Empty;
var findStatLession = task.LesionList.FirstOrDefault(t => t.LessionType == LesionType.PatchDataStatistics && t.LessionAnswerList.Any(t => t.QuestionMark == QuestionMark.PlaqueNumber && t.QuestionValue == ivus.PLAQUE)); var findStatLession = task.LesionList.FirstOrDefault(t => t.LessionType == LesionType.PatchDataStatistics && t.LessionAnswerList.Any(t => t.QuestionMark == QuestionMark.PlaqueNumber && t.QuestionValue == ivus.PLAQUE));
var findPAVLession = task.LesionList.FirstOrDefault(t => t.LessionType == LesionType.PAV && t.LessionAnswerList.Any(t => t.QuestionMark == QuestionMark.PlaqueNumber && t.QuestionValue == ivus.PLAQUE)); var findPAVLession = task.LesionList.FirstOrDefault(t => t.LessionType == LesionType.PAV && t.LessionAnswerList.Any(t => t.QuestionMark == QuestionMark.PlaqueNumber && t.QuestionValue == ivus.PLAQUE));
@ -451,7 +459,7 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
{ {
pNoIndex++; pNoIndex++;
var findFct1= fctLesion?.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.FirstFCT).FirstOrDefault(); var findFct1 = fctLesion?.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.FirstFCT).FirstOrDefault();
if (findFct1 != null) if (findFct1 != null)
{ {
@ -466,7 +474,7 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
oct.TESTCD = "FCTMV1"; oct.TESTCD = "FCTMV1";
// 测量参数值 // 测量参数值
oct.ORRES = findFct1?.QuestionValue??string.Empty; oct.ORRES = findFct1?.QuestionValue ?? string.Empty;
// 测量值单位 // 测量值单位
oct.ORRESU = translateDataList["ValueUnit"].Where(t => t.Code.ToLower() == ((int?)findFct1.Unit)?.ToString().ToLower()).Select(t => isEn_Us ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty; oct.ORRESU = translateDataList["ValueUnit"].Where(t => t.Code.ToLower() == ((int?)findFct1.Unit)?.ToString().ToLower()).Select(t => isEn_Us ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
@ -632,7 +640,16 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
//靶段 //靶段
oct.TARGETV = task.QuestionAnswerList.Where(t => t.QuestionName == "靶段").FirstOrDefault()?.QuestionValue ?? string.Empty; //靶段
oct.TARGETV = task.QuestionAnswerList.Where(t => t.QuestionType == QuestionType.TargetSegment).FirstOrDefault()?.QuestionValue ?? string.Empty;
var marks = task.QuestionAnswerList.Where(t => t.QuestionType == QuestionType.TargetSegmentRemarks).FirstOrDefault()?.QuestionValue ?? string.Empty;
if (marks.IsNotNullOrEmpty())
{
oct.TARGETV = oct.TARGETV + "_" + marks;
}
//斑块编号 //斑块编号
oct.PLAQUE = pNo; oct.PLAQUE = pNo;

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

@ -142,7 +142,7 @@ namespace IRaCIS.Core.Domain.Share
/// </summary> /// </summary>
public enum ClinicalTableQuestionMark public enum ClinicalTableQuestionMark
{ {
Test=1, Test = 1,
} }
/// <summary> /// <summary>
@ -542,7 +542,7 @@ namespace IRaCIS.Core.Domain.Share
//阅片期一致率 //阅片期一致率
ReadingPeriodJudgeRatio_Export = 18, ReadingPeriodJudgeRatio_Export = 18,
TumorCDISC_Export=20, TumorCDISC_Export = 20,
IVUS_CDISC_Export = 21, IVUS_CDISC_Export = 21,
@ -691,7 +691,7 @@ namespace IRaCIS.Core.Domain.Share
/// <summary> /// <summary>
/// 分组 /// 分组
/// </summary> /// </summary>
Group=0, Group = 0,
/// <summary> /// <summary>
/// 问题 /// 问题
@ -924,7 +924,7 @@ namespace IRaCIS.Core.Domain.Share
/// <summary> /// <summary>
/// 融合过 再之前任务融合了 /// 融合过 再之前任务融合了
/// </summary> /// </summary>
Merged=3, Merged = 3,
/// <summary> /// <summary>
/// 融合主病灶 /// 融合主病灶
@ -1055,17 +1055,17 @@ namespace IRaCIS.Core.Domain.Share
/// <summary> /// <summary>
/// 存在 /// 存在
/// </summary> /// </summary>
Exist=1, Exist = 1,
/// <summary> /// <summary>
/// 疑似 /// 疑似
/// </summary> /// </summary>
Equivocal=2, Equivocal = 2,
/// <summary> /// <summary>
/// 消失 /// 消失
/// </summary> /// </summary>
Loss =3, Loss = 3,
/// <summary> /// <summary>
/// 无法评估 /// 无法评估
@ -1303,45 +1303,45 @@ namespace IRaCIS.Core.Domain.Share
/// <summary> /// <summary>
/// NA /// NA
/// </summary> /// </summary>
NA=-1, NA = -1,
/// <summary> /// <summary>
/// CMR /// CMR
/// </summary> /// </summary>
CMR=1, CMR = 1,
/// <summary> /// <summary>
/// PMR /// PMR
/// </summary> /// </summary>
PMR=2, PMR = 2,
/// <summary> /// <summary>
/// NMR /// NMR
/// </summary> /// </summary>
NMR=3, NMR = 3,
/// <summary> /// <summary>
/// PMD /// PMD
/// </summary> /// </summary>
PMD=4, PMD = 4,
/// <summary> /// <summary>
/// NE /// NE
/// </summary> /// </summary>
NE=5, NE = 5,
/// <summary> /// <summary>
/// ND /// ND
/// </summary> /// </summary>
ND=6, ND = 6,
} }
/// <summary> /// <summary>
/// 与基线相比摄取值变化 /// 与基线相比摄取值变化
/// </summary> /// </summary>
public enum SUVChangeVSBaseline public enum SUVChangeVSBaseline
{ {
/// <summary> /// <summary>
/// 增大 /// 增大
@ -1363,7 +1363,7 @@ public enum SUVChangeVSBaseline
/// </summary> /// </summary>
NotEvaluable = 4, NotEvaluable = 4,
NA=5, NA = 5,
} }
/// <summary> /// <summary>
@ -1622,15 +1622,15 @@ public enum SUVChangeVSBaseline
/// </summary> /// </summary>
ND = 5, ND = 5,
iCR=6, iCR = 6,
iPR=7, iPR = 7,
iSD=8, iSD = 8,
iUPD=9, iUPD = 9,
iCPD=10, iCPD = 10,
} }
@ -1872,7 +1872,7 @@ public enum SUVChangeVSBaseline
/// <summary> /// <summary>
/// 不显示 /// 不显示
/// </summary> /// </summary>
NotShow =3, NotShow = 3,
} }
@ -1984,7 +1984,7 @@ public enum SUVChangeVSBaseline
/// <summary> /// <summary>
/// 基线病灶 /// 基线病灶
/// </summary> /// </summary>
BaselineLesions=4, BaselineLesions = 4,
/// <summary> /// <summary>
/// 新靶病灶 /// 新靶病灶
@ -2024,7 +2024,7 @@ public enum SUVChangeVSBaseline
/// <summary> /// <summary>
/// 脂质角度 /// 脂质角度
/// </summary> /// </summary>
LipidAngle =111, LipidAngle = 111,
/// <summary> /// <summary>
/// FCT /// FCT
@ -2095,7 +2095,7 @@ public enum SUVChangeVSBaseline
/// <summary> /// <summary>
/// 检查 /// 检查
/// </summary> /// </summary>
Study=4, Study = 4,
} }
/// <summary> /// <summary>
@ -2133,22 +2133,22 @@ public enum SUVChangeVSBaseline
/// <summary> /// <summary>
/// 存在 /// 存在
/// </summary> /// </summary>
Exist=1, Exist = 1,
/// <summary> /// <summary>
/// 消失 /// 消失
/// </summary> /// </summary>
Loss=2, Loss = 2,
/// <summary> /// <summary>
/// 无法评估 /// 无法评估
/// </summary> /// </summary>
NotEvaluable=3, NotEvaluable = 3,
/// <summary> /// <summary>
/// 太小 /// 太小
/// </summary> /// </summary>
TooSmall=4, TooSmall = 4,
} }
/// <summary> /// <summary>
@ -2248,7 +2248,7 @@ public enum SUVChangeVSBaseline
/// <summary> /// <summary>
/// 病灶数量 /// 病灶数量
/// </summary> /// </summary>
LesionNumber =11, LesionNumber = 11,
/// <summary> /// <summary>
/// PPD /// PPD
@ -2374,7 +2374,7 @@ public enum SUVChangeVSBaseline
/// <summary> /// <summary>
/// 平均最小FCT /// 平均最小FCT
/// </summary> /// </summary>
AvgMinFCT=1018, AvgMinFCT = 1018,
/// <summary> /// <summary>
/// 脂质角度平均值 /// 脂质角度平均值
@ -2459,22 +2459,22 @@ public enum SUVChangeVSBaseline
/// <summary> /// <summary>
/// 0级 /// 0级
/// </summary> /// </summary>
Level0=1, Level0 = 1,
/// <summary> /// <summary>
/// 1级 /// 1级
/// </summary> /// </summary>
Level1=2, Level1 = 2,
/// <summary> /// <summary>
/// 2级 /// 2级
/// </summary> /// </summary>
Level2=3, Level2 = 3,
/// <summary> /// <summary>
/// 3级 /// 3级
/// </summary> /// </summary>
Level3=4, Level3 = 4,
} }
@ -2492,7 +2492,7 @@ public enum SUVChangeVSBaseline
/// <summary> /// <summary>
/// 扫描断层丢失 /// 扫描断层丢失
/// </summary> /// </summary>
MissingScanSlice=2, MissingScanSlice = 2,
/// <summary> /// <summary>
/// 存在运动伪影 /// 存在运动伪影
@ -2507,7 +2507,7 @@ public enum SUVChangeVSBaseline
/// <summary> /// <summary>
/// 其它（需要备注） /// 其它（需要备注）
/// </summary> /// </summary>
OtherIssuesCommentsRequired=5, OtherIssuesCommentsRequired = 5,
/// <summary> /// <summary>
/// PET-CT影像无法融合 /// PET-CT影像无法融合
@ -2637,7 +2637,7 @@ public enum SUVChangeVSBaseline
/// <summary> /// <summary>
/// 疗效评估分组 /// 疗效评估分组
/// </summary> /// </summary>
TherapeuticEffectEvaluationGroup=20, TherapeuticEffectEvaluationGroup = 20,
/// <summary> /// <summary>
/// 访视点肿瘤评估 /// 访视点肿瘤评估
@ -2752,12 +2752,12 @@ public enum SUVChangeVSBaseline
/// <summary> /// <summary>
/// 是否脑转移 /// 是否脑转移
/// </summary> /// </summary>
IsBrainMetastasis =43, IsBrainMetastasis = 43,
/// <summary> /// <summary>
/// 影像质量评估 /// 影像质量评估
/// </summary> /// </summary>
ImageQualityAssessment=44, ImageQualityAssessment = 44,
/// <summary> /// <summary>
/// Forrest出血部位 /// Forrest出血部位
@ -2884,6 +2884,26 @@ public enum SUVChangeVSBaseline
/// </summary> /// </summary>
Plaque3MinFCT = 1008, Plaque3MinFCT = 1008,
/// <summary>
/// 靶段
/// </summary>
TargetSegment = 1009,
/// <summary>
/// 回撤中的图像帧数
/// </summary>
PullbackFrameCount = 1010,
/// <summary>
/// 分析图像帧数
/// </summary>
AnalysisFrameCount = 1011,
/// <summary>
/// 靶段 备注
/// </summary>
TargetSegmentRemarks = 1012,
/// <summary> /// <summary>
/// 脂肪分数总平均值 /// 脂肪分数总平均值
/// </summary> /// </summary>
@ -2897,10 +2917,10 @@ public enum SUVChangeVSBaseline
/// <summary> /// <summary>
/// PET 5PS 评分 /// PET 5PS 评分
/// </summary> /// </summary>
public enum PET5PSScore public enum PET5PSScore
{ {
/// <summary> /// <summary>
/// 5分 /// 5分
@ -3017,7 +3037,7 @@ public enum PET5PSScore
/// <summary> /// <summary>
/// 测量值 /// 测量值
/// </summary> /// </summary>
MeasuredValue =8, MeasuredValue = 8,
/// <summary> /// <summary>
/// 斑块数据统计 /// 斑块数据统计
@ -3037,7 +3057,7 @@ public enum PET5PSScore
/// <summary> /// <summary>
/// 保存eCRF /// 保存eCRF
/// </summary> /// </summary>
SaveEICRFQuestions=12, SaveEICRFQuestions = 12,
} }
/// <summary> /// <summary>