From 37c898ea0c5e711aa6fa468874df91a248e772b7 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Mon, 5 Aug 2024 15:35:02 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Reading/ClinicalData/ReadingClinicalDataService.cs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
index cb6ef0f19..3d90c7dce 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
@@ -733,10 +733,11 @@ namespace IRaCIS.Application.Services
if (inDto.ReadingId == null)
{
var visitTask = await _visitTaskRepository.FirstOrDefaultAsync(x => x.Id == inDto.VisitTaskId);
- inDto.ReadingId = visitTask.SouceReadModuleId ?? visitTask.SourceSubjectVisitId;
+
readingNameOrTaskBlindName = visitTask.TaskBlindName;
}
-
+ inDto.SelectIsSign = false;
+ var result = await GetClinicalDataList(inDto);
if (readingNameOrTaskBlindName.IsNullOrEmpty())
{
readingNameOrTaskBlindName = await _subjectVisitRepository.Where(x => x.Id == inDto.ReadingId).Select(x => x.VisitName).FirstOrDefaultAsync();
@@ -746,8 +747,7 @@ namespace IRaCIS.Application.Services
}
}
- inDto.SelectIsSign = false;
- var result = await GetClinicalDataList(inDto);
+
var readingIds = result.Select(x => x.ReadingId).ToList();
From 2217ae03536ada645eb16c9e56cde74e7fe61c1a Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Mon, 5 Aug 2024 15:41:39 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/InspectionController.cs | 27 +++++++++++++++----
.../Interface/IReadingClinicalDataService.cs | 2 ++
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/IRaCIS.Core.API/Controllers/InspectionController.cs b/IRaCIS.Core.API/Controllers/InspectionController.cs
index e9deab588..bbeaf4e35 100644
--- a/IRaCIS.Core.API/Controllers/InspectionController.cs
+++ b/IRaCIS.Core.API/Controllers/InspectionController.cs
@@ -308,11 +308,28 @@ namespace IRaCIS.Core.API.Controllers
}
- ///
- /// 提交结构化录入并签名
- ///
- ///
- ///
+ ///
+ /// PM签名一致性分析临床数据
+ ///
+ ///
+ ///
+ [HttpPost, Route("Inspection/ReadingClinicalData/SignConsistencyAnalysisReadingClinicalData")]
+ [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+
+ [UnitOfWork]
+ public async Task SignConsistencyAnalysisReadingClinicalData(DataInspectionDto opt)
+ {
+ var singid = await _inspectionService.RecordSing(opt.SignInfo);
+ var result = await _readingClinicalDataService.SignConsistencyAnalysisReadingClinicalData(opt.Data);
+ await _inspectionService.CompletedSign(singid, result);
+ return result;
+ }
+
+ ///
+ /// 提交结构化录入并签名
+ ///
+ ///
+ ///
[HttpPost, Route("Inspection/ClinicalAnswer/SubmitClinicalFormAndSign")]
[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
diff --git a/IRaCIS.Core.Application/Service/Reading/Interface/IReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/Interface/IReadingClinicalDataService.cs
index 795bab0fc..521a9d843 100644
--- a/IRaCIS.Core.Application/Service/Reading/Interface/IReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Interface/IReadingClinicalDataService.cs
@@ -29,5 +29,7 @@ namespace IRaCIS.Core.Application.Contracts
Task DealVisiTaskClinicalDataSignedAsync(Guid trialId, Guid subjectId, Guid readingId, bool isVisit, Guid trialReadingCritrialId);
+
+ Task SignConsistencyAnalysisReadingClinicalData(SignConsistencyAnalysisReadingClinicalDataInDto inDto);
}
}
\ No newline at end of file
From 36a63d76281db5e2e1bad7079d45244359e136b6 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Mon, 5 Aug 2024 16:20:30 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Reading/ClinicalData/ReadingClinicalDataService.cs | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
index 3d90c7dce..611c72ab8 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
@@ -889,6 +889,8 @@ namespace IRaCIS.Application.Services
Id = y.Id,
FileName = y.FileName,
Path = y.Path,
+ Size=y.Size,
+ Type=y.Type,
CreateTime = y.CreateTime,
}).ToList(),
});
@@ -928,6 +930,8 @@ namespace IRaCIS.Application.Services
Id = y.Id,
FileName = y.FileName,
Path = y.Path,
+ Size = y.Size,
+ Type = y.Type,
CreateTime = y.CreateTime,
}).ToList(),
}).ToListAsync();
@@ -968,6 +972,8 @@ namespace IRaCIS.Application.Services
Id = y.Id,
FileName = y.FileName,
Path = y.Path,
+ Size = y.Size,
+ Type = y.Type,
CreateTime = y.CreateTime,
}).ToList(),
From a47e20ff74f0a07b336126f49437d66549224a37 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Mon, 5 Aug 2024 16:54:59 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Service/Reading/ClinicalData/ReadingClinicalDataService.cs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
index 611c72ab8..2277a72b8 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
@@ -1251,7 +1251,8 @@ namespace IRaCIS.Application.Services
{
IsSign = true,
IsBlind = inDto.IsBlind,
- IsComplete = inDto.IsComplete
+ IsComplete = inDto.IsComplete,
+ ReadingClinicalDataState= ReadingClinicalDataStatus.HaveSigned,
});
await _readingClinicalDataPDFRepository.SaveChangesAsync();
return ResponseOutput.Ok(pdfCount);
From 9cbfb2c7e4a37be61b47f475331bf6eec8c9b370 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Mon, 5 Aug 2024 17:08:06 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Service/Reading/ClinicalData/ReadingClinicalDataService.cs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
index 2277a72b8..b6d719184 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
@@ -878,7 +878,8 @@ namespace IRaCIS.Application.Services
CriterionEnumList = x.ClinicalDataTrialSet.CriterionEnumList,
TrialClinicalDataSetCriteriaList = x.ClinicalDataTrialSet.TrialClinicalDataSetCriteriaList,
Id = x.Id,
- UploadRole = x.ClinicalDataTrialSet.UploadRole,
+ // 这里现在都是PM上传的
+ UploadRole = UploadRole.PM,
IsCRCUpload = x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC,
IsBlind = x.IsBlind,
IsComplete = x.IsComplete,
From 75d162b353be4be4859481fab07749323cab03a5 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Mon, 5 Aug 2024 17:08:39 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Service/Reading/ClinicalData/ReadingClinicalDataService.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
index b6d719184..6ac1ad4f5 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
@@ -880,7 +880,7 @@ namespace IRaCIS.Application.Services
Id = x.Id,
// 这里现在都是PM上传的
UploadRole = UploadRole.PM,
- IsCRCUpload = x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC,
+ IsCRCUpload = false,
IsBlind = x.IsBlind,
IsComplete = x.IsComplete,
FileCount = x.FileCount,
From cda134e92c07d0d0b7a9da473ae52cd8d2bcff62 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Mon, 5 Aug 2024 17:09:05 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Service/Reading/ClinicalData/ReadingClinicalDataService.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
index 6ac1ad4f5..f33e41df5 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
@@ -878,7 +878,7 @@ namespace IRaCIS.Application.Services
CriterionEnumList = x.ClinicalDataTrialSet.CriterionEnumList,
TrialClinicalDataSetCriteriaList = x.ClinicalDataTrialSet.TrialClinicalDataSetCriteriaList,
Id = x.Id,
- // 这里现在都是PM上传的
+ // 这里现在都是PM上传的 前端会判断是否可以上传
UploadRole = UploadRole.PM,
IsCRCUpload = false,
IsBlind = x.IsBlind,