XCKJ
/
EI-Image-Viewer-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x

Test.EIImageViewer
{872297557@qq.com} 2023-01-06 09:47:15 +08:00
parent 0cd9d1867c
commit 6e6974bfdd
2 changed files with 47 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Domain/SQLFile/Test.sql
View File

@ -193,3 +193,5 @@ inner join ReadingMedicineQuestionAnswer on ReadingMedicineQuestionAnswer.TaskMe
update frontAuditConfig set DictionaryCode ='' where Code='AuditState' and DictionaryCode='AuditState' update frontAuditConfig set DictionaryCode ='' where Code='AuditState' and DictionaryCode='AuditState'
----正式环境 修改TrialCode 错误的

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

@ -1914,6 +1914,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var list = entitys.Where(x => x.Entity.GetType() == typeof(ReadingGlobalTaskInfo)).Select(t => t.Entity as ReadingGlobalTaskInfo); var list = entitys.Where(x => x.Entity.GetType() == typeof(ReadingGlobalTaskInfo)).Select(t => t.Entity as ReadingGlobalTaskInfo);
var objList = new List<object>();
foreach (var group in list.GroupBy(t => t.TaskId)) foreach (var group in list.GroupBy(t => t.TaskId))
{ {
@ -1924,7 +1925,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var quesionList = await _dbContext.ReadingQuestionTrial.Where(t => questionIdList.Contains(t.Id)).Select(t => new var quesionList = await _dbContext.ReadingQuestionTrial.Where(t => questionIdList.Contains(t.Id)).Select(t => new
{ {
t.QuestionName, t.QuestionName,
QuestionId = t.Id, QuestionId = t.Id,
t.DictionaryCode, t.DictionaryCode,
@ -1935,41 +1935,61 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//获取访视的评估结果 也要记录稽查 //获取访视的评估结果 也要记录稽查
var visitAnswerList = await _dbContext.ReadingTaskQuestionAnswer.Where(t => t.VisitTaskId == group.Key && questionIdList.Contains(t.ReadingQuestionTrialId)).Select(u => new var visitAnswerList = await _dbContext.ReadingTaskQuestionAnswer.Where(t => t.VisitTaskId == group.Key && questionIdList.Contains(t.ReadingQuestionTrialId)).Select(u => new
{ {
TaskBlindName = u.VisitTask.TaskBlindName,
QuestionId = u.ReadingQuestionTrialId, QuestionId = u.ReadingQuestionTrialId,
u.Answer u.Answer
}).ToListAsync(); }).ToListAsync();
var obj = new
var firstEntity = questionAnswerList.First();
var cloneEntity = firstEntity.Clone();
//保证Id 唯一
cloneEntity.Id = IdentifierHelper.CreateGuid(firstEntity.GlobalTaskId.ToString(), firstEntity.TaskId.ToString());
var trialReadingCriterionId = await _dbContext.VisitTask.Where(t => t.Id == cloneEntity.GlobalTaskId).Select(t => t.TrialReadingCriterionId).FirstOrDefaultAsync();
await InsertInspection<ReadingGlobalTaskInfo>(cloneEntity, type, x => new InspectionConvertDTO()
{
VisitTaskId = x.TaskId,
TrialReadingCriterionId = trialReadingCriterionId,
ObjectRelationParentId = x.TaskId,
}, new
{ {
TaskBlindName=visitAnswerList.Select(t=>t.TaskBlindName).FirstOrDefault(),
VisitQuestionAnswerList = visitAnswerList.Join(quesionList, t => t.QuestionId, u => u.QuestionId, (t, u) => new { t.Answer, u.QuestionName, u.DictionaryCode, u.ShowOrder }).OrderBy(t => t.ShowOrder).ToList(), VisitQuestionAnswerList = visitAnswerList.Join(quesionList, t => t.QuestionId, u => u.QuestionId, (t, u) => new { t.Answer, u.QuestionName, u.DictionaryCode, u.ShowOrder }).OrderBy(t => t.ShowOrder).ToList(),
Reason = group.Where(t => t.QuestionId == null && t.GlobalAnswerType == GlobalAnswerType.Reason).FirstOrDefault()?.Answer, Reason = group.Where(t => t.QuestionId == null && t.GlobalAnswerType == GlobalAnswerType.Reason).FirstOrDefault()?.Answer,
AgreeOrNot = group.Where(t => t.QuestionId == null && t.GlobalAnswerType == GlobalAnswerType.AgreeOrNot).FirstOrDefault()?.Answer, AgreeOrNot = group.Where(t => t.QuestionId == null && t.GlobalAnswerType == GlobalAnswerType.AgreeOrNot).FirstOrDefault()?.Answer,
UpdateType = group.Where(t => t.QuestionId == null && t.GlobalAnswerType == GlobalAnswerType.UpdateType).FirstOrDefault()?.Answer, UpdateType = group.Where(t => t.QuestionId == null && t.GlobalAnswerType == GlobalAnswerType.UpdateType).FirstOrDefault()?.Answer,
QuestionAnswerList = questionAnswerList.Join(quesionList, t => t.QuestionId, u => u.QuestionId, (t, u) => new { t.Answer, u.QuestionName, u.DictionaryCode, u.ShowOrder }).OrderBy(t => t.ShowOrder).ToList() QuestionAnswerList = questionAnswerList.Join(quesionList, t => t.QuestionId, u => u.QuestionId, (t, u) => new { t.Answer, u.QuestionName, u.DictionaryCode, u.ShowOrder }).OrderBy(t => t.ShowOrder).ToList()
}); };
objList.Add(obj);
#region 因为要记录一个表 所以这里屏蔽
//var firstEntity = questionAnswerList.First();
//var cloneEntity = firstEntity.Clone();
////保证Id 唯一
//cloneEntity.Id = IdentifierHelper.CreateGuid(firstEntity.GlobalTaskId.ToString(), firstEntity.TaskId.ToString());
//var trialReadingCriterionId = await _dbContext.VisitTask.Where(t => t.Id == cloneEntity.GlobalTaskId).Select(t => t.TrialReadingCriterionId).FirstOrDefaultAsync();
//await InsertInspection<ReadingGlobalTaskInfo>(cloneEntity, type, x => new InspectionConvertDTO()
//{
// VisitTaskId = x.TaskId,
// TrialReadingCriterionId = trialReadingCriterionId,
// ObjectRelationParentId = x.TaskId,
//}, obj);
#endregion
} }
var firstEntity = list.Where(t => t.QuestionId != null).First();
var cloneEntity = firstEntity.Clone();
var trialReadingCriterionId = await _dbContext.VisitTask.Where(t => t.Id == cloneEntity.GlobalTaskId).Select(t => t.TrialReadingCriterionId).FirstOrDefaultAsync();
//保证Id 唯一
cloneEntity.Id = IdentifierHelper.CreateGuid(firstEntity.GlobalTaskId.ToString(), trialReadingCriterionId.ToString());
await InsertInspection<ReadingGlobalTaskInfo>(cloneEntity, type, x => new InspectionConvertDTO()
{
VisitTaskId = x.TaskId,
TrialReadingCriterionId = trialReadingCriterionId,
ObjectRelationParentId = x.TaskId,
}, new { GlobalAnswerList = objList } );
} }