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

修改稽查

Uat_Study
{872297557@qq.com} 2022-12-09 12:03:40 +08:00
parent 6a007b9e37
commit 15dccc22c5
3 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs
View File

@ -18,6 +18,12 @@ namespace IRaCIS.Core.Application.Filter
private readonly string _trialOpt;
public TrialResourceFilter(IEasyCachingProvider provider, IUserInfo userInfo)
{
_provider = provider;
_userInfo = userInfo;
}
public TrialResourceFilter(IEasyCachingProvider provider, IUserInfo userInfo, string trialOpt)
{
_provider = provider;

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

@ -2305,6 +2305,11 @@
序号标记
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTableAnswerRowInfoOutDto.PicturePath">
<summary>
截图地址
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTableAnswerRowInfoOutDto.QuestionId">
<summary>
QuestionId
@ -2530,9 +2535,9 @@
任务Id
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SubmitTableQuestionInDto.PictureBaseStr">
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SubmitTableQuestionInDto.PicturePath">
<summary>
Base64编码
截图地址
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SubmitTableQuestionInDto.VisitTaskId">

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

@ -609,8 +609,13 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var taskQuestionAnswerList = entitys.Where(x => x.Entity.GetType() == typeof(ReadingTaskQuestionAnswer)).Select(t => t.Entity as ReadingTaskQuestionAnswer).ToList();
//获取问题名称 组合成数组
var quesionList = await _dbContext.ReadingQuestionTrial.Where(t => taskQuestionAnswerList.Select(k => k.ReadingQuestionTrialId).Contains(t.Id)).Select(t => new { t.QuestionName, QuestionId = t.Id,
t.DictionaryCode, t.ShowOrder }).OrderBy(t => t.ShowOrder).ToListAsync();
var quesionList = await _dbContext.ReadingQuestionTrial.Where(t => taskQuestionAnswerList.Select(k => k.ReadingQuestionTrialId).Contains(t.Id)).Select(t => new
{
t.QuestionName,
QuestionId = t.Id,
t.DictionaryCode,
t.ShowOrder
}).OrderBy(t => t.ShowOrder).ToListAsync();
var firstEntity = taskQuestionAnswerList.First();
@ -628,7 +633,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
TrialReadingCriterionId = x.ReadingQuestionCriterionTrialId,
}, new { QuestionAnswerList = taskQuestionAnswerList.Join(quesionList, t => t.ReadingQuestionTrialId, u => u.QuestionId, (t, u) => new { t.Answer, u.DictionaryCode, u.QuestionName, u.ShowOrder }).OrderBy(t => t.ShowOrder).ToList() });
}, new { QuestionAnswerList = taskQuestionAnswerList.Join(quesionList, t => t.ReadingQuestionTrialId, u => u.QuestionId, (t, u) => new { t.Answer, u.DictionaryCode, u.QuestionName, u.ShowOrder }).OrderBy(t => t.ShowOrder).ToList() });
}
@ -648,22 +653,25 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var tableQuestionAnswerList = entitys.Where(x => x.Entity.GetType() == typeof(ReadingTableQuestionAnswer)).Select(t => t.Entity as ReadingTableQuestionAnswer).Where(t => t.RowId == entity.Id).ToList();
//获取问题名称 组合成数组
var tableQuesionList = await _dbContext.ReadingTableQuestionTrial.Where(t => tableQuestionAnswerList.Select(k => k.TableQuestionId).Contains(t.Id)).Select(t =>
new {
//获取表格问题名称 组合成数组
var tableQuesionList = await _dbContext.ReadingTableQuestionTrial.Where(t => tableQuestionAnswerList.Select(k => k.TableQuestionId).Contains(t.Id)).Select(t =>
new
{
TrialReadingCriterionId = t.ReadingQuestionTrial.ReadingQuestionCriterionTrialId, //标准Id
Type = t.ReadingQuestionTrial.QuestionName, //病灶类型
t.ReadingQuestionTrial.Unit,
t.ReadingQuestionTrial.CustomUnit,
t.DictionaryCode,
t.QuestionName,
QuestionId = t.Id,
t.ShowOrder })
t.QuestionName,
QuestionId = t.Id,
t.ShowOrder
})
.OrderBy(t => t.ShowOrder).ToListAsync();
var trialReadingCriterionId = tableQuesionList.FirstOrDefault()?.TrialReadingCriterionId;
//获取表名称 类型名称(病灶类型)
var tableName = await _dbContext.ReadingQuestionTrial.Where(t => t.Id == entity.QuestionId).Select(t => t.QuestionName).FirstOrDefaultAsync();
await InsertInspection<ReadingTableAnswerRowInfo>(entity, type, x => new InspectionConvertDTO()
{
@ -675,15 +683,18 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}, new
{
TableName= tableName,
QuestionAnswerList =
//需要手动添加病灶类型
tableQuestionAnswerList.Join(tableQuesionList, t => t.TableQuestionId, u => u.QuestionId, (t, u) =>
new {
t.Answer /*u.Unit==ValueUnit.Custom? t.Answer+u.CustomUnit:(u.Unit != ValueUnit.None|| u.Unit != null)*/,
tableQuestionAnswerList.Join(tableQuesionList, t => t.TableQuestionId, u => u.QuestionId, (t, u) =>
new
{
t.Answer /*u.Unit==ValueUnit.Custom? t.Answer+u.CustomUnit:(u.Unit != ValueUnit.None|| u.Unit != null)*/,
u.QuestionName,
u.DictionaryCode,
u.ShowOrder }
u.ShowOrder
}
).OrderBy(t => t.ShowOrder).ToList()
});