XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

下班提交

Uat_Study
hang 2022-08-31 18:01:17 +08:00
parent b38ea09c59
commit 50e1ba6716
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -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>

24
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -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)))
{