From 490e366408759fcb09f772920cd517b7bb86834a Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 12 Aug 2022 17:11:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=B4=E5=BA=8A=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IRaCIS.Core.Application.xml | 37 +++++++++++++++++++
.../Reading/Dto/ReadingClinicalDataDto.cs | 37 ++++++++++++++++++-
.../Reading/ReadingClinicalDataService.cs | 22 +++++++++++
.../Reading/ReadingClinicalData.cs | 4 +-
4 files changed, 97 insertions(+), 3 deletions(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 552be6f40..503816281 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -177,6 +177,13 @@
+
+
+ 设置医学审核失效
+
+
+
+
123 分别是 分配，重新分配，取消分配
@@ -1278,6 +1285,16 @@
文件路径
+
+
+ 是否盲化
+
+
+
+
+ 是否完整
+
+
是否盲化
@@ -1383,6 +1400,16 @@
临床级别
+
+
+ 是否盲化
+
+
+
+
+ 是否完整
+
+
项目配置临床类型Name
@@ -1428,6 +1455,16 @@
是否签名
+
+
+ 是否盲化
+
+
+
+
+ 是否完整
+
+
文件数量
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
index 8643d47c9..fd65f0962 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
@@ -98,6 +98,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public string Path { get; set; }
+ ///
+ /// 是否盲化
+ ///
+ public bool? IsBlind { get; set; }
+
+ ///
+ /// 是否完整
+ ///
+ public bool? IsComplete { get; set; }
+
//public List ReadingClinicalDataList { get; set; }
public List PDFFileList { get; set; } = new List();
@@ -290,7 +300,21 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
}
-
+ public class PMClinicalDataConfirmCommand
+ {
+ public Guid Id { get; set; }
+
+ ///
+ /// 是否盲化
+ ///
+ public bool? IsBlind { get; set; }
+
+ ///
+ /// 是否完整
+ ///
+ public bool? IsComplete { get; set; }
+
+ }
public class GetReadingClinicalDataListOutDto
@@ -347,6 +371,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public bool IsSign { get; set; }
+
+ ///
+ /// 是否盲化
+ ///
+ public bool? IsBlind { get; set; }
+
+ ///
+ /// 是否完整
+ ///
+ public bool? IsComplete { get; set; }
+
///
/// 文件数量
///
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs
index b5011cc92..d4bf72505 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs
@@ -147,6 +147,8 @@ namespace IRaCIS.Application.Services
FileName = x.ClinicalDataTrialSet.FileName,
UploadRole = x.ClinicalDataTrialSet.UploadRole,
Path = x.ClinicalDataTrialSet.Path,
+ IsBlind=x.IsBlind,
+ IsComplete=x.IsComplete
}).ToListAsync();
List clinicalData = (await this.GetReadingClinicalDataList(new GetReadingClinicalDataListIndto()
@@ -174,6 +176,11 @@ namespace IRaCIS.Application.Services
return cRCClinicalDataList;
}
+
+
+
+
+
///
/// 添加CRC数据类型
///
@@ -437,6 +444,19 @@ namespace IRaCIS.Application.Services
}) ;
}
+
+ [HttpPut]
+ public async Task PMClinicalDataConfirm(PMClinicalDataConfirmCommand command)
+ {
+ await _readingClinicalDataRepository.BatchUpdateNoTrackingAsync(t => t.Id == command.Id, u => new ReadingClinicalData()
+ {
+ IsBlind=command.IsBlind,
+ IsComplete=command.IsComplete
+ });
+ await _readingClinicalDataRepository.SaveChangesAsync();
+
+ return ResponseOutput.Ok();
+ }
///
/// 获取临床数据集合
///
@@ -458,6 +478,8 @@ namespace IRaCIS.Application.Services
Id = x.Id,
UploadRole = x.ClinicalDataTrialSet.UploadRole,
IsCRCUpload = x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC,
+ IsBlind=x.IsBlind,
+ IsComplete=x.IsComplete,
FileList = x.ReadingClinicalDataPDFList.Select(y => new GetFileDto()
{
Id = y.Id,
diff --git a/IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs b/IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs
index 94fdc394b..a8216bfb2 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs
@@ -52,12 +52,12 @@ namespace IRaCIS.Core.Domain.Models
///
/// 是否盲化
///
- public bool IsBlind { get; set; }
+ public bool? IsBlind { get; set; }
///
/// 是否完整
///
- public bool IsComplete { get; set; }
+ public bool? IsComplete { get; set; }
///
/// 创建人