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

[医学审核统计修改2]

IRC_NewDev
hang 2024-03-08 11:03:03 +08:00
parent 40ab925a4e
commit 7572bf9fb0
5 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewRuleService.cs
View File

@ -67,11 +67,11 @@ namespace IRaCIS.Core.Application.Service
public async Task<IResponseOutput> DeleteTaskMedicalReviewRule(Guid taskMedicalReviewRuleId) public async Task<IResponseOutput> DeleteTaskMedicalReviewRule(Guid taskMedicalReviewRuleId)
{ {
if(await _taskMedicalReviewRuleRepository.Where(t=>t.Id== taskMedicalReviewRuleId).AnyAsync(t => t.TaskMedicalReviewList.Any())) //if(await _taskMedicalReviewRuleRepository.Where(t=>t.Id== taskMedicalReviewRuleId).AnyAsync(t => t.TaskMedicalReviewList.Any()))
{ //{
//"已产生医学审核任务" // //"已产生医学审核任务"
return ResponseOutput.NotOk(_localizer["TaskMedicalRule_TaskStarted"]); // return ResponseOutput.NotOk(_localizer["TaskMedicalRule_TaskStarted"]);
} //}
var success = await _taskMedicalReviewRuleRepository.DeleteFromQueryAsync(t => t.Id == taskMedicalReviewRuleId,true); var success = await _taskMedicalReviewRuleRepository.DeleteFromQueryAsync(t => t.Id == taskMedicalReviewRuleId,true);

4
IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
View File

@ -92,8 +92,8 @@ namespace IRaCIS.Core.Domain.Models
/// </summary> /// </summary>
//public Guid DoctorUserId { get; set; } //public Guid DoctorUserId { get; set; }
[JsonIgnore] //[JsonIgnore]
public TaskMedicalReviewRule TaskMedicalReviewRule { get; set; } //public TaskMedicalReviewRule TaskMedicalReviewRule { get; set; }
/// <summary> /// <summary>

10
IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs
View File

@ -41,12 +41,14 @@ namespace IRaCIS.Core.Domain.Models
public int PlanGlobalCount { get; set; } public int PlanGlobalCount { get; set; }
public int PlanTumorCount { get; set; } public int PlanTumorCount { get; set; }
[JsonIgnore] [JsonIgnore]
public User DoctorUser { get; set; } public User DoctorUser { get; set; }
[JsonIgnore]
public List<VisitTask> DoctorTrialVisitTaskList { get; set; } //[JsonIgnore]
[JsonIgnore] //public List<VisitTask> DoctorTrialVisitTaskList { get; set; }
public List<TaskMedicalReview> TaskMedicalReviewList { get; set; } //[JsonIgnore]
//public List<TaskMedicalReview> TaskMedicalReviewList { get; set; }
} }

4
IRaCIS.Core.Domain/Allocation/VisitTask.cs
View File

@ -134,8 +134,8 @@ namespace IRaCIS.Core.Domain.Models
//public TaskAllocationRule DoctorTaskAllocationRule { get; set; } //public TaskAllocationRule DoctorTaskAllocationRule { get; set; }
[JsonIgnore] //[JsonIgnore]
public TaskMedicalReviewRule DoctorTaskMedicalReviewRule { get; set; } //public TaskMedicalReviewRule DoctorTaskMedicalReviewRule { get; set; }

2
IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
View File

@ -70,7 +70,7 @@ namespace IRaCIS.Core.Infra.EFCore
modelBuilder.Entity<User>().HasMany(t => t.VisitTaskList).WithOne(t => t.DoctorUser).HasForeignKey(t => t.DoctorUserId).IsRequired(false); modelBuilder.Entity<User>().HasMany(t => t.VisitTaskList).WithOne(t => t.DoctorUser).HasForeignKey(t => t.DoctorUserId).IsRequired(false);
modelBuilder.Entity<TaskMedicalReviewRule>().HasMany(t => t.DoctorTrialVisitTaskList).WithOne(t => t.DoctorTaskMedicalReviewRule).HasForeignKey(t => new { t.DoctorUserId, t.TrialId }).HasPrincipalKey(u => new { u.DoctorUserId, u.TrialId }); //modelBuilder.Entity<TaskMedicalReviewRule>().HasMany(t => t.DoctorTrialVisitTaskList).WithOne(t => t.DoctorTaskMedicalReviewRule).HasForeignKey(t => new { t.DoctorUserId, t.TrialId }).HasPrincipalKey(u => new { u.DoctorUserId, u.TrialId });
//modelBuilder.Entity<TaskMedicalReviewRule>().HasMany(t => t.TaskMedicalReviewList).WithOne(t => t.TaskMedicalReviewRule).HasForeignKey(t => new { t.DoctorUserId, t.TrialId }).HasPrincipalKey(u => new { u.DoctorUserId, u.TrialId }); //modelBuilder.Entity<TaskMedicalReviewRule>().HasMany(t => t.TaskMedicalReviewList).WithOne(t => t.TaskMedicalReviewRule).HasForeignKey(t => new { t.DoctorUserId, t.TrialId }).HasPrincipalKey(u => new { u.DoctorUserId, u.TrialId });