From 83f419bff15aaebb9ca0d42c1f758ee8274aab83 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 11 Jul 2023 18:02:37 +0800
Subject: [PATCH] S-44
---
IRaCIS.Core.API/IRaCIS.Core.API.xml | 7 +++
.../IRaCIS.Core.Application.xml | 5 +++
.../ReadingClinicalDataService.cs | 1 -
.../SubjectVisitCheckPassedTrigger.cs | 44 +++++++++----------
4 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml
index 7e6ee7ae3..eec56cc64 100644
--- a/IRaCIS.Core.API/IRaCIS.Core.API.xml
+++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml
@@ -146,6 +146,13 @@
+
+
+ CRC撤销临床数据
+
+
+
+
PM确认临床数据
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 14728138f..fb04dbcfd 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -3886,6 +3886,11 @@
路径
+
+
+ 临床数据类型Id
+
+
1 PM上传的所有的 2CRC上传的所有已确认的 3 所有已经签名的
diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
index d6c950c55..00e3e559d 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
@@ -834,7 +834,6 @@ namespace IRaCIS.Application.Services
// 这里处理CRC上传 阅片期的临床数据
var readModule = await _readModuleRepository.Where(x => x.Id == inDto.ReadingId&&x.IsCRCConfirm)
-
.FirstOrDefaultAsync();
if (readModule != null)
{
diff --git a/IRaCIS.Core.Application/Triggers/SubjectVisitCheckPassedTrigger.cs b/IRaCIS.Core.Application/Triggers/SubjectVisitCheckPassedTrigger.cs
index 7155d8ed6..94463c240 100644
--- a/IRaCIS.Core.Application/Triggers/SubjectVisitCheckPassedTrigger.cs
+++ b/IRaCIS.Core.Application/Triggers/SubjectVisitCheckPassedTrigger.cs
@@ -98,36 +98,36 @@ namespace IRaCIS.Core.Application.Triggers
}
// 触发临床数据
- if (context.ChangeType == ChangeType.Added)
- {
- var cRCClinicalDatas = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == context.Entity.TrialId && x.UploadRole == UploadRole.CRC && x.IsConfirm)
+ //if (context.ChangeType == ChangeType.Added)
+ //{
+ // var cRCClinicalDatas = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == context.Entity.TrialId && x.UploadRole == UploadRole.CRC && x.IsConfirm)
- .Select(x => new
- {
- x.Id,
- x.ClinicalDataLevel,
- }).ToListAsync();
+ // .Select(x => new
+ // {
+ // x.Id,
+ // x.ClinicalDataLevel,
+ // }).ToListAsync();
- List readingClinicals = new List();
- readingClinicals.AddRange(
+ // List readingClinicals = new List();
+ // readingClinicals.AddRange(
- cRCClinicalDatas.WhereIf(!context.Entity.IsBaseLine, x => x.ClinicalDataLevel == ClinicalLevel.SubjectVisit).Select(x => new ReadingClinicalData()
- {
- ClinicalDataTrialSetId = x.Id,
- IsVisit = true,
- SubjectId = context.Entity.SubjectId,
- ReadingId = context.Entity.Id,
- TrialId = context.Entity.TrialId
+ // cRCClinicalDatas.WhereIf(!context.Entity.IsBaseLine, x => x.ClinicalDataLevel == ClinicalLevel.SubjectVisit).Select(x => new ReadingClinicalData()
+ // {
+ // ClinicalDataTrialSetId = x.Id,
+ // IsVisit = true,
+ // SubjectId = context.Entity.SubjectId,
+ // ReadingId = context.Entity.Id,
+ // TrialId = context.Entity.TrialId
- }).ToList()
+ // }).ToList()
- );
+ // );
- await _readingClinicalDataRepository.AddRangeAsync(readingClinicals);
- await _readingClinicalDataRepository.SaveChangesAsync();
+ // await _readingClinicalDataRepository.AddRangeAsync(readingClinicals);
+ // await _readingClinicalDataRepository.SaveChangesAsync();
- }
+ //}
}