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

稽查修改
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
he 2025-07-04 10:45:55 +08:00
parent e898f17873
commit e0fef9f4ca
2 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
View File

@ -1899,22 +1899,22 @@ namespace IRaCIS.Core.Application.Service
public async Task<IResponseOutput> SaveTaskQuestion(ChangeDicomReadingQuestionAnswerInDto inDto, string param) public async Task<IResponseOutput> SaveTaskQuestion(ChangeDicomReadingQuestionAnswerInDto inDto, string param)
{ {
// 当 param == -10 时，为自定义标准 需要区分 绑定 更改 标记 // 当 param == -10 时，为自定义标准 需要区分 绑定 更改 标记
//if (param == "-10") if (param == "-10")
//{ {
// var questionMarkList = inDto.QuestionMarkInfoList.Select(x => x.QuestionId ).ToList(); var questionMarkList = inDto.QuestionMarkInfoList.Select(x => x.QuestionId).ToList();
// if (!(await _readingTaskQuestionMarkRepository.AnyAsync(x => x.VisitTaskId == inDto.VisitTaskId && questionMarkList.Contains(x.QuestionId))) && inDto.QuestionMarkInfoList.Count() > 0) if (!(await _readingTaskQuestionMarkRepository.AnyAsync(x => x.VisitTaskId == inDto.VisitTaskId && questionMarkList.Contains(x.QuestionId))) && inDto.QuestionMarkInfoList.Count() > 0)
// { {
// _userInfo.AuditIdentification = "AddMark"; _userInfo.AuditIdentification = "AddMark";
// } }
// else if (await _readingTaskQuestionMarkRepository.AnyAsync(x => x.VisitTaskId == inDto.VisitTaskId && questionMarkList.Contains(x.QuestionId))) else if (await _readingTaskQuestionMarkRepository.AnyAsync(x => x.VisitTaskId == inDto.VisitTaskId && questionMarkList.Contains(x.QuestionId)))
// { {
// _userInfo.AuditIdentification = "UpdateMark"; _userInfo.AuditIdentification = "UpdateMark";
// } }
// else else
// { {
// _userInfo.AuditIdentification = "DeleteMark"; _userInfo.AuditIdentification = "DeleteMark";
// } }
//} }
var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Include(x => x.TrialReadingCriterion).FirstNotNullAsync(); var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Include(x => x.TrialReadingCriterion).FirstNotNullAsync();
try try

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

@ -6,6 +6,7 @@ using MassTransit;
using Microsoft.EntityFrameworkCore.ChangeTracking; using Microsoft.EntityFrameworkCore.ChangeTracking;
using Microsoft.EntityFrameworkCore.ChangeTracking.Internal; using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace IRaCIS.Core.Infra.EFCore.Common namespace IRaCIS.Core.Infra.EFCore.Common
@ -3134,6 +3135,19 @@ namespace IRaCIS.Core.Infra.EFCore.Common
} }
var mark = entitys.Where(x => x.Entity.GetType() == typeof(ReadingTaskQuestionMark)).Select(x=>x.Entity as ReadingTaskQuestionMark).FirstOrDefault();
var markName=string.Empty;
if (mark != null && mark.MeasureData.IsNotNullOrEmpty())
{
// 解析 JSON 字符串
JObject jsonObject = JObject.Parse(mark.MeasureData);
// 提取 label 的值
markName = jsonObject["data"]["label"].ToString();
}
await InsertInspection<ReadingTaskQuestionAnswer>(cloneEntity, type, x => new InspectionConvertDTO() await InsertInspection<ReadingTaskQuestionAnswer>(cloneEntity, type, x => new InspectionConvertDTO()
{ {
VisitTaskId = x.VisitTaskId, VisitTaskId = x.VisitTaskId,
@ -3146,6 +3160,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}, new }, new
{ {
MarkName= markName,
PicturePath= mark!=null?mark.PicturePath:string.Empty,
QuestionAnswerList = taskQuestionAnswerList.Join(quesionList, QuestionAnswerList = taskQuestionAnswerList.Join(quesionList,
t => t.ReadingQuestionTrialId, t => t.ReadingQuestionTrialId,
u => u.QuestionId, u => u.QuestionId,
@ -3160,7 +3177,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}).OrderBy(t => t.ShowOrder).ToList() }).OrderBy(t => t.ShowOrder).ToList()
, ,
TableQuestionAndAnswerList = tableQuesionAndAnswerList TableQuestionAndAnswerList = tableQuesionAndAnswerList
} }, _userInfo.AuditIdentification
); );