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

Merge branch 'Test.IRC' of http://192.168.3.69:2000/XCKJ/irc-netcore-api into Test.IRC

IRC_NewDev
he 2023-10-30 15:17:19 +08:00
parent 72215ad898 d36e3c0d91
commit ae2a3ba8a3
7 changed files with 104 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
View File

@ -786,7 +786,7 @@ namespace IRaCIS.Core.API.Controllers
} }
/// <summary> /// <summary>
/// New 项目入组 获取医生简历 /// New 项目入组 勾选获取简历路径
/// </summary> /// </summary>
/// <param name="command"></param> /// <param name="command"></param>
/// <param name="_doctorService"></param> /// <param name="_doctorService"></param>
@ -812,7 +812,7 @@ namespace IRaCIS.Core.API.Controllers
} }
/// <summary> /// <summary>
/// new 医生详情 下载指定简历 /// new 医生详情 勾选或者下载文件路径
/// </summary> /// </summary>
/// <param name="command"></param> /// <param name="command"></param>
/// <param name="_doctorService"></param> /// <param name="_doctorService"></param>

4
IRaCIS.Core.API/IRaCIS.Core.API.xml
View File

@ -293,7 +293,7 @@
</member> </member>
<member name="M:IRaCIS.Core.API.Controllers.FileController.GetTrialDoctorOfficialResume(IRaCIS.Core.API.Controllers.GetDoctorPathCommand,IRaCIS.Application.Interfaces.IDoctorService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Attachment})"> <member name="M:IRaCIS.Core.API.Controllers.FileController.GetTrialDoctorOfficialResume(IRaCIS.Core.API.Controllers.GetDoctorPathCommand,IRaCIS.Application.Interfaces.IDoctorService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Attachment})">
<summary> <summary>
New 项目入组 获取医生简历 New 项目入组 勾选获取简历路径
</summary> </summary>
<param name="command"></param> <param name="command"></param>
<param name="_doctorService"></param> <param name="_doctorService"></param>
@ -302,7 +302,7 @@
</member> </member>
<member name="M:IRaCIS.Core.API.Controllers.FileController.GetDoctorAttachment(IRaCIS.Core.API.Controllers.GetDoctoreAttachPathCommand,IRaCIS.Application.Interfaces.IDoctorService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Attachment})"> <member name="M:IRaCIS.Core.API.Controllers.FileController.GetDoctorAttachment(IRaCIS.Core.API.Controllers.GetDoctoreAttachPathCommand,IRaCIS.Application.Interfaces.IDoctorService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Attachment})">
<summary> <summary>
new 医生详情 下载指定简历 new 医生详情 勾选或者下载文件路径
</summary> </summary>
<param name="command"></param> <param name="command"></param>
<param name="_doctorService"></param> <param name="_doctorService"></param>

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

@ -1947,6 +1947,13 @@
<param name="inDto"></param> <param name="inDto"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.GetLastFDGPETOverallAssessment(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
<summary>
获取上一次FDGPET 评估
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.GetFDGPETOverallAssessment(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)"> <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.LuganoCalculateService.GetFDGPETOverallAssessment(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
<summary> <summary>
FDG-PET总体评估结果 FDG-PET总体评估结果

131
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
View File

@ -21,6 +21,7 @@ using System.Linq;
using DocumentFormat.OpenXml.Bibliography; using DocumentFormat.OpenXml.Bibliography;
using Org.BouncyCastle.Crypto; using Org.BouncyCastle.Crypto;
using IRaCIS.Core.Domain.Share.Reading; using IRaCIS.Core.Domain.Share.Reading;
using MassTransit;
namespace IRaCIS.Core.Application.Service.Allocation namespace IRaCIS.Core.Application.Service.Allocation
{ {
@ -1976,30 +1977,10 @@ namespace IRaCIS.Core.Application.Service.Allocation
{ {
if (origenalTask.ReadingCategory == ReadingCategory.Visit) if (origenalTask.ReadingCategory == ReadingCategory.Visit)
{ {
var list = _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList(); CopyForms(newTask, origenalTask);
foreach (var item in list)
{
item.Id = Guid.Empty;
item.VisitTaskId = newTask.Id;
} }
_ = _readingTaskQuestionAnswerRepository.AddRangeAsync(list).Result;
}
//else if (origenalTask.ReadingCategory == ReadingCategory.Global)
//{
// var list = _repository.Where<ReadingGlobalTaskInfo>(t => t.GlobalTaskId == origenalTask.Id).ToList();
// foreach (var item in list)
// {
// item.Id = Guid.Empty;
// item.GlobalTaskId = newTask.Id;
// }
// _ = _repository.AddRangeAsync(list).Result;
//}
} }
//拷贝后续表单 //拷贝后续表单
@ -2007,28 +1988,10 @@ namespace IRaCIS.Core.Application.Service.Allocation
{ {
if (origenalTask.ReadingCategory == ReadingCategory.Visit) if (origenalTask.ReadingCategory == ReadingCategory.Visit)
{ {
var list = _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList(); CopyForms(newTask, origenalTask);
foreach (var item in list)
{
item.Id = Guid.Empty;
item.VisitTaskId = newTask.Id;
} }
_ = _readingTaskQuestionAnswerRepository.AddRangeAsync(list).Result;
}
//else if (origenalTask.ReadingCategory == ReadingCategory.Global)
//{
// var list = _repository.Where<ReadingGlobalTaskInfo>(t => t.GlobalTaskId == origenalTask.Id).ToList();
// foreach (var item in list)
// {
// item.Id = Guid.Empty;
// item.GlobalTaskId = newTask.Id;
// }
// _ = _repository.AddRangeAsync(list).Result;
//}
} }
} }
@ -2124,15 +2087,8 @@ namespace IRaCIS.Core.Application.Service.Allocation
{ {
if (origenalTask.ReadingCategory == ReadingCategory.Visit) if (origenalTask.ReadingCategory == ReadingCategory.Visit)
{ {
var list = _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList(); CopyForms(newTask, origenalTask);
foreach (var item in list)
{
item.Id = Guid.Empty;
item.VisitTaskId = newTask.Id;
}
_ = _readingTaskQuestionAnswerRepository.AddRangeAsync(list).Result;
} }
} }
@ -2142,15 +2098,8 @@ namespace IRaCIS.Core.Application.Service.Allocation
{ {
if (origenalTask.ReadingCategory == ReadingCategory.Visit) if (origenalTask.ReadingCategory == ReadingCategory.Visit)
{ {
var list = _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList(); CopyForms(newTask, origenalTask);
foreach (var item in list)
{
item.Id = Guid.Empty;
item.VisitTaskId = newTask.Id;
}
_ = _readingTaskQuestionAnswerRepository.AddRangeAsync(list).Result;
} }
} }
@ -2209,6 +2158,74 @@ namespace IRaCIS.Core.Application.Service.Allocation
return ResponseOutput.Ok(); return ResponseOutput.Ok();
} }
private void CopyForms(VisitTask newTask, VisitTask origenalTask)
{
//自定义
var readingCustomTagList = _repository.Where<ReadingCustomTag>(t => t.VisitTaskId == origenalTask.Id).ToList();
foreach (var item in readingCustomTagList)
{
item.Id = Guid.Empty;
item.VisitTaskId = newTask.Id;
}
_ = _repository.AddRangeAsync(readingCustomTagList).Result;
var readingTaskQuestionMarkList = _repository.Where<ReadingTaskQuestionMark>(t => t.VisitTaskId == origenalTask.Id).ToList();
foreach (var item in readingTaskQuestionMarkList)
{
item.Id = Guid.Empty;
item.VisitTaskId = newTask.Id;
}
_ = _repository.AddRangeAsync(readingTaskQuestionMarkList).Result;
var readingTaskQuestionAnswerList = _repository.Where<ReadingTaskQuestionAnswer>(t => t.VisitTaskId == origenalTask.Id).ToList();
foreach (var item in readingTaskQuestionAnswerList)
{
item.Id = Guid.Empty;
item.VisitTaskId = newTask.Id;
}
_ = _repository.AddRangeAsync(readingTaskQuestionAnswerList).Result;
//ReadingTableAnswerRowInfo ReadingTableQuestionAnswer 一起加
var readingTableAnswerRowInfoList = _repository.Where<ReadingTableAnswerRowInfo>(t => t.VisitTaskId == origenalTask.Id).Include(t => t.LesionAnswerList).ToList();
foreach (var item in readingTableAnswerRowInfoList)
{
item.Id = NewId.NextSequentialGuid();
item.VisitTaskId = newTask.Id;
foreach (var item2 in item.LesionAnswerList)
{
item2.Id = Guid.Empty;
item2.RowId = item.Id;
item2.VisitTaskId = newTask.Id;
}
}
_ = _repository.AddRangeAsync(readingTableAnswerRowInfoList).Result;
//var readingTableQuestionAnswerList = _repository.Where<ReadingTableQuestionAnswer>(t => t.VisitTaskId == origenalTask.Id).ToList();
//foreach (var item in readingTableQuestionAnswerList)
//{
// item.Id = Guid.Empty;
// item.VisitTaskId = newTask.Id;
//}
//_ = _repository.AddRangeAsync(readingTableQuestionAnswerList).Result;
}
/// <summary> /// <summary>
/// PM 设置任务 退回 /// PM 设置任务 退回
@ -2590,8 +2607,6 @@ namespace IRaCIS.Core.Application.Service.Allocation
var filterObj = (await _visitTaskRepository.FirstOrDefaultNoTrackingAsync(t => t.Id == taskId)).IfNullThrowException(); var filterObj = (await _visitTaskRepository.FirstOrDefaultNoTrackingAsync(t => t.Id == taskId)).IfNullThrowException();
var trialId = filterObj.TrialId; var trialId = filterObj.TrialId;
//var trialConfig = (await _trialRepository.Where(t => t.Id == trialId).Select(t => new { TrialId = t.Id, t.IsReadingTaskViewInOrder, t.ReadingType }).FirstOrDefaultAsync()).IfNullThrowException();
var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == filterObj.TrialReadingCriterionId).Select(x => new { x.ReadingTool, x.CriterionType, x.IsAdditionalAssessment, x.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException(); var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == filterObj.TrialReadingCriterionId).Select(x => new { x.ReadingTool, x.CriterionType, x.IsAdditionalAssessment, x.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException();
Expression<Func<VisitTask, bool>> filterExpression = t => t.TrialId == trialId && t.SubjectId == filterObj.SubjectId && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze) && t.TaskAllocationState == TaskAllocationState.Allocated; Expression<Func<VisitTask, bool>> filterExpression = t => t.TrialId == trialId && t.SubjectId == filterObj.SubjectId && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze) && t.TaskAllocationState == TaskAllocationState.Allocated;

6
IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
View File

@ -197,8 +197,6 @@ namespace IRaCIS.Core.Application.Contracts
public bool IsDicomReUpload { get; set; } public bool IsDicomReUpload { get; set; }
public int FileCount { get; set; } public int FileCount { get; set; }
} }
@ -312,6 +310,8 @@ namespace IRaCIS.Core.Application.Contracts
public string WindowWidth { get; set; } public string WindowWidth { get; set; }
public bool Anonymize { get; set; } public bool Anonymize { get; set; }
public string Path { get; set; } public string Path { get; set; } = string.Empty;
public string HtmlPath { get; set; } = string.Empty;
} }
} }

6
IRaCIS.Core.Application/Service/Third-partyProject/UltrasonicDicomService.cs
View File

@ -217,6 +217,8 @@ namespace IRaCIS.Core.Application.Service.Third_partyProject
[FromServices] IRepository<DicomSeries> _dicomSeriesRepository, [FromServices] IRepository<DicomSeries> _dicomSeriesRepository,
[FromServices] IRepository<DicomInstance> _dicomInstanceRepository) [FromServices] IRepository<DicomInstance> _dicomInstanceRepository)
{ {
try try
{ {
var trialId = incommand.TrialId; var trialId = incommand.TrialId;
@ -398,10 +400,6 @@ namespace IRaCIS.Core.Application.Service.Third_partyProject
return ResponseOutput.Ok(); return ResponseOutput.Ok();
} }

1
IRaCIS.Core.Domain/Image/DicomInstance.cs
View File

@ -53,6 +53,7 @@ namespace IRaCIS.Core.Domain.Models
public Guid UpdateUserId { get; set; } public Guid UpdateUserId { get; set; }
public DateTime UpdateTime { get; set; } = DateTime.Now; public DateTime UpdateTime { get; set; } = DateTime.Now;
public string HtmlPath { get; set; }=string.Empty;
} }
} }