diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 71bf4b20b..13c97baf1 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -1713,6 +1713,11 @@
泛型
+
+
+ 标准枚举
+
+
父标识
@@ -14468,6 +14473,11 @@
FrontAuditConfigAddOrEdit 列表查询参数模型
+
+
+ 适用的标准
+
+
字段的英文值
diff --git a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
index b80616b31..3e609a365 100644
--- a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
@@ -138,6 +138,12 @@ namespace IRaCIS.Core.Application.ViewModel
public class FrontAuditConfigAddOrEdit
{
public Guid? Id { get; set; }
+
+ ///
+ /// 适用的标准
+ ///
+ public List ApplyCriterionList { get; set; } = new List() { };
+
public string Value { get; set; } = string.Empty;
public string ValueCN { get; set; } = string.Empty;
public string Description { get; set; } = string.Empty;
diff --git a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
index 51924f190..e77c0c445 100644
--- a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
+++ b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
@@ -360,7 +360,10 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
public string ModuleTypeName { get; set; } = string.Empty;
public string ModuleTypeNameCN { get; set; } = string.Empty;
-
+ ///
+ /// 标准枚举
+ ///
+ public CriterionType? CriterionType { get; set; }
public string SignText { get; set; } = string.Empty;
public decimal? VisitNum { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
index 6562afe35..1df4b67c2 100644
--- a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
+++ b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
@@ -13,6 +13,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
IRepository _dictionaryRepository,
IRepository _identityUserRepository,
IRepository _trialSignRepository,
+ IRepository _readingQuestionCriterionTrialRepository,
IRepository _userRoleRepository,
IRepository _trialSiteRepository,
IRepository _trialRepository,
@@ -43,6 +44,9 @@ namespace IRaCIS.Core.Application.Service.Inspection
join trial in _trialRepository.Where().IgnoreQueryFilters() on data.TrialId equals trial.Id into trialtemp
from leftrial in trialtemp.DefaultIfEmpty()
+ join readingQuestionCriterionTrial in _readingQuestionCriterionTrialRepository.Where().IgnoreQueryFilters() on data.TrialReadingCriterionId equals readingQuestionCriterionTrial.Id into readingQuestionCriterionTrialtemp
+ from leftreadingQuestionCriterionTrial in readingQuestionCriterionTrialtemp.DefaultIfEmpty()
+
join trialSite in _trialSiteRepository.Where().IgnoreQueryFilters() on data.TrialSiteId equals trialSite.Id into trialSitetemp
from lefttrialSite in trialSitetemp.DefaultIfEmpty()
@@ -95,6 +99,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
select new GetDataInspectionOutDto()
{
CreateTime = data.CreateTime,
+ CriterionType= leftreadingQuestionCriterionTrial==null? null: leftreadingQuestionCriterionTrial.CriterionType,
CreateUserId = data.CreateUserId,
ModuleTypeId = leftmoduleTypec.Id,
BlindName = data.VisitTask.TaskBlindName,
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 140e8df80..aaaf37895 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -1570,14 +1570,7 @@ namespace IRaCIS.Core.Application.Service
QuestionMark.IsLymph,
};
- tableAnswers.ForEach(x =>
- {
- x.Id = NewId.NextGuid();
- x.RowIndex = newRowIndex;
- x.VisitTaskId = inDto.VisitTaskId;
- x.RowId = rowAnswer.Id;
- x.Answer = needSaveMark.Contains(x.QuestionMark) ? x.Answer : string.Empty;
- });
+
switch (taskInfo.TrialReadingCriterion.CriterionType)
{
@@ -1624,7 +1617,27 @@ namespace IRaCIS.Core.Application.Service
x.Answer = needSetNa.Contains(x.QuestionMark) ? "NA" : x.Answer;
});
break;
+
+ case CriterionType.mRECISTHCC:
+ needSaveMark = new List()
+ {
+ QuestionMark.Organ,
+ QuestionMark.Location,
+ QuestionMark.Part,
+ QuestionMark.IsLymph,
+ QuestionMark.TypicalIntrahepaticLesion,
+ };
+ break;
}
+
+ tableAnswers.ForEach(x =>
+ {
+ x.Id = NewId.NextGuid();
+ x.RowIndex = newRowIndex;
+ x.VisitTaskId = inDto.VisitTaskId;
+ x.RowId = rowAnswer.Id;
+ x.Answer = needSaveMark.Contains(x.QuestionMark) ? x.Answer : string.Empty;
+ });
await _readingTableAnswerRowInfoRepository.AddAsync(rowAnswer);
await _readingTableQuestionAnswerRepository.AddRangeAsync(_mapper.Map>(tableAnswers));
await _readingTableAnswerRowInfoRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.RowId, x => new ReadingTableAnswerRowInfo()
@@ -1975,7 +1988,7 @@ namespace IRaCIS.Core.Application.Service
var index = await _readingCalculateService.GetDeleteLesionStatrIndex(inDto);
- await _readingTableQuestionAnswerRepository.BatchUpdateNoTrackingAsync(x => x.RowId == inDto.RowId, x => new ReadingTableQuestionAnswer()
+ await _readingTableQuestionAnswerRepository.UpdatePartialFromQueryAsync(x => x.RowId == inDto.RowId, x => new ReadingTableQuestionAnswer()
{
IsDeleted = true
@@ -3020,6 +3033,7 @@ namespace IRaCIS.Core.Application.Service
await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => x.Id == task.VisitTaskId && x.TaskState == TaskState.Effect && x.ReadingTaskState != ReadingTaskState.HaveSigned, x => new VisitTask()
{
+
FirstReadingTime = DateTime.Now,
});
await _visitTaskRepository.SaveChangesAsync();
diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
index ad7e72069..2f82098a7 100644
--- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
@@ -161,7 +161,8 @@ namespace IRaCIS.Core.Application.Service
CreateMap().ForMember(dest => dest.CreateUserRole, opt => opt.Ignore());
CreateMap()
- .ForMember(d => d.OriginalId, u => u.MapFrom(s => s.Id));
+ .ForMember(d => d.OriginalId, u => u.MapFrom(s => s.Id))
+ .ForMember(d => d.LesionType, u => u.MapFrom(s => s.ReadingQuestionTrial.LesionType));
//.ForMember(dest => dest.Instance, opt => opt.Ignore())
//.ForMember(dest => dest.ReadingQuestionTrial, opt => opt.Ignore());
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
index 300adf37c..f2de7e2d3 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
@@ -382,6 +382,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{
await _visitTaskRepository.UpdatePartialFromQueryAsync(inDto.VisitTaskId, x => new VisitTask()
{
+ SubjectCriterionClaimUserId=_userInfo.UserRoleId,
ReadingTaskState = ReadingTaskState.Reading,
}, true);
}
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
index 0fe1e81a2..d00efab66 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
@@ -1,4 +1,7 @@
using DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.MsForms;
+using IRaCIS.Application.Contracts;
+using IRaCIS.Core.Application.Contracts;
+using IRaCIS.Core.Application.Helper;
using IRaCIS.Core.Application.Service.Reading.Dto;
using IRaCIS.Core.Application.ViewModel;
using IRaCIS.Core.Domain.Share;
@@ -6,7 +9,11 @@ using IRaCIS.Core.Infra.EFCore.Common;
using IRaCIS.Core.Infrastructure;
using MassTransit;
using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using MiniSoftware;
using Newtonsoft.Json;
+using System.Runtime.InteropServices;
namespace IRaCIS.Core.Application.Service.ReadingCalculate
{
@@ -14,6 +21,15 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
[ApiExplorerSettings(GroupName = "Reading")]
public class MRECISTHCCCalculateService(IRepository _readingTableQuestionAnswerRepository,
IRepository _visitTaskRepository,
+ IRepository _subjectRepository,
+ IRepository _userRoleRepository,
+ IServiceProvider ServiceProvider,
+ IRepository _hIRHospitalRepository,
+ IRepository _dicomInstanceRepository,
+ IOptionsMonitor _hospital,
+ IRepository _dictionaryRepository,
+ IRepository _dicomStudyRepository,
+ IRepository _subjectPatientRepository,
IRepository _readingQuestionCriterionTrialRepository,
IRepository _readingTableQuestionTrialRepository,
IRepository _readingTableAnswerRowInfoRepository,
@@ -26,19 +42,468 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
IRepository _readingTaskQuestionAnswerRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICriterionCalculateService
{
+ ///
+ /// 获取肿瘤评估报告
+ ///
+ ///
+ ///
+ public async Task DownLoadTumorEvaluationStream(DownLoadReadReportInDto inDto)
+ {
+ var downFile = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $@"wwwroot/ReadReoprtTemplate/downLoad/{inDto.DownLoadGuid}");
+ Directory.CreateDirectory(downFile);
+
+ var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId && x.ReadingCategory == ReadingCategory.Visit)
+ .Include(x => x.TrialReadingCriterion).FirstNotNullAsync();
+ var visitInfo = await _subjectVisitRepository.Where(x => x.Id == taskinfo.SourceSubjectVisitId).Include(x => x.StudyList).FirstNotNullAsync();
+ var subjectInfo = await _subjectRepository.Where(x => x.Id == taskinfo.SubjectId).Include(x => x.Trial).Include(x => x.SubjectPatientList).FirstNotNullAsync();
+ var subjectPatientList = await _subjectPatientRepository.Where(x => x.SubjectId == subjectInfo.Id).Include(x => x.Patient).ToListAsync();
+ var trialQuestion = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == taskinfo.TrialReadingCriterionId).ToListAsync();
+ var tableQuestion = await _readingTableQuestionTrialRepository.Where(x => x.ReadingQuestionTrial.ReadingQuestionCriterionTrialId == taskinfo.TrialReadingCriterionId).ToListAsync();
+ var dicotionCode = trialQuestion.Where(x => x.DictionaryCode != string.Empty).Select(x => x.DictionaryCode).Distinct().ToList();
+ dicotionCode.AddRange(tableQuestion.Where(x => x.DictionaryCode != string.Empty).Select(x => x.DictionaryCode).Distinct());
+ var dictionList = await _dictionaryRepository.Where(x => dicotionCode.Contains(x.Code)).Include(x => x.ChildList).ToListAsync();
+ var unitDictionary = await _dictionaryRepository.Where(x => x.Code == "ValueUnit").Include(x => x.ChildList).ToListAsync();
+
+ var relatedVisitTask = await ServiceProvider.GetService().GetRelatedVisitTask(new GetRelatedVisitTaskInDto()
+ {
+ VisitTaskId = inDto.VisitTaskId
+ });
+
+ var relatedTaskIds = relatedVisitTask.Item1.Select(x => x.VisitTaskId).ToList();
+
+ var answerList = await _readingTaskQuestionAnswerRepository.Where(x => relatedTaskIds.Contains(x.VisitTaskId)).Include(x => x.ReadingQuestionTrial).ToListAsync();
+
+ var rowinfoList = await _readingTableAnswerRowInfoRepository.Where(x => relatedTaskIds.Contains(x.VisitTaskId)).Include(x => x.VisitTask).Include(x => x.ReadingQuestionTrial).ToListAsync();
+
+ var instanceIdList = rowinfoList.Select(x => x.InstanceId).ToList();
+ var instanceList = await _dicomInstanceRepository.Where(x => instanceIdList.Contains(x.Id)).Include(x => x.DicomSerie.DicomStudy).ToListAsync();
+
+ var tableAnswerList = await _readingTableQuestionAnswerRepository.Where(x => relatedTaskIds.Contains(x.VisitTaskId)).Include(x => x.ReadingQuestionTrial).Include(x => x.ReadingTableQuestionTrial).ToListAsync();
+ var taskinfoList = await _visitTaskRepository.Where(x => relatedTaskIds.Contains(x.Id))
+ .Include(x => x.SourceSubjectVisit).Include(x => x.SourceSubjectVisit.StudyList)
+ .Include(x => x.DoctorUser).ToListAsync();
+
+ List exportVisitDatas = taskinfoList
+ .Select(x => new ExportVisitData()
+ {
+ VisitName = x.SourceSubjectVisit.VisitName,
+ VisitNum = x.VisitTaskNum,
+ CheckDate = string.Join(",", x.SourceSubjectVisit.StudyList.Where(x => x.StudyTime != null).Select(x => x.StudyTime.Value.ToString("yyyy-MM-dd"))),
+ CheckInfoList = x.SourceSubjectVisit.StudyList.Select(x => new DicomStudyInfo()
+ {
+ BodyPartExamined = x.BodyPartExamined,
+ Modalities = x.Modalities
+ }).ToList(),
+ HaveNewLesion = _generalCalculateService.GetTaskanswer(answerList, dictionList, unitDictionary, x.Id, QuestionType.NewLesions),
+ TargetResult = _generalCalculateService.GetTaskanswer(answerList, dictionList, unitDictionary, x.Id, QuestionType.TargetLesion),
+ NoTargetResult = _generalCalculateService.GetTaskanswer(answerList, dictionList, unitDictionary, x.Id, QuestionType.NoTargetLesion),
+ OverallResult = _generalCalculateService.GetTaskanswer(answerList, dictionList, unitDictionary, x.Id, QuestionType.Tumor),
+ DoctorName = x.DoctorUser.LastName + x.DoctorUser.FirstName,
+ SignTime = x.SignTime?.ToString("yyyy-MM-dd HH:mm:ss"),
+ VisitTargetInfoList = getLesionInfo(LesionType.TargetLesion, x.Id),
+ VisitNoTargetInfoList = getLesionInfo(LesionType.NonTargetLesions, x.Id),
+ }).OrderBy(x => x.VisitNum).ToList();
+
+
+ #region 两个函数
+ List getLesionInfo(LesionType lesionType, Guid Visittaskid)
+ {
+ var targetFocus = rowinfoList.Where(x => x.VisitTaskId == Visittaskid && x.ReadingQuestionTrial.LesionType == lesionType).OrderBy(x => x.RowIndex).ToList();
+
+
+ var targetInfo = new List();
+
+ int num = 1;
+ foreach (var item in targetFocus)
+ {
+
+ VisitLesionInfo target = new VisitLesionInfo
+ {
+ RowMark = rowinfoList.Where(x => x.VisitTaskId == Visittaskid && x.RowIndex == item.RowIndex && x.ReadingQuestionTrial.LesionType == lesionType).Select(x => x.RowMark).FirstIsNullReturnEmpty(),
+ Organ = _generalCalculateService.GetTaskTableAnswer(tableAnswerList, dictionList, unitDictionary, Visittaskid, lesionType, QuestionMark.Organ, item.RowIndex),
+ Part = _generalCalculateService.GetTaskTableAnswer(tableAnswerList, dictionList, unitDictionary, Visittaskid, lesionType, QuestionMark.Part, item.RowIndex),
+ Number = num,
+ StudyCode = instanceList.Where(x => x.Id == item.InstanceId).Select(x => x.DicomSerie.DicomStudy.Code).FirstOrDefault(),
+ RowId = item.Id,
+ SeriesNumber = instanceList.Where(x => x.Id == item.InstanceId).Select(x => x.DicomSerie.SeriesNumber).FirstOrDefault(),
+ InstanceNumber = instanceList.Where(x => x.Id == item.InstanceId).Select(x => x.InstanceNumber).FirstOrDefault(),
+ VisitLength = getStateInfo(item.VisitTaskId, item.RowIndex, lesionType),
+ };
+ targetInfo.Add(target);
+ num++;
+
+ }
+ if (lesionType == LesionType.TargetLesion)
+ {
+ for (int i = num; i <= 5; i++)
+ {
+ VisitLesionInfo target = new VisitLesionInfo
+ {
+ Number = i,
+ };
+ targetInfo.Add(target);
+
+ }
+
+ }
+
+ return targetInfo;
+ }
+
+ decimal getStateInfo(Guid visitTaskid, decimal item, LesionType lesionType)
+ {
+ // 非淋巴结取长径 淋巴结取长短径
+ var state = _generalCalculateService.GetTaskTableAnswer(tableAnswerList, dictionList, unitDictionary, visitTaskid, lesionType, QuestionMark.State, item);
+ var majorAxis = _generalCalculateService.GetTaskTableAnswer(tableAnswerList, dictionList, unitDictionary, visitTaskid, lesionType, QuestionMark.MajorAxis, item, false);
+
+ var isLymph = _generalCalculateService.GetTaskTableAnswer(tableAnswerList, dictionList, unitDictionary, visitTaskid, lesionType, QuestionMark.IsLymph, item);
+ var shortAxis = _generalCalculateService.GetTaskTableAnswer(tableAnswerList, dictionList, unitDictionary, visitTaskid, lesionType, QuestionMark.ShortAxis, item, false);
+
+ var result = string.Empty;
+
+ if (!majorAxis.IsNullOrEmpty())
+ {
+ result = majorAxis;
+
+ }
+
+ if (isLymph.EqEnum(YesOrNoOrNa.Yes) && !shortAxis.IsNullOrEmpty())
+ {
+ result = shortAxis;
+ }
+
+ return result.IsNullOrEmptyReturn0();
+
+ }
+ #endregion
+
+ var researchProgramNo = subjectInfo.Trial.ResearchProgramNo;
+ var subjectName = subjectInfo.ShortName;
+ var subjectCode = subjectPatientList.Select(x => x.Patient).OrderByDescending(x => x.CreateTime).Select(x => x.PatientIdStr).FirstIsNullReturnEmpty();
+
+
+
+ List resultdata = new List();
+ List times = new List() { "One", "Two", "Three" };
+ List columns = new List() { "VisitName", "CheckDate", "CheckInfoStr", "HaveNewLesion", "TargetResult", "NoTargetResult", "OverallResult", "DoctorSignTime" };
+
+ var forCount = (int)Math.Ceiling((double)exportVisitDatas.Count() / 3);
+ for (int i = 0; i < forCount; i++)
+ {
+ ExportTumorEvaluationInfo export = new ExportTumorEvaluationInfo
+ {
+ ResearchProgramNo = researchProgramNo,
+ SubjectName = subjectName,
+ SubjectCode = subjectCode,
+ VisitList = exportVisitDatas.Skip(i * 3).Take(3).ToList(),
+ };
+
+ export.Lesion = new ExportData()
+ {
+ OneTargetSum = export.VisitOne.TargetSum.ToString(),
+ TwoTargetSum = export.VisitTwo.VisitTargetInfoList.Count() > 0 ? export.VisitTwo.TargetSum.ToString() : string.Empty,
+ ThreeTargetSum = export.VisitThree.VisitTargetInfoList.Count() > 0 ? export.VisitThree.TargetSum.ToString() : string.Empty,
+
+
+ };
+ foreach (var time in times)
+ {
+ foreach (var column in columns)
+ {
+ _generalCalculateService.SetPropertyDynamically(export.Lesion, column, export, time);
+ }
+
+ }
+
+ if (i >= forCount - 1)
+ {
+ export.IsLastPage = true;
+ // 之后最后一个任务需要签名
+ var thisVisitListNum = export.VisitList.Count();
+ switch (thisVisitListNum)
+ {
+ case 1:
+ export.Lesion.OneDoctorSign = "签字：";
+ break;
+ case 2:
+ export.Lesion.TwoDoctorSign = "签字：";
+ break;
+ case 3:
+ export.Lesion.ThreeDoctorSign = "签字：";
+ break;
+ }
+
+ }
+ resultdata.Add(export);
+ }
+
+
+
+
+
+ var value = new
+ {
+ VisitTaskList = resultdata,
+ IsLastPage = false,
+ };
+
+
+ var templatePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"wwwroot/ReadReoprtTemplate/TumorEvaluation_RECIST1.1_CN_V1.docx");
+ var outputFilePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $@"wwwroot/ReadReoprtTemplate/downLoad/{inDto.DownLoadGuid}.docx");
+
+
+ MiniWord.SaveAsByTemplate(outputFilePath, templatePath, value);
+
+
+ //// 获取文件夹中的所有文件路径
+ Directory.Delete(downFile, true);
+
+ if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+ {
+ Stream stream = _generalCalculateService.ReadAndReturnStream(outputFilePath);
+ return stream;
+ }
+ else
+ {
+
+ var pdfurl = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"wwwroot/ReadReoprtTemplate/downLoad");
+ FileConvertHelper.ConvertWordToPdf(outputFilePath, pdfurl);
+ Stream stream = _generalCalculateService.ReadAndReturnStream(pdfurl + $"/{inDto.DownLoadGuid}.pdf");
+ return stream;
+ }
+ }
+
+
///
/// 下载阅片报告
///
///
///
- public async Task DownLoadReadReportStream(DownLoadReadReportInDto inDto)
+ public async Task DownLoadReadReportStream(DownLoadReadReportInDto inDto)
{
- throw new BusinessValidationFailedException(_localizer["ReadingCalculate_DownLoadReadReport"]);
- }
+ var downFile = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $@"wwwroot/ReadReoprtTemplate/downLoad/{inDto.DownLoadGuid}");
+ Directory.CreateDirectory(downFile);
+ var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId && x.ReadingCategory == ReadingCategory.Visit)
+ .Include(x => x.TrialReadingCriterion).FirstNotNullAsync();
+ var visitInfo = await _subjectVisitRepository.Where(x => x.Id == taskinfo.SourceSubjectVisitId).Include(x => x.StudyList).FirstNotNullAsync();
+ var subjectInfo = await _subjectRepository.Where(x => x.Id == taskinfo.SubjectId).Include(x => x.SubjectPatientList).FirstNotNullAsync();
+ var doctor = await _userRoleRepository.Where(x => x.Id == taskinfo.DoctorUserId).FirstOrDefaultAsync();
- public async Task DownLoadTumorEvaluationStream(DownLoadReadReportInDto inDto)
- {
- throw new BusinessValidationFailedException(_localizer["ReadingCalculate_DownLoadReadReport"]);
+ var trialQuestion = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == taskinfo.TrialReadingCriterionId).ToListAsync();
+ var tableQuestion = await _readingTableQuestionTrialRepository.Where(x => x.ReadingQuestionTrial.ReadingQuestionCriterionTrialId == taskinfo.TrialReadingCriterionId).ToListAsync();
+ var dicotionCode = trialQuestion.Where(x => x.DictionaryCode != string.Empty).Select(x => x.DictionaryCode).Distinct().ToList();
+ dicotionCode.AddRange(tableQuestion.Where(x => x.DictionaryCode != string.Empty).Select(x => x.DictionaryCode).Distinct());
+ var dictionList = await _dictionaryRepository.Where(x => dicotionCode.Contains(x.Code)).Include(x => x.ChildList).ToListAsync();
+ List taskIds = new List() { };
+ var relatedVisitTask = await ServiceProvider.GetService().GetRelatedVisitTask(new GetRelatedVisitTaskInDto()
+ {
+ VisitTaskId = inDto.VisitTaskId
+ });
+
+ var relatedCount = relatedVisitTask.Item1.Count();
+
+ if (relatedCount <= 3)
+ {
+ taskIds = relatedVisitTask.Item1.Select(x => x.VisitTaskId).ToList();
+ }
+ else
+ {
+ var count = relatedVisitTask.Item1.Count();
+ taskIds.Add(relatedVisitTask.Item1[0].VisitTaskId);
+ taskIds.Add(relatedVisitTask.Item1[count - 2].VisitTaskId);
+ taskIds.Add(relatedVisitTask.Item1[count - 1].VisitTaskId);
+
+ }
+ relatedVisitTask.Item1 = relatedVisitTask.Item1.Where(x => taskIds.Contains(x.VisitTaskId)).ToList();
+ // 所有访视问题的答案
+ var answerList = await _readingTaskQuestionAnswerRepository.Where(x => taskIds.Contains(x.VisitTaskId)).Include(x => x.ReadingQuestionTrial).ToListAsync();
+
+ // 单位字典
+ var unitDictionary = await _dictionaryRepository.Where(x => x.Code == "ValueUnit").Include(x => x.ChildList).ToListAsync();
+ var imageProblem = _generalCalculateService.GetTaskanswer(answerList, dictionList, unitDictionary, inDto.VisitTaskId, QuestionType.ImageQualityAssessment);
+ var rowinfoList = await _readingTableAnswerRowInfoRepository.Where(x => taskIds.Contains(x.VisitTaskId)).Include(x => x.VisitTask).Include(x => x.ReadingQuestionTrial).ToListAsync();
+ var tableAnswerList = await _readingTableQuestionAnswerRepository.Where(x => taskIds.Contains(x.VisitTaskId)).Include(x => x.ReadingQuestionTrial).Include(x => x.ReadingTableQuestionTrial).ToListAsync();
+
+ #region 获取各个病灶
+ List> getLesionInfo(LesionType lesionType)
+ {
+ List targetFocusNum = rowinfoList.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.ReadingQuestionTrial.LesionType == lesionType).Select(x => x.RowIndex).OrderBy(x => x).ToList();
+
+ List> targetInfo = new List>();
+
+ foreach (var item in targetFocusNum)
+ {
+ var bodyPartDescription = _generalCalculateService.GetTaskTableAnswer(tableAnswerList, dictionList, unitDictionary, inDto.VisitTaskId, lesionType, QuestionMark.BodyPartDescription, item);
+ Dictionary target = new Dictionary()
+ {
+ { "RowMark",rowinfoList.Where(x=>x.VisitTaskId == inDto.VisitTaskId &&x.RowIndex==item && x.ReadingQuestionTrial.LesionType == lesionType).Select(x=>x.RowMark).FirstIsNullReturnEmpty() },
+ { "Organ",_generalCalculateService.GetTaskTableAnswer(tableAnswerList,dictionList,unitDictionary,inDto.VisitTaskId,lesionType,QuestionMark.Organ,item)+"："+_generalCalculateService.GetTaskTableAnswer(tableAnswerList,dictionList,unitDictionary,inDto.VisitTaskId,lesionType,QuestionMark.Part,item)+ (bodyPartDescription==string.Empty?string.Empty:"，"+bodyPartDescription) },
+ { "FirstVisit",getStateInfo(0,item, lesionType) },
+ { "SecondVisit", relatedCount>=2?getStateInfo(1,item,lesionType):string.Empty },
+ { "ThirdlyVisit", relatedCount>=3?getStateInfo(2,item,lesionType):string.Empty },
+ };
+ targetInfo.Add(target);
+ }
+ return targetInfo;
+ }
+
+ string getStateInfo(int index, decimal item, LesionType lesionType)
+ {
+ // 非淋巴结取长径 淋巴结取长短径
+ var state = _generalCalculateService.GetTaskTableAnswer(tableAnswerList, dictionList, unitDictionary, taskIds[index], lesionType, QuestionMark.State, item);
+ var majorAxis = _generalCalculateService.GetTaskTableAnswer(tableAnswerList, dictionList, unitDictionary, taskIds[index], lesionType, QuestionMark.MajorAxis, item);
+
+ var isLymph = _generalCalculateService.GetTaskTableAnswer(tableAnswerList, dictionList, unitDictionary, taskIds[index], lesionType, QuestionMark.IsLymph, item);
+ var shortAxis = _generalCalculateService.GetTaskTableAnswer(tableAnswerList, dictionList, unitDictionary, taskIds[index], lesionType, QuestionMark.ShortAxis, item);
+
+ var result = string.Empty;
+
+ if (!state.IsNullOrEmpty())
+ {
+ result = state;
+
+ }
+
+ if (!majorAxis.IsNullOrEmpty())
+ {
+ result += result == string.Empty ? $"L：{majorAxis}" : $"，L：{majorAxis}";
+ }
+
+ if (isLymph.EqEnum(YesOrNoOrNa.Yes) && !shortAxis.IsNullOrEmpty())
+ {
+ result += result == string.Empty ? $"S：{shortAxis}" : $"，S：{shortAxis}";
+ }
+
+ return result;
+
+ }
+
+ #endregion
+
+
+ #region 外层问题处理
+
+ // 获取外层问题
+ List> getQuestionAnswerList(List exports)
+ {
+ List> questionAnswerList = new List>();
+ foreach (var item in exports)
+ {
+ Dictionary questionAnswer = new Dictionary()
+ {
+ {"Name",item.QuestionName },
+ {"FirstVisit", _generalCalculateService.GetTaskanswer(answerList,dictionList,unitDictionary,taskIds[0],item.QuestionType)},
+ {"SecondVisit", relatedCount>=2? _generalCalculateService.GetTaskanswer(answerList,dictionList,unitDictionary,taskIds[1],item.QuestionType):string.Empty },
+ {"ThirdlyVisit", relatedCount>=3? _generalCalculateService.GetTaskanswer(answerList,dictionList,unitDictionary,taskIds[2],item.QuestionType):string.Empty },
+ };
+ questionAnswerList.Add(questionAnswer);
+ }
+ return questionAnswerList;
+ }
+
+ #endregion
+
+ var studyInfo = (await _dicomStudyRepository.Where(x => x.SubjectVisitId == taskinfo.SourceSubjectVisitId).Select(x => new
+ {
+
+ x.Modalities,
+ x.StudyTime,
+ x.BodyPartExamined,
+ x.Description
+
+ }).OrderBy(x => x.StudyTime).ToListAsync()).Select(x => new Dictionary() {
+
+ { "Modalities",x.Modalities},
+ { "StudyTime",x.StudyTime?.ToString("yyyy-MM-dd")},
+ { "Description",x.Description},
+ { "ImageProblem",imageProblem},
+ }).ToList();
+
+
+ var subjectPatientList = await _subjectPatientRepository.Where(x => x.SubjectId == subjectInfo.Id).Include(x => x.Patient).ToListAsync();
+
+ var assessmentResult = string.Empty;
+ if (visitInfo.IsBaseLine)
+ {
+ var existDisease = answerList.Where(x => x.ReadingQuestionTrial.QuestionType == QuestionType.ExistDisease).Select(x => x.Answer).FirstIsNullReturnEmpty().EqEnum(ExistDisease.No) ? "不" : string.Empty;
+ assessmentResult = $"{existDisease}存在疾病";
+ }
+ else
+ {
+ assessmentResult = $"整体肿瘤评估结果为{_generalCalculateService.GetTaskanswer(answerList, dictionList, unitDictionary, inDto.VisitTaskId, QuestionType.Tumor)}";
+ }
+ var hIRHospital = await _hIRHospitalRepository.Where(t => t.IsDefault == true).FirstNotNullAsync();
+
+ var value = new Dictionary()
+ {
+ // { "Logo" ,await _generalCalculateService.GetWordPictureMaxWL(_options.CurrentValue.MinIO.viewEndpoint+_hospital.CurrentValue.HospitalLogoPath ,System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $@"wwwroot/ReadReoprtTemplate/downLoad/{inDto.DownLoadGuid}"),110,100) },
+
+ { "HospitalName",hIRHospital.HospitalName } ,// 医院名称
+ { "SubjectName",subjectInfo.ShortName }, //患者姓名
+ { "SubjectSex", subjectInfo.Sex==string.Empty?string.Empty: subjectInfo.Sex=="M"?"男":"女" }, //患者性别
+ { "SubjectAge",subjectInfo.Age==null?string.Empty: subjectInfo.Age +"岁" }, //患者年龄
+ { "SubjectCode",subjectPatientList.Select(x=>x.Patient).OrderByDescending(x=>x.CreateTime).Select(x=>x.PatientIdStr).FirstIsNullReturnEmpty() }, //患者编号
+ { "VisitName",visitInfo.VisitName }, //访视名称
+ { "LatestScanDate",visitInfo.StudyList.Min(x=>x.StudyTime)?.ToString("yyyy-MM-dd") }, //随访日期
+ { "CriterionName",taskinfo.TrialReadingCriterion.CriterionName }, //评估标准
+ { "AssessmentResult", assessmentResult }, //评估结果
+ { "DoctorName",doctor.LastName + doctor.FirstName}, //医生姓名
+ { "SignTime",taskinfo.SignTime?.ToString("yyyy-MM-dd HH:mm:ss") }, //签名时间
+ { "StudyInfo",studyInfo }, // 检查信息
+ { "FirstVisit", relatedVisitTask.Item1[0].TaskName},
+ { "SecondVisit",relatedCount>=2?relatedVisitTask.Item1[1].TaskName:string.Empty},
+ { "ThirdlyVisit", relatedCount>=3?relatedVisitTask.Item1[2].TaskName:string.Empty},
+ { "TargetInfo", getLesionInfo(LesionType.TargetLesion)}, // 靶病灶
+ { "NoTargetInfo", getLesionInfo(LesionType.NonTargetLesions)}, // 非把病灶
+ { "NewTargetInfo", getLesionInfo(LesionType.NewLesions)},// 新病灶
+ { "TargetImage", await _generalCalculateService.GetLesionPic(rowinfoList, LesionType.TargetLesion,inDto.DownLoadGuid)}, // 靶病灶图片
+ { "NoTargetImage",await _generalCalculateService.GetLesionPic(rowinfoList, LesionType.NonTargetLesions,inDto.DownLoadGuid)}, // 非靶病灶图片
+ { "NewImage", await _generalCalculateService.GetLesionPic(rowinfoList, LesionType.NewLesions,inDto.DownLoadGuid)}, // 新病灶图片
+ { "Result",getQuestionAnswerList(new List()
+ { new ExportReportQuestion (){ QuestionName="靶病灶径线之和（SOD）",QuestionType=QuestionType.SOD},
+ new ExportReportQuestion (){ QuestionName="非淋巴结靶病灶长径之和",QuestionType=QuestionType.SumOfDiameter},
+ new ExportReportQuestion (){ QuestionName="与基线相比SOD变化量",QuestionType=QuestionType.SODChange},
+ new ExportReportQuestion (){ QuestionName="与基线相比SOD变化百分比",QuestionType=QuestionType.SODPercent},
+ new ExportReportQuestion (){ QuestionName="与最低点相比SOD变化量",QuestionType=QuestionType.LowestIncrease},
+ new ExportReportQuestion (){ QuestionName="与最低点相比SOD变化百分比",QuestionType=QuestionType.LowPercent},
+ new ExportReportQuestion (){ QuestionName="最低点访视",QuestionType=QuestionType.LowVisit},
+ })}, // 评估结果
+ { "Curative",getQuestionAnswerList(new List()
+ { new ExportReportQuestion (){ QuestionName="靶病灶评估",QuestionType=QuestionType.TargetLesion},
+ new ExportReportQuestion (){ QuestionName="非靶病灶评估",QuestionType=QuestionType.NoTargetLesion},
+ new ExportReportQuestion (){ QuestionName="存在新病灶",QuestionType=QuestionType.NewLesions},
+ new ExportReportQuestion (){ QuestionName="存在疾病",QuestionType=QuestionType.ExistDisease},
+ new ExportReportQuestion (){ QuestionName="整体肿瘤评估",QuestionType=QuestionType.Tumor},
+ })}, // 疗效结果
+
+ { "ReportNo",await _generalCalculateService.GetReportExportNo(taskinfo) } ,
+ };
+
+ value = _generalCalculateService.StringEmptyTurnedLine(value);
+
+ var templatePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"wwwroot/ReadReoprtTemplate/ReportTemplate_RECIST1.1_CN_V1.docx");
+ var outputFilePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $@"wwwroot/ReadReoprtTemplate/downLoad/{inDto.DownLoadGuid}.docx");
+
+
+ MiniWord.SaveAsByTemplate(outputFilePath, templatePath, value);
+
+
+ //// 获取文件夹中的所有文件路径
+ Directory.Delete(downFile, true);
+
+ if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+ {
+ Stream stream = _generalCalculateService.ReadAndReturnStream(outputFilePath);
+ return stream;
+ }
+ else
+ {
+
+ var pdfurl = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"wwwroot/ReadReoprtTemplate/downLoad");
+ FileConvertHelper.ConvertWordToPdf(outputFilePath, pdfurl);
+ Stream stream = _generalCalculateService.ReadAndReturnStream(pdfurl + $"/{inDto.DownLoadGuid}.pdf");
+ return stream;
+ }
}
///
/// 阅片导入
@@ -726,6 +1191,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var baseLineVisitId = await _subjectVisitRepository.Where(x => x.SubjectId == taskinfo.SubjectId && x.IsBaseLine).Select(x => x.Id).FirstOrDefaultAsync();
+ if (!(await _readingTableQuestionAnswerRepository.AnyAsync(x => x.VisitTaskId == visitTaskId)))
+ {
+
// 判断当前任务是否是基线
if (taskinfo.SourceSubjectVisitId != baseLineVisitId)
{
@@ -823,8 +1291,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
x.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Point1 &&
x.SubjectId == taskinfo.SubjectId &&
x.SourceSubjectVisitId == taskinfo.SourceSubjectVisitId
- //&&
- //x.DoctorUserId==taskinfo.DoctorUserId
).FirstOrDefaultAsync();
if (recistTask != null)
{
@@ -886,6 +1352,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{
item.QuestionId = tableRowAnswers.Where(y => y.OriginalId == item.RowId).Select(x => x.QuestionId).FirstOrDefault();
+
item.TableQuestionId = tableQuestionList.Where(x => x.ReadingQuestionId == item.QuestionId && x.QuestionMark == item.QuestionMark).Select(x => x.Id).FirstOrDefault();
}
@@ -946,7 +1413,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}
-
+ }
return new AddTaskLesionAnswerFromLastTaskOutDto()
{
diff --git a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
index 6facc35c2..050b995fa 100644
--- a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
+++ b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
@@ -1,3 +1,5 @@
+using IRaCIS.Core.Domain.Share;
+
namespace IRaCIS.Core.Domain.Models;
[Comment("稽查 - 配置表 （需要同步）")]
@@ -117,6 +119,11 @@ public class FrontAuditConfig : BaseFullAuditEntity
public string ValueCN { get; set; } = null!;
+ ///
+ /// 适用的标准
+ ///
+ public List ApplyCriterionList { get; set; } = new List() { };
+
}
public class UrlConfig
{
diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index 87fd79d6e..2cf0c5521 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
@@ -6,6 +6,7 @@ using MassTransit;
using Microsoft.EntityFrameworkCore.ChangeTracking;
using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
using Newtonsoft.Json;
+using static MassTransit.ValidationResultExtensions;
namespace IRaCIS.Core.Infra.EFCore.Common
@@ -61,6 +62,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
{
return new List()
{
+ typeof(TrialIdentityUser),
typeof(TrialUserRole),
typeof(TrialSiteSurvey),
typeof(TrialSiteUser),
@@ -1623,12 +1625,19 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var type = GetEntityAuditOpt(item);
var entity = item.Entity as TrialUserRole;
+ string extraIndentification = string.Empty;
+ if (type == AuditOpt.Update)
+ {
+ extraIndentification = "/" + entity.IsDeleted.ToString();
+ }
+
//var user = await _dbContext.Users.Include(x => x.UserTypeRole).FirstOrDefaultAsync(x => x.Id == entity.UserId);
await InsertInspection(entity, type, x => new InspectionConvertDTO
{
IsDistinctionInterface = type == AuditOpt.Update ? true : false,
TrialId = x.TrialId,
ObjectRelationParentId = x.TrialId,
+ ExtraIndentification = extraIndentification,
ObjectRelationParentId2 = x.UserId,
});
}
@@ -1715,6 +1724,32 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//});
#endregion
+ }
+
+ foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(SCPStudySubjectVisit)))
+ {
+
+ var type = GetEntityAuditOpt(item);
+
+ var entity = item.Entity as SCPStudySubjectVisit;
+
+ var sCPStudy=await _dbContext.SCPStudy.Where(x => x.Id == entity.SCPStudyId).FirstOrDefaultAsync();
+
+ await InsertInspection(item.Entity as SCPStudySubjectVisit, type, x => new InspectionConvertDTO()
+ {
+ ObjectRelationParentId = x.SubjectId,
+ ObjectRelationParentId2=x.SubjectVisitId,
+ ObjectRelationParentId3 = x.StudyId,
+
+
+ }, new
+ {
+ StudyTime = sCPStudy!=null? sCPStudy.StudyTime:null,
+
+ });
+
+
+
}
// 访视
@@ -2953,7 +2988,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
u.ShowOrder
}
).OrderBy(t => t.ShowOrder).ToList()
- });
+ }, _userInfo.AuditIdentification);
////添加/修改病灶接口 只会对单个病灶进行操作
@@ -3182,6 +3217,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
UserRealName = userRealName,
};
+
+ var extraIdentification = string.Empty;
+ var isDistinctionInterface = true;
#region 标识区分
if (type == AuditOpt.Add)
@@ -3228,11 +3266,30 @@ namespace IRaCIS.Core.Infra.EFCore.Common
type = type + "/" + 2;
}
+ break;
+
+ case "ReadingImageTask/resetReadingTask":
+ //跳转阅片结果需要该参数
+
+ obj.IsReadingReset = true;
+
break;
}
}
+ if (obj.IsReadingReset != true)
+ {
+ if (entity.ReadingTaskState == ReadingTaskState.Reading)
+ {
+ if (_dbContext.VisitTask.Where(t => t.Id == entity.Id).Any(t => t.ReadingTaskState == ReadingTaskState.WaitReading))
+ {
+ isDistinctionInterface = false;
+ extraIdentification = "/ChangeToReading";
+ }
+ }
+ }
+
//访视任务-- 非Dicom 阅片
if (_userInfo.RequestUrl == "ReadingImageTask/SubmitVisitTaskQuestions" && entity.ReadingTaskState != ReadingTaskState.HaveSigned && type == AuditOpt.Update)
{
@@ -3366,8 +3423,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
{
VisitTaskId = x.Id,
SubjectVisitId= subjectVisitId,
-
- IsDistinctionInterface = type == AuditOpt.Update ? true : false,
+ ExtraIndentification = extraIdentification,
+
+ IsDistinctionInterface = type == AuditOpt.Update && isDistinctionInterface ? true : false,
ObjectRelationParentId = entity.SourceSubjectVisitId != null ? entity.SourceSubjectVisitId : entity.SouceReadModuleId,
@@ -3394,7 +3452,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
/// 表达式
/// 其他对象
///
- public async Task InsertInspection(T entityObj, string type, Expression> expression = null, object otherItem = null) where T : Entity
+ public async Task InsertInspection(T entityObj, string type, Expression> expression = null, object otherItem = null, string auditIdentification = "") where T : Entity
{
InspectionConvertDTO inspection = new InspectionConvertDTO();
@@ -3411,7 +3469,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var generalId = (inspection.GeneralId != null && inspection.GeneralId != Guid.Empty) ? inspection.GeneralId : entityObj.Id;
inspection.GeneralId = generalId;
- inspection.Identification = GetInspectionRecordIdentification(entityObj, type, inspection.IsDistinctionInterface, inspection.IsSelfDefine) + inspection.ExtraIndentification;
+ inspection.Identification = GetInspectionRecordIdentification(entityObj, type, inspection.IsDistinctionInterface, inspection.IsSelfDefine, auditIdentification) + inspection.ExtraIndentification;
//将实体对象属性 映射到稽查实体
MapEntityPropertyToAuditEntity(entityObj, inspection);
@@ -3617,11 +3675,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
/// 获取稽查记录的标识符 部分业务会进行特殊处理
///
///
- public string GetInspectionRecordIdentification(T entityObj, string type, bool IsDistinctionInterface = true, bool isSelfDefine = false)
+ public string GetInspectionRecordIdentification(T entityObj, string type, bool IsDistinctionInterface = true, bool isSelfDefine = false, string auditIdentification = "")
{
var entityTypeName = entityObj.GetType().Name;
-
+ var result = string.Empty;
//默认规则
if (IsDistinctionInterface)
@@ -3629,11 +3687,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//自定义 标识后面 补充由代码上层的 extraIdentification 附加
if (isSelfDefine)
{
- return $"{_userInfo.RequestUrl}/{entityTypeName}";
+ result= $"{_userInfo.RequestUrl}/{entityTypeName}";
}
else
{
- return $"{_userInfo.RequestUrl}/{entityTypeName}/{type}";
+ result = $"{_userInfo.RequestUrl}/{entityTypeName}/{type}";
}
@@ -3643,15 +3701,22 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//自定义 标识后面 补充由代码上层的 extraIdentification 附加
if (isSelfDefine)
{
- return $"{entityTypeName}";
+ result = $"{entityTypeName}";
}
else
{
- return $"{entityTypeName}/{type}";
+ result = $"{entityTypeName}/{type}";
}
}
+ if (auditIdentification.IsNotNullOrEmpty())
+ {
+ result = result + "/" + auditIdentification;
+ }
+
+ return result;
+
}
diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingDto.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingDto.cs
index 8bc888aff..152027999 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingDto.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingDto.cs
@@ -62,6 +62,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
public string CutOffVisitName { get; set; }
public string SelectResult { get; set; }
+
+ public bool? IsReadingReset { get; set; }
}
public class InspectionConvertDTO : DataInspection
{
diff --git a/IRaCIS.Core.Infra.EFCore/Migrations/20250901092654_CriterionType.Designer.cs b/IRaCIS.Core.Infra.EFCore/Migrations/20250901092654_CriterionType.Designer.cs
new file mode 100644
index 000000000..eb160759b
--- /dev/null
+++ b/IRaCIS.Core.Infra.EFCore/Migrations/20250901092654_CriterionType.Designer.cs
@@ -0,0 +1,19072 @@
+//
+using System;
+using IRaCIS.Core.Infra.EFCore;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+ [DbContext(typeof(IRaCISDBContext))]
+ [Migration("20250901092654_CriterionType")]
+ partial class CriterionType
+ {
+ ///
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("ProductVersion", "8.0.19")
+ .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+ SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+ modelBuilder.Entity("IRaCIS.Core.Domain.Models.Attachment", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("Code")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)")
+ .HasComment("编码");
+
+ b.Property("CreateTime")
+ .HasColumnType("datetime2");
+
+ b.Property("CreateUserId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("DoctorId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("ExpiryDate")
+ .HasColumnType("datetime2")
+ .HasComment("过期时间");
+
+ b.Property("FileName")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)");
+
+ b.Property("IsOfficial")
+ .HasColumnType("bit")
+ .HasComment("是否正式简历");
+
+ b.Property("Language")
+ .HasColumnType("int")
+ .HasComment("1 中文 2为英文");
+
+ b.Property("Path")
+ .IsRequired()
+ .HasMaxLength(1000)
+ .HasColumnType("nvarchar(1000)");
+
+ b.Property("Type")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)")
+ .HasComment("文件类型名");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreateUserId");
+
+ b.HasIndex("DoctorId");
+
+ b.ToTable("Attachment", t =>
+ {
+ t.HasComment("医生 - 简历|证书 文档表");
+ });
+ });
+
+ modelBuilder.Entity("IRaCIS.Core.Domain.Models.CRO", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("CROCode")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)");
+
+ b.Property("CROName")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)");
+
+ b.Property("CRONameCN")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)");
+
+ b.Property("CreateTime")
+ .HasColumnType("datetime2");
+
+ b.Property("CreateUserId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("IsTrialLevel")
+ .HasColumnType("bit")
+ .HasComment("是否是项目级别");
+
+ b.Property("TrialId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("UpdateTime")
+ .HasColumnType("datetime2");
+
+ b.Property("UpdateUserId")
+ .HasColumnType("uniqueidentifier");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreateUserId");
+
+ b.ToTable("CROCompany", t =>
+ {
+ t.HasComment("机构 - CRO");
+ });
+ });
+
+ modelBuilder.Entity("IRaCIS.Core.Domain.Models.CheckChallengeDialog", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("CreateTime")
+ .HasColumnType("datetime2");
+
+ b.Property("CreateUserId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("IsCRCNeedReply")
+ .HasColumnType("bit")
+ .HasComment("CRC是否需要回复 前端使用");
+
+ b.Property("ParamInfo")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)")
+ .HasComment("核查的检查信息Json");
+
+ b.Property("SubjectVisitId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("TalkContent")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("UserTypeEnum")
+ .HasColumnType("int")
+ .HasComment("核查过程中的操作用户类型");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreateUserId");
+
+ b.HasIndex("SubjectVisitId");
+
+ b.ToTable("CheckChallengeDialog", t =>
+ {
+ t.HasComment("一致性核查 - 对话记录表");
+ });
+ });
+
+ modelBuilder.Entity("IRaCIS.Core.Domain.Models.ClinicalAnswerRowInfo", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("ClinicalFormId")
+ .HasColumnType("uniqueidentifier")
+ .HasComment("表单Id");
+
+ b.Property("CreateTime")
+ .HasColumnType("datetime2");
+
+ b.Property("CreateUserId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("QuestionId")
+ .HasColumnType("uniqueidentifier")
+ .HasComment("问题Id");
+
+ b.Property("RowIndex")
+ .HasColumnType("int");
+
+ b.Property("SubjectId")
+ .HasColumnType("uniqueidentifier")
+ .HasComment("受试者Id");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreateUserId");
+
+ b.ToTable("ClinicalAnswerRowInfo", t =>
+ {
+ t.HasComment("受试者 - 临床表单表格问题行记录");
+ });
+ });
+
+ modelBuilder.Entity("IRaCIS.Core.Domain.Models.ClinicalDataSystemSet", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("ClinicalDataLevel")
+ .HasColumnType("int");
+
+ b.Property("ClinicalDataSetEnName")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)");
+
+ b.Property("ClinicalDataSetEnum")
+ .HasColumnType("int")
+ .HasComment("枚举(字典里面取的)");
+
+ b.Property("ClinicalDataSetName")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)");
+
+ b.Property("ClinicalUploadType")
+ .HasColumnType("int")
+ .HasComment("上传方式");
+
+ b.Property("CreateTime")
+ .HasColumnType("datetime2");
+
+ b.Property("CreateUserId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("CriterionEnumListStr")
+ .IsRequired()
+ .HasMaxLength(1000)
+ .HasColumnType("nvarchar(1000)");
+
+ b.Property("FileName")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)");
+
+ b.Property("IsApply")
+ .HasColumnType("bit")
+ .HasComment("是否应用");
+
+ b.Property("IsEnable")
+ .HasColumnType("bit");
+
+ b.Property("Path")
+ .IsRequired()
+ .HasMaxLength(1000)
+ .HasColumnType("nvarchar(1000)");
+
+ b.Property("UploadRole")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreateUserId");
+
+ b.ToTable("ClinicalDataSystemSet", t =>
+ {
+ t.HasComment("系统 - 临床数据配置");
+ });
+ });
+
+ modelBuilder.Entity("IRaCIS.Core.Domain.Models.ClinicalDataTrialSet", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("ClinicalDataLevel")
+ .HasColumnType("int")
+ .HasComment("临床级别");
+
+ b.Property("ClinicalDataSetEnName")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)");
+
+ b.Property("ClinicalDataSetName")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)");
+
+ b.Property("ClinicalUploadType")
+ .HasColumnType("int")
+ .HasComment("上传方式");
+
+ b.Property("CreateTime")
+ .HasColumnType("datetime2");
+
+ b.Property("CreateUserId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("CriterionEnumListStr")
+ .IsRequired()
+ .HasMaxLength(1000)
+ .HasColumnType("nvarchar(1000)");
+
+ b.Property("FileName")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)");
+
+ b.Property("IsApply")
+ .HasColumnType("bit")
+ .HasComment("是否应用");
+
+ b.Property("IsConfirm")
+ .HasColumnType("bit");
+
+ b.Property("Path")
+ .IsRequired()
+ .HasMaxLength(1000)
+ .HasColumnType("nvarchar(1000)");
+
+ b.Property("SystemClinicalDataSetId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("TrialId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("UploadRole")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreateUserId");
+
+ b.HasIndex("SystemClinicalDataSetId");
+
+ b.HasIndex("TrialId");
+
+ b.ToTable("ClinicalDataTrialSet", t =>
+ {
+ t.HasComment("项目 - 临床数据适应标准配置");
+ });
+ });
+
+ modelBuilder.Entity("IRaCIS.Core.Domain.Models.ClinicalForm", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("CheckDate")
+ .HasColumnType("datetime2")
+ .HasComment("检查日期");
+
+ b.Property("ClinicalDataTrialSetId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("CreateTime")
+ .HasColumnType("datetime2");
+
+ b.Property("CreateUserId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("PicturePath")
+ .IsRequired()
+ .HasMaxLength(1000)
+ .HasColumnType("nvarchar(1000)")
+ .HasComment("截图地址");
+
+ b.Property("ReadingId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("SubjectId")
+ .HasColumnType("uniqueidentifier")
+ .HasComment("受试者Id");
+
+ b.Property("TrialId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("VisitId")
+ .HasColumnType("uniqueidentifier");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ClinicalDataTrialSetId");
+
+ b.HasIndex("CreateUserId");
+
+ b.HasIndex("SubjectId");
+
+ b.ToTable("ClinicalForm", t =>
+ {
+ t.HasComment("受试者 - 临床表单");
+ });
+ });
+
+ modelBuilder.Entity("IRaCIS.Core.Domain.Models.ClinicalQuestionAnswer", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("Answer")
+ .IsRequired()
+ .HasMaxLength(1000)
+ .HasColumnType("nvarchar(1000)");
+
+ b.Property("ClinicalDataTrialSetId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("ClinicalFormId")
+ .HasColumnType("uniqueidentifier")
+ .HasComment("表单Id");
+
+ b.Property("CreateTime")
+ .HasColumnType("datetime2");
+
+ b.Property("CreateUserId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("QuestionId")
+ .HasColumnType("uniqueidentifier")
+ .HasComment("问题Id");
+
+ b.Property("SubjectId")
+ .HasColumnType("uniqueidentifier")
+ .HasComment("受试者Id");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ClinicalFormId");
+
+ b.HasIndex("CreateUserId");
+
+ b.ToTable("ClinicalQuestionAnswer", t =>
+ {
+ t.HasComment("受试者 - 临床表单问题答案");
+ });
+ });
+
+ modelBuilder.Entity("IRaCIS.Core.Domain.Models.ClinicalTableAnswer", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("Answer")
+ .IsRequired()
+ .HasMaxLength(1000)
+ .HasColumnType("nvarchar(1000)")
+ .HasComment("答案");
+
+ b.Property("ClinicalFormId")
+ .HasColumnType("uniqueidentifier")
+ .HasComment("表单Id");
+
+ b.Property("CreateTime")
+ .HasColumnType("datetime2");
+
+ b.Property("CreateUserId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("QuestionId")
+ .HasColumnType("uniqueidentifier")
+ .HasComment("问题Id");
+
+ b.Property("RowId")
+ .HasColumnType("uniqueidentifier")
+ .HasComment("答案行的Id");
+
+ b.Property("SubjectId")
+ .HasColumnType("uniqueidentifier")
+ .HasComment("受试者Id");
+
+ b.Property("TableQuestionId")
+ .HasColumnType("uniqueidentifier");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreateUserId");
+
+ b.HasIndex("RowId");
+
+ b.ToTable("ClinicalTableAnswer", t =>
+ {
+ t.HasComment("受试者 - 临床表单表格问题答案");
+ });
+ });
+
+ modelBuilder.Entity("IRaCIS.Core.Domain.Models.CmoveStudy", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("CalledAE")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)");
+
+ b.Property("CallingAE")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)");
+
+ b.Property("CreateTime")
+ .HasColumnType("datetime2");
+
+ b.Property("CreateUserId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("HopitalGroupIdList")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("StudyInstanceUIDList")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("UpdateTime")
+ .HasColumnType("datetime2");
+
+ b.Property("UpdateUserId")
+ .HasColumnType("uniqueidentifier");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreateUserId");
+
+ b.ToTable("CmoveStudy");
+ });
+
+ modelBuilder.Entity("IRaCIS.Core.Domain.Models.CommonDocument", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("BusinessScenarioEnum")
+ .HasColumnType("int")
+ .HasComment("业务场景");
+
+ b.Property("Code")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)");
+
+ b.Property("CreateTime")
+ .HasColumnType("datetime2");
+
+ b.Property("CreateUserId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("CriterionTypeEnum")
+ .HasColumnType("int")
+ .HasComment("系统标准枚举");
+
+ b.Property("DeleteUserId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("DeletedTime")
+ .HasColumnType("datetime2");
+
+ b.Property("Description")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)");
+
+ b.Property("FileTypeEnum")
+ .HasColumnType("int")
+ .HasComment("类型-上传|导出|邮件附件");
+
+ b.Property("IsDeleted")
+ .HasColumnType("bit");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)");
+
+ b.Property("NameCN")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)");
+
+ b.Property("Path")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)");
+
+ b.Property("UpdateTime")
+ .HasColumnType("datetime2");
+
+ b.Property("UpdateUserId")
+ .HasColumnType("uniqueidentifier");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreateUserId");
+
+ b.ToTable("CommonDocument", t =>
+ {
+ t.HasComment("数据上传 | 数据导出 | 邮件附件 文件记录表 （需要同步）");
+ });
+ });
+
+ modelBuilder.Entity("IRaCIS.Core.Domain.Models.CriterionNidusSystem", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("CreateTime")
+ .HasColumnType("datetime2");
+
+ b.Property("CreateUserId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("CriterionId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("IsSystemCriterion")
+ .HasColumnType("bit");
+
+ b.Property("LesionType")
+ .HasColumnType("int")
+ .HasComment("病灶类型");
+
+ b.Property("OrganType")
+ .HasColumnType("int")
+ .HasComment("器官类型");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreateUserId");
+
+ b.HasIndex("CriterionId");
+
+ b.ToTable("CriterionNidusSystem", t =>
+ {
+ t.HasComment("系统标准 - 病灶器官表 （需要同步）");
+ });
+ });
+
+ modelBuilder.Entity("IRaCIS.Core.Domain.Models.CriterionNidusTrial", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("CreateTime")
+ .HasColumnType("datetime2");
+
+ b.Property("CreateUserId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("CriterionId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("LesionType")
+ .HasColumnType("int");
+
+ b.Property("OrganType")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreateUserId");
+
+ b.ToTable("CriterionNidusTrial", t =>
+ {
+ t.HasComment("项目标准 - 病灶器官表");
+ });
+ });
+
+ modelBuilder.Entity("IRaCIS.Core.Domain.Models.DataInspection", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("BatchId")
+ .HasColumnType("uniqueidentifier")
+ .HasComment("批次Id");
+
+ b.Property("ChildrenTypeId")
+ .HasColumnType("uniqueidentifier")
+ .HasComment("子类");
+
+ b.Property("CreateTime")
+ .HasColumnType("datetime2");
+
+ b.Property("CreateUserId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("CreateUserName")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)")
+ .HasComment("创建人姓名");
+
+ b.Property("CreateUserRealName")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)");
+
+ b.Property("DoctorUserId")
+ .HasColumnType("uniqueidentifier")
+ .HasComment("阅片医生");
+
+ b.Property("EntityName")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)")
+ .HasComment("被稽查实体名");
+
+ b.Property("GeneralId")
+ .HasColumnType("uniqueidentifier")
+ .HasComment("要稽查对象Id");
+
+ b.Property("IP")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)");
+
+ b.Property("Identification")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)")
+ .HasComment("标识");
+
+ b.Property("IsFrontAdd")
+ .HasColumnType("bit")
+ .HasComment("是否是前端添加");
+
+ b.Property("IsSign")
+ .HasColumnType("bit");
+
+ b.Property("JsonDetail")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("LastJsonDetail")
+ .HasColumnType("nvarchar(max)")
+ .HasComment("上一条json");
+
+ b.Property("ModuleTypeId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("ObjectRelationParentId")
+ .HasColumnType("uniqueidentifier")
+ .HasComment("被稽查对象外键1");
+
+ b.Property("ObjectRelationParentId2")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("ObjectRelationParentId3")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("ObjectTypeId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("OptTypeId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("ParentId")
+ .HasColumnType("uniqueidentifier")
+ .HasComment("父ID");
+
+ b.Property("Reason")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)");
+
+ b.Property("RoleName")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)")
+ .HasComment("角色名称");
+
+ b.Property("SignId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("SubjectId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("SubjectVisitId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("TrialId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("TrialReadingCriterionId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("TrialSiteId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("VisitStageId")
+ .HasColumnType("uniqueidentifier")
+ .HasComment("访视计划ID");
+
+ b.Property("VisitTaskId")
+ .HasColumnType("uniqueidentifier");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreateUserId");
+
+ b.HasIndex("TrialReadingCriterionId");
+
+ b.HasIndex("VisitTaskId");
+
+ b.ToTable("DataInspection", t =>
+ {
+ t.HasComment("稽查 - 记录表");
+ });
+ });
+
+ modelBuilder.Entity("IRaCIS.Core.Domain.Models.DicomAE", b =>
+ {
+ b.Property("Id")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("CalledAE")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)");
+
+ b.Property("CreateTime")
+ .HasColumnType("datetime2");
+
+ b.Property("CreateUserId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("Description")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)");
+
+ b.Property("IP")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)");
+
+ b.Property("IsSupportMutiModality")
+ .HasColumnType("bit")
+ .HasComment("是否支持多模态查询");
+
+ b.Property("IsTestOK")
+ .HasColumnType("bit");
+
+ b.Property("LatestTestTime")
+ .HasColumnType("datetime2");
+
+ b.Property("MaxStudyCount")
+ .HasColumnType("int");
+
+ b.Property("ModalityList")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("PacsSearchMaxDays")
+ .HasColumnType("int");
+
+ b.Property("PacsTypeEnum")
+ .HasColumnType("int");
+
+ b.Property("Port")
+ .HasColumnType("int");
+
+ b.Property("UpdateTime")
+ .HasColumnType("datetime2");
+
+ b.Property("UpdateUserId")
+ .HasColumnType("uniqueidentifier");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreateUserId");
+
+ b.ToTable("DicomAE", t =>
+ {
+ t.HasComment("医院dicomAE 配置");
+ });
+ });
+
+ modelBuilder.Entity("IRaCIS.Core.Domain.Models.DicomInstance", b =>
+ {
+ b.Property("SeqId")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("Anonymize")
+ .HasColumnType("bit");
+
+ b.Property("CPIStatus")
+ .HasColumnType("bit");
+
+ b.Property("CreateTime")
+ .HasColumnType("datetime2");
+
+ b.Property("CreateUserId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("FileSize")
+ .HasColumnType("bigint");
+
+ b.Property("FrameOfReferenceUID")
+ .IsRequired()
+ .HasMaxLength(400)
+ .HasColumnType("nvarchar(400)");
+
+ b.Property("HtmlPath")
+ .IsRequired()
+ .HasMaxLength(1000)
+ .HasColumnType("nvarchar(1000)");
+
+ b.Property