From 50e1ba6716bb4347c5a2b138543f475ebeb5237b Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 31 Aug 2022 18:01:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E7=8F=AD=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IRaCIS.Core.Application.xml               |  4 ++--
 .../Common/AuditingData.cs                    | 24 ++++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 4d6ee0e49..a0c004152 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -3672,13 +3672,13 @@
         </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingMedicalReviewService.SaveMedicineQuestion(IRaCIS.Core.Application.Service.Reading.Dto.SaveMedicineQuestionInDto)">
             <summary>
-            保存医学审核问题
+            保存医学审核问题 答案
             </summary>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingMedicalReviewService.SaveMedicalReviewInfo(IRaCIS.Core.Application.Service.Reading.Dto.SaveMedicalReviewInfoInDto)">
             <summary>
-            保存医学审核信息
+            保存医学审核 结论
             </summary>
             <param name="inDto"></param>
             <returns></returns>
diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index 4bf05a630..2cc97ec45 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
@@ -135,8 +135,16 @@ namespace IRaCIS.Core.Infra.EFCore.Common
             }
 
 
-            // 系统文件签署  父层级未记录稽查（系统文档初始数据）
-            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(SystemDocConfirmedUser)))
+     
+
+
+                #endregion
+
+
+                #region 已修改
+
+                // 系统文件签署  父层级未记录稽查（系统文档初始数据）
+                foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(SystemDocConfirmedUser)))
             {
                 var type = GetEntityAuditOpt(item);
 
@@ -206,7 +214,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
                 var trialQuestionIdList = list.Select(t => t.TrialQCQuestionConfigureId);
 
-                var trialQuestionNameList = await _dbContext.TrialQCQuestionConfigure.Where(x => x.TrialId==firstEntity.TrialId).Select(t => new { t.QuestionName , TrialQCQuestionConfigureId = t.Id,t.ShowOrder} ).ToListAsync();
+                var trialQuestionNameList = await _dbContext.TrialQCQuestionConfigure.Where(x => x.TrialId == firstEntity.TrialId).Select(t => new { t.QuestionName, TrialQCQuestionConfigureId = t.Id, t.ShowOrder }).ToListAsync();
 
                 var beforeAnswerList = await _dbContext.TrialQCQuestionAnswer.Where(x => x.SubjectVisitId == firstEntity.SubjectVisitId && x.CurrentQCEnum == firstEntity.CurrentQCEnum && x.QCProcessEnum == firstEntity.QCProcessEnum)
                     .Select(u => new { u.TrialQCQuestionConfigureId, u.Answer }).ToListAsync();
@@ -226,10 +234,10 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     ObjectRelationParentId = x.SubjectVisitId,
                 }, new
                 {
-                    QcQuestionAnswerList = answerList.Join(trialQuestionNameList, t=>t.TrialQCQuestionConfigureId,u=>u.TrialQCQuestionConfigureId,(t,u)=>new {t.Answer,u.QuestionName,u.ShowOrder}).OrderBy(t=>t.ShowOrder).ToList(),
+                    QcQuestionAnswerList = answerList.Join(trialQuestionNameList, t => t.TrialQCQuestionConfigureId, u => u.TrialQCQuestionConfigureId, (t, u) => new { t.Answer, u.QuestionName, u.ShowOrder }).OrderBy(t => t.ShowOrder).ToList(),
                 });
 
-         
+
 
 
                 #region OLd
@@ -308,12 +316,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
 
 
-            #endregion
-
-
-            #region 已修改
-
-
             //QC 质疑
             foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(QCChallenge)))
             {