From 1866257ff58f68d33e941d22d1ddee039cc08a8c Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 26 Jun 2023 17:55:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IRaCIS.Core.Application.xml | 123 ++++++++++++++++--
.../ClinicalData/ClinicalQuestionService.cs | 9 +-
.../Reading/Dto/ClinicalQuestionDto.cs | 18 +++
.../Service/Reading/_MapConfig.cs | 8 +-
4 files changed, 144 insertions(+), 14 deletions(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index d5b02da56..4a10fe0d5 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -2484,11 +2484,66 @@
+
+
+ 临床答案
+
+
+
+
+ 获取CRC受试者临床数据
+
+
+
+
+
+
+ 获取表单列表
+
+
+
+
+
+
+ 获取临床数据表单问题
+
+
+
+
+
+
+ 提交临床数据表单
+
+
+
+
临床数据问题
+
+
+ 获取系统临床数据预览
+
+
+
+
+
+
+ 获取项目临床数据预览
+
+
+
+
+
+
+ 获取子元素
+
+
+
+
+
获取项目临床问题
@@ -2828,6 +2883,46 @@
是否启用
+
+
+ 系统临床数据Id
+
+
+
+
+ 项目临床数据Id
+
+
+
+
+ 项目预览问题Dto
+
+
+
+
+ 系统临床数据Id
+
+
+
+
+ 子问题
+
+
+
+
+ 表格问题
+
+
+
+
+ 项目临床数据问题
+
+
+
+
+ 系统临床数据Id
+
+
临床问题基本信息
@@ -3113,6 +3208,16 @@
获取系统临床数据
+
+
+ 系统临床数据Id
+
+
+
+
+ 系统临床数据Id
+
+
系统临床数据Id
@@ -10374,7 +10479,7 @@
- 一致性核查待处理
+ 一致性核查待处理 -- PM APM 待办
@@ -10383,7 +10488,7 @@
- 重阅申请待审核
+ 重阅申请待审核 -- PM APM 待办
@@ -10392,7 +10497,7 @@
- PM 阅片人筛选
+ PM 阅片人筛选 -- PM APM 待办
@@ -10419,7 +10524,7 @@
- 临床数据
+ 临床数据 --CRC 待办
@@ -10427,7 +10532,7 @@
- CRC影像质疑待处理
+ CRC影像质疑待处理 --CRC 待办
@@ -10436,7 +10541,7 @@
- 核查质疑待处理
+ 核查质疑待处理 --CRC 待办
@@ -10444,7 +10549,7 @@
- 影像重传
+ 影像重传 --CRC 待办
@@ -10452,7 +10557,7 @@
- 加急影像提交
+ 加急影像提交 --CRC 待办
@@ -10460,7 +10565,7 @@
- 影像质控 待领取 跟项目配置有关系 --未完成
+ 影像质控 待领取 跟项目配置有关系 --IQC待办
diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs
index 7dfd5a82a..c8996b227 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs
@@ -428,10 +428,10 @@ namespace IRaCIS.Core.Application.Service
}).ToListAsync();
var newTrialQuestionAll = await _systemClinicalQuestionRepository.Where(x => systemClinicalId.Contains(x.SystemClinicalId))
- .ProjectTo(_mapper.ConfigurationProvider).ToListAsync();
+ .ProjectTo(_mapper.ConfigurationProvider).ToListAsync();
var newTrialTableQuestionAll = await _systemClinicalTableQuestionRepository.Where(x => systemClinicalId.Contains(x.SystemClinicalId))
- .ProjectTo(_mapper.ConfigurationProvider).ToListAsync();
+ .ProjectTo(_mapper.ConfigurationProvider).ToListAsync();
List addTrialDataList = new List();
@@ -443,7 +443,7 @@ namespace IRaCIS.Core.Application.Service
x => x.TrialQuestionId
);
- var newTrialQuestionList = newTrialQuestionAll.Where(x => x.SystemClinicalQuestionId == item.SystemClinicalId).ToList();
+ var newTrialQuestionList = newTrialQuestionAll.Where(x => x.SystemClinicalId == item.SystemClinicalId).ToList();
newTrialQuestionList.ForEach(x =>
{
if (questionRelation.ContainsKey(x.Id))
@@ -482,7 +482,7 @@ namespace IRaCIS.Core.Application.Service
x => x.TrialQuestionId
);
- var newTrialTableQuestionList = newTrialTableQuestionAll.Where(x => x.TrialClinicalId == item.TrialClinicalId)
+ var newTrialTableQuestionList = newTrialTableQuestionAll.Where(x => x.SystemClinicalId == item.SystemClinicalId)
.ToList();
@@ -517,6 +517,7 @@ namespace IRaCIS.Core.Application.Service
await _trialClinicalQuestionRepository.AddRangeAsync(addTrialDataList);
await _trialClinicalTableQuestionRepository.BatchDeleteNoTrackingAsync(x => trialClinicalId.Contains(x.TrialClinicalId) );
await _trialClinicalTableQuestionRepository.AddRangeAsync(addTrialTableList);
+ await _trialClinicalQuestionRepository.SaveChangesAsync();
}
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalQuestionDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalQuestionDto.cs
index 9206a609b..5da3ced15 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalQuestionDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalQuestionDto.cs
@@ -403,6 +403,24 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
#region 同步临床数据
+
+ public class TrialClinicalTableQuestionSynchronize : TrialClinicalTableQuestion
+ {
+ ///
+ /// 系统临床数据Id
+ ///
+ public Guid SystemClinicalId { get; set; }
+ }
+
+ public class TrialClinicalQuestionSynchronize : TrialClinicalQuestion
+ {
+ ///
+ /// 系统临床数据Id
+ ///
+ public Guid SystemClinicalId { get; set; }
+ }
+
+
public class SynchronizationQuestionDto
{
///
diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
index 41effd2f3..1f39bf5a9 100644
--- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
@@ -31,10 +31,16 @@ namespace IRaCIS.Core.Application.Service
CreateMap();
CreateMap()
- .ForMember(d => d.SystemClinicalQuestionId, u => u.MapFrom(s => s.Id));
+ .ForMember(d => d.SystemClinicalQuestionId, opt => opt.MapFrom(src => src.Id));
+
+ CreateMap()
+ .ForMember(d => d.SystemClinicalQuestionId, opt => opt.MapFrom(src => src.Id));
+
CreateMap()
.ForMember(d => d.SystemTableQuestionId, u => u.MapFrom(s => s.Id));
+ CreateMap()
+ .ForMember(d => d.SystemTableQuestionId, opt => opt.MapFrom(src => src.Id));
// 预览