Compare commits

..

No commits in common. "9a52e30172f78b78b160cf2d85e43e8d8a5945ff" and "dd8e244e64f438516d7c9e247b0bc2a231df91e9" have entirely different histories.

2 changed files with 1 additions and 38 deletions

View File

@ -19,7 +19,6 @@ using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using System.Linq;
using System.Linq.Dynamic.Core;
using System.Threading.Tasks;
using Subject = IRaCIS.Core.Domain.Models.Subject;
namespace IRaCIS.Core.Application.Service.Allocation;
@ -47,8 +46,6 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
IRepository<DicomSeries> _dicomSeriesRepository,
IRepository<SubjectCanceDoctor> _subjectCanceDoctorRepository,
IRepository<ReadingTaskQuestionMark> _readingTaskQuestionMarkRepository,
IRepository<ReadingNoneDicomMark> _readingNoneDicomMarkRepository,
IRepository<ReadingNoneDicomMarkBinding> _readingNoneDicomMarkBindingRepository,
IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository,
//IRepository<ReadingCustomTag> _readingCustomTagRepository,
IRepository<TaskInfluence> _taskInfluenceRepository,
@ -2220,7 +2217,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
}
}
private async Task CopyForms(VisitTask newTask, VisitTask origenalTask)
private void CopyForms(VisitTask newTask, VisitTask origenalTask)
{
newTask.IsCopyLesionAnswer = true;
//自定义
@ -2311,37 +2308,9 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
_ = _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;
}

View File

@ -18,14 +18,8 @@ public class ReadingNoneDicomMarkBinding : BaseAddAuditEntity
public Guid? TableQuestionId { get; set; }
/// <summary>
/// 这个是NoneDicom 的主键
/// </summary>
public Guid NoneDicomMarkId { get; set; }
/// <summary>
/// 这个是前端给的标记的Id
/// </summary>
public Guid? MarkId { get; set; }