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

Browse Source
This commit is contained in:
he
2023-11-08 09:08:23 +08:00
parent 2cc362edfc 8e5e638914
commit 5bcba84acb
49 changed files with 185 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs
+1 -1
View File
@@ -114,7 +114,7 @@ namespace IRaCIS.Core.Application.Service
[HttpDelete("{commonDocumentId:guid}")]
public async Task<IResponseOutput> DeleteCommonDocument(Guid commonDocumentId)
{
var success = await _commonDocumentRepository.DeleteFromQueryAsync(t => t.Id == commonDocumentId, true);
var success = await _commonDocumentRepository.DeleteFromQueryAsync(t => t.Id == commonDocumentId, true,true);
return ResponseOutput.Ok();
}
IRaCIS.Core.Application/Service/Common/_MapConfig.cs
-5
View File
@@ -11,12 +11,7 @@ namespace IRaCIS.Core.Application.Service
{
public CommonConfig()
{
CreateMap<Message, SysMessageDTO>()
.ForMember(o => o.MessageTime, t => t.MapFrom(u => u.MessageTime.ToString()));
CreateMap<SystemLog, SystemLogDTO>();
CreateMap<SystemLogDTO, SystemLog>();
CreateMap<FrontAuditConfig, FrontAuditConfigAddOrEdit>().ReverseMap();
IRaCIS.Core.Application/Service/Doctor/DoctorService.cs
+15 -17
View File
@@ -12,7 +12,6 @@ namespace IRaCIS.Application.Services
public class DoctorService : BaseService, IDoctorService
{
private readonly IRepository<Doctor> _doctorRepository;
private readonly IRepository<Message> _messageRepository;
private readonly IRepository<Enroll> _enrollRepository;
private readonly IRepository<DoctorDictionary> _doctorDictionaryRepository;
private readonly IRepository<Attachment> _attachmentRepository;
@@ -26,7 +25,7 @@ namespace IRaCIS.Application.Services
public DoctorService(IRepository<Doctor> doctorInfoRepository,
IRepository<Dictionary> dictionaryRepository,
IRepository<Message> sysMessageRepository, IRepository<Enroll> intoGroupRepository,
IRepository<Enroll> intoGroupRepository,
IRepository<DoctorDictionary> doctorDictionaryRepository,
IRepository<Attachment> attachmentRepository,
IRepository<DoctorCriterionFile> doctorCriterionFileRepository,
@@ -35,7 +34,6 @@ namespace IRaCIS.Application.Services
IRepository<TrialPaymentPrice> trialExtRepository, IRepository<Vacation> vacationRepository)
{
_doctorRepository = doctorInfoRepository;
_messageRepository = sysMessageRepository;
_enrollRepository = intoGroupRepository;
_doctorDictionaryRepository = doctorDictionaryRepository;
_attachmentRepository = attachmentRepository;
@@ -457,20 +455,20 @@ namespace IRaCIS.Application.Services
if (success)
{
if (!string.IsNullOrWhiteSpace(auditResumeParam.MessageContent))
{
var message = new Message
{
FromUserId = userId,
ToDoctorId = auditResumeParam.Id,
Title = "Resume review results",
Content = auditResumeParam.MessageContent,
HasRead = false,
MessageTime = DateTime.Now
};
await _repository.AddAsync(message);
success = await _repository.SaveChangesAsync();
}
//if (!string.IsNullOrWhiteSpace(auditResumeParam.MessageContent))
//{
// var message = new Message
// {
// FromUserId = userId,
// ToDoctorId = auditResumeParam.Id,
// Title = "Resume review results",
// Content = auditResumeParam.MessageContent,
// HasRead = false,
// MessageTime = DateTime.Now
// };
// await _repository.AddAsync(message);
// success = await _repository.SaveChangesAsync();
//}
}
return ResponseOutput.Result(success);
IRaCIS.Core.Application/Service/ImageAndDoc/InstanceService.cs
+10 -9
View File
@@ -11,13 +11,14 @@ namespace IRaCIS.Core.Application.Services
{
private readonly IRepository<DicomInstance> _instanceRepository;
private readonly IRepository<DicomStudy> _studyRepository;
private readonly IRepository<KeyInstance> _keyInstanceRepository;
public InstanceService(IRepository<DicomInstance> instanceRepository, IRepository<DicomStudy> studyRepository,
IRepository<KeyInstance> keyInstanceRepository )
//private readonly IRepository<KeyInstance> _keyInstanceRepository;
public InstanceService(IRepository<DicomInstance> instanceRepository, IRepository<DicomStudy> studyRepository
//,IRepository<KeyInstance> keyInstanceRepository
)
{
_instanceRepository = instanceRepository;
_studyRepository = studyRepository;
_keyInstanceRepository = keyInstanceRepository;
//_keyInstanceRepository = keyInstanceRepository;
}
/// <summary> 指定资源Id，获取Dicom序列所属的实例信息列表 </summary>
@@ -42,11 +43,11 @@ namespace IRaCIS.Core.Application.Services
[HttpGet, Route("{seriesId:guid}/{tpCode?}/{key?}")]
public IEnumerable<Guid> List(Guid seriesId, string tpCode, bool? key)
{
if (key != null && key.HasValue && key.Value)
{
return _keyInstanceRepository.Where(s => s.TpCode == tpCode).Select(t => t.InstanceId).Distinct();
}
else
//if (key != null && key.HasValue && key.Value)
//{
// return _keyInstanceRepository.Where(s => s.TpCode == tpCode).Select(t => t.InstanceId).Distinct();
//}
//else
return _instanceRepository.Where(s => s.SeriesId == seriesId).OrderBy(s => s.InstanceNumber).Select(t => t.Id);
}
IRaCIS.Core.Application/Service/ImageAndDoc/SeriesService.cs
+7 -6
View File
@@ -10,19 +10,20 @@ namespace IRaCIS.Core.Application.Services
[AllowAnonymous]
public class SeriesService : BaseService
{
private readonly IRepository<ImageLabel> _imageLabelRepository;
//private readonly IRepository<KeyInstance> _keyInstanceRepository;
// private readonly IRepository<ImageLabel> _imageLabelRepository;
private readonly IRepository<DicomSeries> _seriesRepository;
private readonly IRepository<DicomInstance> _instanceRepository;
private readonly IRepository<DicomStudy> _studyRepository;
private readonly IRepository<KeyInstance> _keyInstanceRepository;
public SeriesService(IRepository<DicomInstance> instanceRepository, IRepository<DicomStudy> studyRepository,
IRepository<KeyInstance> keyInstanceRepository, IRepository<DicomSeries> seriesRepository, IRepository<ImageLabel> imageLabelRepository)
public SeriesService(IRepository<DicomInstance> instanceRepository, IRepository<DicomStudy> studyRepository, IRepository<DicomSeries> seriesRepository
/* IRepository<KeyInstance> keyInstanceRepository, IRepository<ImageLabel> imageLabelRepository*/)
{
_seriesRepository = seriesRepository;
_instanceRepository = instanceRepository;
_studyRepository = studyRepository;
_keyInstanceRepository = keyInstanceRepository;
_imageLabelRepository = imageLabelRepository;
//_keyInstanceRepository = keyInstanceRepository;
//_imageLabelRepository = imageLabelRepository;
}
IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs
+1 -4
View File
@@ -19,8 +19,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<AddInstanceDto, DicomInstance>();
CreateMap<Report, ReportDTO>();
CreateMap<ImageLabel, ImageLabelDTO>();
CreateMap<DicomSeries, DicomSeriesWithLabelDTO>();
//影像上传 检查
@@ -73,11 +72,9 @@ namespace IRaCIS.Core.Application.Service
CreateMap<ImageShareCommand, ImageShare>();
CreateMap<StudyDTFAddOrUpdateCommand, StudyDTF>();
CreateMap<StudyStatusDetail, StudyStatusDetailDTO>();
CreateMap<DicomInstance, DicomInstanceDTO>()
.ForMember(o => o.IsDeleted, t => t.MapFrom(u => u.DicomSerie.IsDeleted))
IRaCIS.Core.Application/Service/ReadingAndReport/DTO/GlobalReportDTO.cs
-1
View File
@@ -69,7 +69,6 @@ namespace IRaCIS.Core.Application.Contracts
public class AdReportDTO
{
public WorkloadAD ADInfo { get; set; } = new WorkloadAD();
public PreviousGlobalReadsView Global1 { get; set; } = new PreviousGlobalReadsView();
public PreviousGlobalReadsView Global2 { get; set; } = new PreviousGlobalReadsView();
IRaCIS.Core.Application/Service/ReadingAndReport/_MapConfig.cs
-3
View File
@@ -12,10 +12,7 @@ namespace IRaCIS.Core.Application.Service
{
CreateMap<LesionInformation, VisitLesion>();
CreateMap<ReportDTO, Report>();
CreateMap<ImageLabelDTO, ImageLabel>();
CreateMap<GlobalReportCommand, GlobalRS>();
}
}
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/PersonalWorkstationViewModel.cs
+4 -1
View File
@@ -288,7 +288,7 @@ namespace IRaCIS.Core.Application.Contracts
public string TrialStatusStr { get; set; }
#region PM
public int? ExpetiedTaskCount { get; set; }
@@ -299,6 +299,9 @@ namespace IRaCIS.Core.Application.Contracts
public int? PendingResponseCount { get; set; }
#endregion
public bool IsIQCHaveToBeDone { get; set; }
public bool IsCRCHaveToBeDone { get; set; }
IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
-19
View File
@@ -1283,25 +1283,6 @@ namespace IRaCIS.Core.Application
}
#region 废弃
#region 上传影像
#endregion
#region QC
#endregion
#region 一致性核查
#endregion
#region 阅片
#endregion
#endregion
#endregion
IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
-1
View File
@@ -548,7 +548,6 @@ namespace IRaCIS.Application.Services
await _repository.BatchDeleteAsync<VisitTaskReReading>(t => t.OriginalReReadingTask.TrialId == trialId);
await _repository.BatchDeleteAsync<VisitTask>(t => t.TrialId == trialId);
await _repository.BatchDeleteAsync<TrialAttachment>(t => t.TrialId == trialId);
await _repository.BatchDeleteAsync<TrialStateChange>(t => t.TrialId == trialId) ;
return ResponseOutput.Ok();