From f174a555dd3ba0b9d9dc458391d0eeb0451e5b0f Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 6 Jul 2023 17:51:41 +0800
Subject: [PATCH] S-29

---
 IRaCIS.Core.API/IRaCIS.Core.API.xml                | 14 ++++++++++++++
 .../IRaCIS.Core.Application.xml                    | 10 ++++++++++
 .../Reading/ClinicalData/ClinicalAnswerService.cs  |  6 ++++--
 .../Service/Reading/Dto/ClinicalAnswerDto.cs       |  4 ++++
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml
index 2b021e5a2..7e6ee7ae3 100644
--- a/IRaCIS.Core.API/IRaCIS.Core.API.xml
+++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml
@@ -146,6 +146,20 @@
             <param name="opt"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.PMConfirmClinical(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.CRCConfirmClinicalInDto})">
+            <summary>
+            PM确认临床数据
+            </summary>
+            <param name="opt"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.API.Controllers.InspectionController.SubmitClinicalFormAndSign(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.SubmitClinicalFormInDto})">
+            <summary>
+            提交结构化录入并签名
+            </summary>
+            <param name="opt"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.API.Controllers.InspectionController.SubmitJudgeVisitTaskResult(IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionDto{IRaCIS.Core.Application.Service.Reading.Dto.SaveJudgeVisitTaskResult})">
             <summary>
             提交阅片裁判问题
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 09ffad060..cdc61864c 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -2766,6 +2766,16 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetCRCSubjectClinicalOutDto.UploadRole">
+            <summary>
+            上传角色
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetCRCSubjectClinicalOutDto.ReadingId">
+            <summary>
+            访视Id  或者模块Id
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetCRCSubjectClinicalOutDto.ClinicalDataLevel">
             <summary>
             临床级别
diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs
index 789a32635..1c28eb9e4 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs
@@ -529,6 +529,7 @@ namespace IRaCIS.Core.Application.Service
 				.Include(x=>x.ClinicalDataTrialSet)
                 .Select(x => new CRCClinicalForm
 				{
+					SubjectId=x.SubjectId,
 					CheckDate = x.CheckDate,
 					ClinicalDataLevel = x.ClinicalDataTrialSet.ClinicalDataLevel,
 					ClinicalFormId = x.Id,
@@ -569,7 +570,8 @@ namespace IRaCIS.Core.Application.Service
                 {
                     if (x.ReadingSetType == ReadingSetType.ImageReading)
                     {
-                        x.ClinicalFormList = formList.Where(y => y.ClinicalDataLevel == ClinicalLevel.ImageRead&&y.CheckDate <= x.LatestScanDate)
+                        x.ClinicalFormList = formList.Where(y => y.ClinicalDataLevel == ClinicalLevel.ImageRead&&y.CheckDate <= x.LatestScanDate&&y.SubjectId==x.SubjectId)
+                     
 					   .Select(y => new GetCRCBeConfirmListOutDto()
 					   {
 						   CheckDate = y.CheckDate ?? default(DateTime),
@@ -582,7 +584,7 @@ namespace IRaCIS.Core.Application.Service
                     }
                     else
                     {
-						x.ClinicalFormList = formList.Where(y => y.ClinicalDataLevel == ClinicalLevel.OncologyRead&&y.CheckDate <= x.LatestScanDate)
+						x.ClinicalFormList = formList.Where(y => y.ClinicalDataLevel == ClinicalLevel.OncologyRead&&y.CheckDate <= x.LatestScanDate && y.SubjectId == x.SubjectId)
                         .Select(y => new GetCRCBeConfirmListOutDto()
 						{
 							CheckDate = y.CheckDate ?? default(DateTime),
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs
index c5bb64669..8d3fff220 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs
@@ -226,6 +226,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
 	public class CRCClinicalForm
     {
+		/// <summary>
+		/// 受试者Id
+		/// </summary>
+		public Guid SubjectId { get; set; }
 		public DateTime? CheckDate { get; set; }
 
         public Guid ClinicalFormId { get; set; }