Compare commits
No commits in common. "24bfb4920cd074c3439f9e201e45bfba7cdfecf4" and "c036aab9c4b615a0c46be37cdc894317452eddf3" have entirely different histories.
24bfb4920c
...
c036aab9c4
|
|
@ -39,7 +39,7 @@ var enviromentName = config["ASPNETCORE_ENVIRONMENT"];
|
||||||
|
|
||||||
var openSwaggerStr = config["ASPNETCORE_OpenSwagger"];
|
var openSwaggerStr = config["ASPNETCORE_OpenSwagger"];
|
||||||
|
|
||||||
var isOpenSwagger= openSwaggerStr == null|| openSwaggerStr?.ToLower()=="true";
|
var isOpenSwagger= openSwaggerStr == null&& openSwaggerStr?.ToLower()=="true";
|
||||||
|
|
||||||
|
|
||||||
if (string.IsNullOrWhiteSpace(enviromentName))
|
if (string.IsNullOrWhiteSpace(enviromentName))
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,8 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ConnectionStrings": {
|
"ConnectionStrings": {
|
||||||
"RemoteNew": "Server=101.132.253.119,1435;Database=irc_Prpd_bak;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
|
"RemoteNew": "Server=47.117.164.182,1434;Database=Event_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
|
||||||
"Hangfire": "Server=101.132.253.119,1435;Database=irc_Hangfire_bak;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
|
"Hangfire": "Server=47.117.164.182,1434;Database=Event_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
|
||||||
},
|
},
|
||||||
"ObjectStoreService": {
|
"ObjectStoreService": {
|
||||||
"ObjectStoreUse": "AliyunOSS",
|
"ObjectStoreUse": "AliyunOSS",
|
||||||
|
|
|
||||||
|
|
@ -13523,16 +13523,6 @@
|
||||||
<param name="_readingConsistentClinicalDataRepository"></param>
|
<param name="_readingConsistentClinicalDataRepository"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
<member name="M:IRaCIS.Core.Application.Service.TestService.IQCBackToUpload(System.Guid[],IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialQCQuestionAnswer},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingClinicalData})">
|
|
||||||
<summary>
|
|
||||||
IQC 回退到影像上传
|
|
||||||
</summary>
|
|
||||||
<param name="subjectVisitIdList"></param>
|
|
||||||
<param name="_subjectVisitRepository"></param>
|
|
||||||
<param name="_trialQCQuestionAnswerRepository"></param>
|
|
||||||
<param name="_readingClinicalDataReposiotry"></param>
|
|
||||||
<returns></returns>
|
|
||||||
</member>
|
|
||||||
<member name="M:IRaCIS.Core.Application.Service.TestService.DealTialFileSie(IRaCIS.Core.Application.Helper.IOSSService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudyFile},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingClinicalDataPDF})">
|
<member name="M:IRaCIS.Core.Application.Service.TestService.DealTialFileSie(IRaCIS.Core.Application.Helper.IOSSService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudyFile},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingClinicalDataPDF})">
|
||||||
<summary>
|
<summary>
|
||||||
非dicom 临床数据
|
非dicom 临床数据
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,6 @@ using IRaCIS.Core.Application.Helper;
|
||||||
using IRaCIS.Core.Application.Service.BusinessFilter;
|
using IRaCIS.Core.Application.Service.BusinessFilter;
|
||||||
using IRaCIS.Core.Application.ViewModel;
|
using IRaCIS.Core.Application.ViewModel;
|
||||||
using IRaCIS.Core.Domain;
|
using IRaCIS.Core.Domain;
|
||||||
using IRaCIS.Core.Domain.Models;
|
|
||||||
using IRaCIS.Core.Domain.Share;
|
using IRaCIS.Core.Domain.Share;
|
||||||
using IRaCIS.Core.Infra.EFCore;
|
using IRaCIS.Core.Infra.EFCore;
|
||||||
using IRaCIS.Core.Infrastructure;
|
using IRaCIS.Core.Infrastructure;
|
||||||
|
|
@ -87,87 +86,6 @@ namespace IRaCIS.Core.Application.Service
|
||||||
await _readingConsistentClinicalDataRepository.SaveChangesAsync();
|
await _readingConsistentClinicalDataRepository.SaveChangesAsync();
|
||||||
return ResponseOutput.Ok();
|
return ResponseOutput.Ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// IQC 回退到影像上传
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="subjectVisitIdList"></param>
|
|
||||||
/// <param name="_subjectVisitRepository"></param>
|
|
||||||
/// <param name="_trialQCQuestionAnswerRepository"></param>
|
|
||||||
/// <param name="_readingClinicalDataReposiotry"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
[AllowAnonymous]
|
|
||||||
[HttpPost]
|
|
||||||
public async Task<IResponseOutput> IQCBackToUpload(Guid[] subjectVisitIdList,
|
|
||||||
[FromServices] IRepository<SubjectVisit> _subjectVisitRepository,
|
|
||||||
[FromServices] IRepository<TrialQCQuestionAnswer> _trialQCQuestionAnswerRepository,
|
|
||||||
[FromServices] IRepository<ReadingClinicalData> _readingClinicalDataReposiotry)
|
|
||||||
{
|
|
||||||
|
|
||||||
foreach (var subjectVisitId in subjectVisitIdList)
|
|
||||||
{
|
|
||||||
var sv = (await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == subjectVisitId)).IfNullThrowException();
|
|
||||||
|
|
||||||
|
|
||||||
//需要重新产生任务
|
|
||||||
sv.IsVisitTaskGenerated = false;
|
|
||||||
sv.IsPMBackOrReReading = true;
|
|
||||||
|
|
||||||
sv.AuditState = AuditStateEnum.None;
|
|
||||||
sv.SubmitState = SubmitStateEnum.ToSubmit;
|
|
||||||
sv.ReadingStatus = ReadingStatusEnum.ImageNotSubmit;
|
|
||||||
|
|
||||||
//回退后,回退状态恢复
|
|
||||||
sv.RequestBackState = RequestBackStateEnum.NotRequest;
|
|
||||||
sv.IsCheckBack = false;
|
|
||||||
sv.CheckBackTime = null;
|
|
||||||
sv.CheckState = CheckStateEnum.None;
|
|
||||||
sv.CheckChallengeState = CheckChanllengeTypeEnum.None;
|
|
||||||
|
|
||||||
sv.SVENDTC = null;
|
|
||||||
sv.SVSTDTC = null;
|
|
||||||
|
|
||||||
sv.PreliminaryAuditTime = null;
|
|
||||||
sv.SubmitTime = null;
|
|
||||||
sv.ReviewAuditTime = null;
|
|
||||||
sv.CurrentActionUserExpireTime = null;
|
|
||||||
|
|
||||||
|
|
||||||
sv.IsTake = false;
|
|
||||||
sv.CurrentActionUserId = null;
|
|
||||||
sv.PreliminaryAuditUserId = null;
|
|
||||||
sv.ReviewAuditUserId = null;
|
|
||||||
|
|
||||||
|
|
||||||
if (sv.IsBaseLine)
|
|
||||||
{
|
|
||||||
await _readingClinicalDataReposiotry.UpdatePartialFromQueryAsync(t => t.ReadingId == sv.Id && (t.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Subject || t.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit), c => new ReadingClinicalData() { IsSign = false, ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded });
|
|
||||||
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
await _readingClinicalDataReposiotry.UpdatePartialFromQueryAsync(t => t.ReadingId == sv.Id && t.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit, c => new ReadingClinicalData()
|
|
||||||
{
|
|
||||||
IsSign = false,
|
|
||||||
ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded,
|
|
||||||
IsBlind = null,
|
|
||||||
IsComplete = null
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
await _trialQCQuestionAnswerRepository.BatchDeleteNoTrackingAsync(t => t.SubjectVisitId == subjectVisitId);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
var success = await _subjectVisitRepository.SaveChangesAsync();
|
|
||||||
|
|
||||||
return ResponseOutput.Ok();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<IResponseOutput> DeleteOSSDate(string rootFolder,
|
public async Task<IResponseOutput> DeleteOSSDate(string rootFolder,
|
||||||
[FromServices] IOSSService _oSSService, [FromServices] IWebHostEnvironment _hostEnvironment)
|
[FromServices] IOSSService _oSSService, [FromServices] IWebHostEnvironment _hostEnvironment)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue