XCKJ
/
EI-Image-Viewer-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

Test.EIImageViewer
he 2023-03-01 15:52:22 +08:00
parent fd914997ba 4809b012e8
commit ea0d3e08d8
5 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs
View File

@ -23,6 +23,8 @@ namespace IRaCIS.Core.Application.ViewModel
public Guid CreateUserId { get; set; } public Guid CreateUserId { get; set; }
public string TrialCriterionName { get; set; }
public List<EmailUserInfoDto> TrialEmailNoticeUserList { get; set; } public List<EmailUserInfoDto> TrialEmailNoticeUserList { get; set; }

27
IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
View File

@ -196,7 +196,7 @@ namespace IRaCIS.Core.Application.Service
//生成任务 //生成任务
foreach (var taskId in taskIdList) foreach (var taskId in taskIdList)
{ {
await _taskMedicalReviewRepository.AddAsync(new TaskMedicalReview() { TrialId = trialId, VisitTaskId = taskId, MedicalManagerUserId = minUserIdList.FirstOrDefault(), AllocateTime = DateTime.Now }); await _taskMedicalReviewRepository.AddAsync(new TaskMedicalReview() { TrialId = trialId, VisitTaskId = taskId, MedicalManagerUserId = minUserIdList.FirstOrDefault(), AllocateTime = DateTime.Now },true);
} }
} }
@ -480,28 +480,9 @@ namespace IRaCIS.Core.Application.Service
&& t.ReadingTaskState == ReadingTaskState.HaveSigned && t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId).OrderBy(t=>t.SignTime).FirstOrDefaultAsync(); && t.ReadingTaskState == ReadingTaskState.HaveSigned && t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId).OrderBy(t=>t.SignTime).FirstOrDefaultAsync();
//入组确认的医生已确定 //入组确认的医生已确定
if(existFirstEnrollTask!= null) if( (existFirstEnrollTask != null) &&(taskInfo.DoctorUserId != existFirstEnrollTask.DoctorUserId) )
{ {
if(taskInfo.DoctorUserId==existFirstEnrollTask.DoctorUserId) isNeedSend = false;
{
isNeedSend = await DealMedicalReviewTasKGenerateAndIsSendAsync(taskInfo.TrialId, isHandSend, answer, new List<Guid>() { visitTaskId }, minUserIdList);
if (answer == "是")
{
//把另外一个人的任务设置为不加急（如果项目加急是否 subject 加急是否）
var urgent = _repository.Where<SubjectVisit>(t => t.Id == taskInfo.SourceSubjectVisitId).Select(t => new { IsSubjectUrgent = t.Subject.IsUrgent, t.Trial.IsUrgent }).FirstOrDefault();
if (urgent?.IsUrgent == false || urgent?.IsSubjectUrgent == false)
{
await _visitTaskRepository.BatchUpdateNoTrackingAsync(t => t.SourceSubjectVisitId == taskInfo.SourceSubjectVisitId && t.TaskState == TaskState.Effect && t.IsAnalysisCreate == false &&
t.Id != visitTaskId && t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId, u => new VisitTask() { IsUrgent = false });
}
}
}
else
{
isNeedSend = false;
}
} }
else else
{ {

2
IRaCIS.Core.Application/Service/Document/_MapConfig.cs
View File

@ -70,6 +70,8 @@ namespace IRaCIS.Core.Application.Service
CreateMap<TrialEmailNoticeConfig, TrialEmailNoticeConfigView>() CreateMap<TrialEmailNoticeConfig, TrialEmailNoticeConfigView>()
.ForMember(d => d.TrialCriterionName, c => c.MapFrom(t => t.TrialReadingCriterion.CriterionName))
.ForMember(d => d.TrialEmailNoticeUserList, c => c.MapFrom(t => t.TrialEmailNoticeUserList)); .ForMember(d => d.TrialEmailNoticeUserList, c => c.MapFrom(t => t.TrialEmailNoticeUserList));
CreateMap<TrialEmailNoticeConfigAddOrEdit, TrialEmailNoticeConfig>(); CreateMap<TrialEmailNoticeConfigAddOrEdit, TrialEmailNoticeConfig>();

6
IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs
View File

@ -76,7 +76,11 @@ namespace IRaCIS.Core.Domain.Models
public Guid? TrialReadingCriterionId { get; set; } public Guid? TrialReadingCriterionId { get; set; }
[Required] [ForeignKey("TrialReadingCriterionId")]
[JsonIgnore]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
[Required]
public string FilePath { get; set; } = string.Empty; public string FilePath { get; set; } = string.Empty;
[Required] [Required]

9
IRaCIS.Core.Domain/SQLFile/Test.sql
View File

@ -949,4 +949,11 @@ where ReadingQuestionTrial.ReadingQuestionSystemId is not null and ReadingTableQ
---------------------------------------------2023-02-20----------------------------------- ---------------------------------------------2023-02-20-----------------------------------
--维护全局阅片是否修改状态 --维护全局阅片是否修改状态
update ReadingTaskQuestionAnswer set IsGlobalChange=1 where GlobalChangeAnswer is not null and GlobalChangeAnswer!='' and Answer!=GlobalChangeAnswer update ReadingTaskQuestionAnswer set IsGlobalChange=1 where GlobalChangeAnswer is not null and GlobalChangeAnswer!='' and Answer!=GlobalChangeAnswer
-----20230301
update CommonDocument set Name='PD进展报告.docx' where Name='PCR_v1.0_Final.docx'
update CommonDocument set Name='入组确认报告.docx' where Name='ECR_v1.0_Final.docx'
update TrialEmailNoticeConfig set FileName='PD进展报告.docx' where FileName='PCR_v1.0_Final.docx'
update TrialEmailNoticeConfig set FileName='入组确认报告.docx' where FileName='ECR_v1.0_Final.docx'