重阅复制表单
parent
b7f22245e1
commit
120d583a5a
|
|
@ -19,6 +19,7 @@ using Microsoft.Extensions.Logging;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Linq.Dynamic.Core;
|
using System.Linq.Dynamic.Core;
|
||||||
|
using System.Threading.Tasks;
|
||||||
using Subject = IRaCIS.Core.Domain.Models.Subject;
|
using Subject = IRaCIS.Core.Domain.Models.Subject;
|
||||||
|
|
||||||
namespace IRaCIS.Core.Application.Service.Allocation;
|
namespace IRaCIS.Core.Application.Service.Allocation;
|
||||||
|
|
@ -46,6 +47,8 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
|
||||||
IRepository<DicomSeries> _dicomSeriesRepository,
|
IRepository<DicomSeries> _dicomSeriesRepository,
|
||||||
IRepository<SubjectCanceDoctor> _subjectCanceDoctorRepository,
|
IRepository<SubjectCanceDoctor> _subjectCanceDoctorRepository,
|
||||||
IRepository<ReadingTaskQuestionMark> _readingTaskQuestionMarkRepository,
|
IRepository<ReadingTaskQuestionMark> _readingTaskQuestionMarkRepository,
|
||||||
|
IRepository<ReadingNoneDicomMark> _readingNoneDicomMarkRepository,
|
||||||
|
IRepository<ReadingNoneDicomMarkBinding> _readingNoneDicomMarkBindingRepository,
|
||||||
IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository,
|
IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository,
|
||||||
//IRepository<ReadingCustomTag> _readingCustomTagRepository,
|
//IRepository<ReadingCustomTag> _readingCustomTagRepository,
|
||||||
IRepository<TaskInfluence> _taskInfluenceRepository,
|
IRepository<TaskInfluence> _taskInfluenceRepository,
|
||||||
|
|
@ -2217,7 +2220,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void CopyForms(VisitTask newTask, VisitTask origenalTask)
|
private async Task CopyForms(VisitTask newTask, VisitTask origenalTask)
|
||||||
{
|
{
|
||||||
newTask.IsCopyLesionAnswer = true;
|
newTask.IsCopyLesionAnswer = true;
|
||||||
//自定义
|
//自定义
|
||||||
|
|
@ -2308,9 +2311,37 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
|
||||||
_ = _readingTableAnswerRowInfoRepository.AddRangeAsync(readingTableAnswerRowInfoList).Result;
|
_ = _readingTableAnswerRowInfoRepository.AddRangeAsync(readingTableAnswerRowInfoList).Result;
|
||||||
|
|
||||||
|
|
||||||
|
var noneMarkList = await _readingNoneDicomMarkRepository.Where(x => x.VisitTaskId == origenalTask.Id).ToListAsync();
|
||||||
|
|
||||||
|
var noneMarkBindingList = await _readingNoneDicomMarkBindingRepository.Where(x => x.VisitTaskId == origenalTask.Id).ToListAsync();
|
||||||
|
|
||||||
|
|
||||||
|
foreach (var item in noneMarkList)
|
||||||
|
{
|
||||||
|
var newid = NewId.NextSequentialGuid();
|
||||||
|
|
||||||
|
item.MeasureData = item.MeasureData.Replace(origenalTask.Id.ToString(), newTask.Id.ToString());
|
||||||
|
item.VisitTaskId = newTask.Id;
|
||||||
|
foreach (var item1 in noneMarkBindingList)
|
||||||
|
{
|
||||||
|
if (item1.NoneDicomMarkId == item.Id)
|
||||||
|
{
|
||||||
|
item1.NoneDicomMarkId = newid;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
item.Id = newid;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
foreach (var item in noneMarkBindingList)
|
||||||
|
{
|
||||||
|
item.Id = NewId.NextSequentialGuid();
|
||||||
|
item.VisitTaskId = newTask.Id;
|
||||||
|
}
|
||||||
|
|
||||||
|
_ = _readingNoneDicomMarkRepository.AddRangeAsync(noneMarkList).Result;
|
||||||
|
_ = _readingNoneDicomMarkBindingRepository.AddRangeAsync(noneMarkBindingList).Result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,14 @@ public class ReadingNoneDicomMarkBinding : BaseAddAuditEntity
|
||||||
|
|
||||||
public Guid? TableQuestionId { get; set; }
|
public Guid? TableQuestionId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 这个是NoneDicom 的主键
|
||||||
|
/// </summary>
|
||||||
public Guid NoneDicomMarkId { get; set; }
|
public Guid NoneDicomMarkId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 这个是前端给的标记的Id
|
||||||
|
/// </summary>
|
||||||
public Guid? MarkId { get; set; }
|
public Guid? MarkId { get; set; }
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue