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

调试状态
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-10-25 14:26:14 +08:00
parent 8329362c33
commit 57aedd7dd4
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
View File

@ -152,7 +152,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
/// </summary> /// </summary>
/// <param name="command"></param> /// <param name="command"></param>
/// <returns></returns> /// <returns></returns>
[TrialGlobalLimit( "AfterStopCannNotOpt" )] [TrialGlobalLimit("AfterStopCannNotOpt")]
public async Task<IResponseOutput> BatchAssignDoctorToSubject(BatchAssignDoctorToSubjectCommand command) public async Task<IResponseOutput> BatchAssignDoctorToSubject(BatchAssignDoctorToSubjectCommand command)
{ {
//var inOrder = _trialRepository.Where(t => t.Id == command.TrialId).Select(t => t.IsReadingTaskViewInOrder).FirstOrDefault(); //var inOrder = _trialRepository.Where(t => t.Id == command.TrialId).Select(t => t.IsReadingTaskViewInOrder).FirstOrDefault();
@ -254,7 +254,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
/// <returns></returns> /// <returns></returns>
/// <exception cref="BusinessValidationFailedException"></exception> /// <exception cref="BusinessValidationFailedException"></exception>
[HttpPost] [HttpPost]
[TrialGlobalLimit( "AfterStopCannNotOpt" )] [TrialGlobalLimit("AfterStopCannNotOpt")]
public async Task<IResponseOutput> CancelSubjectAssignedDoctor(CancelSubjectDoctorCommand cancelCommand) public async Task<IResponseOutput> CancelSubjectAssignedDoctor(CancelSubjectDoctorCommand cancelCommand)
{ {
foreach (var command in cancelCommand.CancelList.Where(t => t.IsCancelAssign)) foreach (var command in cancelCommand.CancelList.Where(t => t.IsCancelAssign))
@ -295,7 +295,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[UnitOfWork] [UnitOfWork]
[TrialGlobalLimit( "AfterStopCannNotOpt" )] [TrialGlobalLimit("AfterStopCannNotOpt")]
public async Task<IResponseOutput> AssignSubjectTaskToDoctor(AssignSubjectTaskToDoctorCommand assignSubjectTaskToDoctorCommand) public async Task<IResponseOutput> AssignSubjectTaskToDoctor(AssignSubjectTaskToDoctorCommand assignSubjectTaskToDoctorCommand)
{ {
var visitTask = await _visitTaskRepository.FirstOrDefaultAsync(t => t.Id == assignSubjectTaskToDoctorCommand.Id); var visitTask = await _visitTaskRepository.FirstOrDefaultAsync(t => t.Id == assignSubjectTaskToDoctorCommand.Id);
@ -425,7 +425,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[UnitOfWork] [UnitOfWork]
[TrialGlobalLimit( "AfterStopCannNotOpt" )] [TrialGlobalLimit("AfterStopCannNotOpt")]
public async Task<IResponseOutput> AssignSubjectDoctor(AssginSubjectDoctorCommand assginSubjectDoctorCommand) public async Task<IResponseOutput> AssignSubjectDoctor(AssginSubjectDoctorCommand assginSubjectDoctorCommand)
{ {
var trialId = assginSubjectDoctorCommand.TrialId; var trialId = assginSubjectDoctorCommand.TrialId;
@ -504,7 +504,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
/// </summary> /// </summary>
/// <returns></returns> 数量 /// <returns></returns> 数量
[HttpPost] [HttpPost]
[TrialGlobalLimit( "AfterStopCannNotOpt" )] [TrialGlobalLimit("AfterStopCannNotOpt")]
public async Task<IResponseOutput> CancelSubjectAssignDoctor(CancelSubjectAssignCommand cancelSubjectAssignCommand) public async Task<IResponseOutput> CancelSubjectAssignDoctor(CancelSubjectAssignCommand cancelSubjectAssignCommand)
{ {
if (cancelSubjectAssignCommand.IsJudgeDoctor) if (cancelSubjectAssignCommand.IsJudgeDoctor)
@ -547,7 +547,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[UnitOfWork] [UnitOfWork]
[TrialGlobalLimit( "AfterStopCannNotOpt" )] [TrialGlobalLimit("AfterStopCannNotOpt")]
public async Task<IResponseOutput> ManualAssignDoctorApplyTask(AssignConfirmCommand assignConfirmCommand) public async Task<IResponseOutput> ManualAssignDoctorApplyTask(AssignConfirmCommand assignConfirmCommand)
{ {
var trialId = assignConfirmCommand.TrialId; var trialId = assignConfirmCommand.TrialId;
@ -1309,7 +1309,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[UnitOfWork] [UnitOfWork]
[TrialGlobalLimit( "AfterStopCannNotOpt" )] [TrialGlobalLimit("AfterStopCannNotOpt")]
public async Task<IResponseOutput> ApplyReReading(ApplyReReadingCommand applyReReadingCommand) public async Task<IResponseOutput> ApplyReReading(ApplyReReadingCommand applyReReadingCommand)
{ {
@ -1332,6 +1332,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
throw new BusinessValidationFailedException(_localizer["VisitTask_BackendData"]); throw new BusinessValidationFailedException(_localizer["VisitTask_BackendData"]);
} }
Console.WriteLine("重阅申请状态", (int)task.ReReadingApplyState);
if (task.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed || task.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed || task.ReReadingApplyState == ReReadingApplyState.Agree) if (task.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed || task.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed || task.ReReadingApplyState == ReReadingApplyState.Agree)
{ {
//---重阅已申请，或者重阅已同意状态下不允许申请重阅 //---重阅已申请，或者重阅已同意状态下不允许申请重阅
@ -1579,7 +1580,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[UnitOfWork] [UnitOfWork]
[TrialGlobalLimit( "AfterStopCannNotOpt" )] [TrialGlobalLimit("AfterStopCannNotOpt")]
public async Task<IResponseOutput> ConfirmReReading(ConfirmReReadingCommand agreeReReadingCommand, [FromServices] IVisitTaskHelpeService _visitTaskCommonService) public async Task<IResponseOutput> ConfirmReReading(ConfirmReReadingCommand agreeReReadingCommand, [FromServices] IVisitTaskHelpeService _visitTaskCommonService)
{ {
@ -2223,7 +2224,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
/// <returns></returns> /// <returns></returns>
[HttpPut("{trialId:guid}/{taskId:guid}")] [HttpPut("{trialId:guid}/{taskId:guid}")]
[UnitOfWork] [UnitOfWork]
[TrialGlobalLimit( "AfterStopCannNotOpt" )] [TrialGlobalLimit("AfterStopCannNotOpt")]
public async Task<IResponseOutput> PMSetTaskBack(Guid trialId, Guid taskId) public async Task<IResponseOutput> PMSetTaskBack(Guid trialId, Guid taskId)
{ {

4
IRaCIS.Core.Domain/Document/SystemDocument.cs
View File

@ -22,3 +22,7 @@ public class SystemDocument : BaseFullDeleteAuditEntity
public string Path { get; set; } = string.Empty; public string Path { get; set; } = string.Empty;
} }
public enum UserSignType
{
}