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

修改

Uat_Study
hang 2022-07-07 16:28:50 +08:00
parent 8aef6ddf16
commit 648761eff4
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1613,11 +1613,21 @@
文件名称 文件名称
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SendMedicalReviewDialogInDto.DoctorUserIdeaEnum"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ApplyReReadingInDto.DoctorUserIdeaEnum">
<summary> <summary>
阅片人是否认同 阅片人是否认同
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ApplyReReadingInDto.DisagreeReason">
<summary>
不同意重阅原因
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ApplyReReadingInDto.IsApplyHeavyReading">
<summary>
是否申请重阅
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SendMedicalReviewDialogInDto.IsHaveQuestion"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SendMedicalReviewDialogInDto.IsHaveQuestion">
<summary> <summary>
是否有问题 是否有问题
@ -1633,16 +1643,6 @@
审核建议 审核建议
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SendMedicalReviewDialogInDto.DisagreeReason">
<summary>
不同意重阅原因
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.SendMedicalReviewDialogInDto.IsApplyHeavyReading">
<summary>
是否申请重阅
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetMedicalReviewReadingTaskOutDto.IsClosedDialog"> <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetMedicalReviewReadingTaskOutDto.IsClosedDialog">
<summary> <summary>
是否关闭 是否关闭
@ -2506,9 +2506,9 @@
<param name="inDto"></param> <param name="inDto"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:IRaCIS.Core.Application.Service.ReadingMedicalReviewService.ApplyReReading(IRaCIS.Core.Application.Service.Reading.Dto.ApplyReReadingInDto)"> <member name="M:IRaCIS.Core.Application.Service.ReadingMedicalReviewService.IRSendMedicalReviewDialog(IRaCIS.Core.Application.Service.Reading.Dto.ApplyReReadingInDto)">
<summary> <summary>
IR 申请重阅 IR发送消息
</summary> </summary>
<param name="inDto"></param> <param name="inDto"></param>
<returns></returns> <returns></returns>

2
IRaCIS.Core.Application/Service/Allocation/DTO/TaskConsistentRuleViewModel.cs
View File

@ -20,8 +20,6 @@ namespace IRaCIS.Core.Application.ViewModel
public UserSimpleInfo AnalysisDoctorUser { get; set; } public UserSimpleInfo AnalysisDoctorUser { get; set; }
public UserSimpleInfo CompareDoctorUser { get; set; }
public int? GeneratedSubjectCount { get; set; } public int? GeneratedSubjectCount { get; set; }

6
IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
View File

@ -275,7 +275,7 @@ namespace IRaCIS.Core.Application.Service
{ {
var query = from enroll in _repository.Where<Enroll>(t => t.TrialId == trialId) var query = from enroll in _repository.Where<Enroll>(t => t.TrialId == trialId)
join user in _repository.Where<User>() on enroll.DoctorId equals user.DoctorId join user in _repository.Where<User>() on enroll.DoctorId equals user.DoctorId
join taskConsistentRule in _repository.Where<TaskConsistentRule>(t=>t.TrialId==addOrEdit.TrialId) on user.Id equals taskConsistentRule.AnalysisDoctorUserId into c join taskConsistentRule in _repository.Where<TaskConsistentRule>(t=>t.TrialId== trialId) on user.Id equals taskConsistentRule.AnalysisDoctorUserId into c
from taskConsistentRule in c.DefaultIfEmpty() from taskConsistentRule in c.DefaultIfEmpty()
select new select new
{ {
@ -298,7 +298,7 @@ namespace IRaCIS.Core.Application.Service
{ {
var verifyExp1 = new EntityVerifyExp<TaskConsistentRule>() var verifyExp1 = new EntityVerifyExp<TaskConsistentRule>()
{ {
VerifyExp = t => t.AnalysisDoctorUserId == addOrEdit.AnalysisDoctorUserId && t.TrialId == addOrEdit.TrialId, VerifyExp = t => t.AnalysisDoctorUserId == doctor.DoctorUserId && t.TrialId == trialId,
VerifyMsg = "已有该医生配置，不允许继续增加" VerifyMsg = "已有该医生配置，不允许继续增加"
}; };
@ -308,7 +308,7 @@ namespace IRaCIS.Core.Application.Service
} }
else else
{ {
await _taskConsistentRuleRepository.UpdatePartialFromQueryAsync(t => t.TrialId == addOrEdit.TrialId, c => new TaskConsistentRule() await _taskConsistentRuleRepository.UpdatePartialFromQueryAsync(t => t.TrialId == trialId, c => new TaskConsistentRule()
{ {
PlanSubjectCount = c.PlanSubjectCount, PlanSubjectCount = c.PlanSubjectCount,
PlanVisitCount = c.PlanVisitCount, PlanVisitCount = c.PlanVisitCount,