From 1f7fe0d8543e87ab57900158394031826a9688e6 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 18 Jul 2023 16:01:55 +0800
Subject: [PATCH] S-79
---
.../ClinicalData/ClinicalAnswerService.cs | 4 ++-
.../Service/Reading/Dto/ClinicalAnswerDto.cs | 10 ++++++
.../Reading/ReadingPeriod/ReadModule.cs | 32 ++++++++++++-------
3 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs
index d64cd33c4..b5531c3ad 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs
@@ -871,7 +871,9 @@ namespace IRaCIS.Core.Application.Service
{
await _readModuleRepository.UpdatePartialFromQueryAsync(x => inDto.ReadModuleId == x.Id, x => new ReadModule()
{
- IsPMConfirm = true
+ IsPMConfirm = true,
+ IsClinicalDataBlind=inDto.IsClinicalDataBlind,
+ IsClinicalDataComplete=inDto.IsClinicalDataComplete,
});
await _readModuleRepository.SaveChangesAsync();
await _iReadingClinicalDataService.DealVisiTaskClinicalDataSignedAsync(inDto.TrialId, inDto.SubjectId, inDto.ReadModuleId, false, readModuleData.TrialReadingCriterionId);
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs
index 22c2b30fe..1cb030cc3 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs
@@ -222,6 +222,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid ReadModuleId { get; set; }
+ ///
+ /// 临床数据是否完整
+ ///
+ public bool? IsClinicalDataComplete { get; set; }
+
+ ///
+ /// 临床数据是否盲化
+ ///
+ public bool? IsClinicalDataBlind { get; set; }
+
public bool IsConfirm { get; set; }
}
diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs
index 647451fc7..bd4d29278 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs
@@ -90,19 +90,29 @@ namespace IRaCIS.Core.Domain.Models
public Guid? DeleteUserId { get; set; }
- /////
- /////
- /////
- //public decimal VisitNum { get; set; }
+ ///
+ /// 临床数据是否完整
+ ///
+ public bool? IsClinicalDataComplete { get; set; }
- // [JsonIgnore]
- /////
- ///// 对应
- /////
- //[ForeignKey("ReadModuleId")]
- //public ReadModule ReadModuleModel { get; set; }
+ ///
+ /// 临床数据是否盲化
+ ///
+ public bool? IsClinicalDataBlind { get; set; }
- [JsonIgnore]
+ /////
+ /////
+ /////
+ //public decimal VisitNum { get; set; }
+
+ // [JsonIgnore]
+ /////
+ ///// 对应
+ /////
+ //[ForeignKey("ReadModuleId")]
+ //public ReadModule ReadModuleModel { get; set; }
+
+ [JsonIgnore]
///
/// 受试者
///