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

[一致性分析预提交]

IRC_NewDev
hang 2024-02-29 16:08:39 +08:00
parent 5656e66c28
commit 8e3dc73408
11 changed files with 208 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -287,6 +287,17 @@ namespace IRaCIS.Core.Application.ViewModel
}
public class UpdateTrialSiteCodeCommand
{
public Guid TrialId { get; set; }
public string VirtualSiteCode { get; set; }
}
public class UpdateTrialSiteCodeCommandView: UpdateTrialSiteCodeCommand
{
public DateTime Creatime { get; set; }
}
///<summary> TaskConsistentRuleAddOrEdit 列表查询参数模型</summary>
public class TaskConsistentRuleAddOrEdit

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

@ -32,9 +32,15 @@ namespace IRaCIS.Core.Application.Service
private readonly IRepository<Subject> _subjectRepository;
private readonly IRepository<Enroll> _enrollRepository;
private readonly IDistributedLockProvider _distributedLockProvider;
private readonly IRepository<Trial> _trialRepository;
private readonly IRepository<TrialSite> _trialSiteRepository;
private readonly IRepository<TrialVirtualSiteCodeUpdate> _trialVirtualSiteCodeUpdateRepository;
public TaskConsistentRuleService(IRepository<VisitTask> visitTaskRepository, IRepository<Enroll> enrollRepository, IRepository<TaskConsistentRule> taskConsistentRuleRepository, IRepository<SubjectUser> subjectUserRepository, IRepository<Subject> subjectRepository, IDistributedLockProvider distributedLockProvider)
public TaskConsistentRuleService(IRepository<VisitTask> visitTaskRepository, IRepository<Enroll> enrollRepository, IRepository<TaskConsistentRule> taskConsistentRuleRepository, IRepository<SubjectUser> subjectUserRepository, IRepository<Subject> subjectRepository, IDistributedLockProvider distributedLockProvider,
IRepository<Trial> trialRepository, IRepository<TrialSite> trialSiteRepository, IRepository<TrialVirtualSiteCodeUpdate> trialVirtualSiteCodeUpdateRepository)
{
_taskConsistentRuleRepository = taskConsistentRuleRepository;
_visitTaskRepository = visitTaskRepository;
@ -42,6 +48,12 @@ namespace IRaCIS.Core.Application.Service
_subjectRepository = subjectRepository;
_enrollRepository = enrollRepository;
_distributedLockProvider = distributedLockProvider;
_trialRepository = trialRepository;
_trialSiteRepository = trialSiteRepository;
_trialVirtualSiteCodeUpdateRepository = trialVirtualSiteCodeUpdateRepository;
}
/// <summary>
@ -69,7 +81,7 @@ namespace IRaCIS.Core.Application.Service
/// <param name="queryVisitTask"></param>
/// <returns></returns>
[HttpPost]
public async Task<PageOutput<AnalysisTaskView>> GetAnalysisTaskList(VisitTaskQuery queryVisitTask)
public async Task<IResponseOutput<PageOutput<AnalysisTaskView>>> GetAnalysisTaskList(VisitTaskQuery queryVisitTask)
{
var visitTaskQueryable = _visitTaskRepository.Where(t => t.TrialId == queryVisitTask.TrialId)
.Where(t => t.IsAnalysisCreate)
@ -97,8 +109,9 @@ namespace IRaCIS.Core.Application.Service
var pageList = await visitTaskQueryable.ToPagedListAsync(queryVisitTask.PageIndex, queryVisitTask.PageSize, queryVisitTask.SortField, queryVisitTask.Asc, string.IsNullOrWhiteSpace(queryVisitTask.SortField), defalutSortArray);
//var trialTaskConfig = _repository.Where<Trial>(t => t.Id == queryVisitTask.TrialId).ProjectTo<TrialTaskConfigView>(_mapper.ConfigurationProvider).FirstOrDefault();
return pageList;
var trialTaskConfig = _repository.Where<Trial>(t => t.Id == queryVisitTask.TrialId).Select(t => new { t.ReviewMode, t.VitrualSiteCode }).FirstOrDefault();
return ResponseOutput.Ok(pageList, trialTaskConfig);
}
@ -727,7 +740,27 @@ namespace IRaCIS.Core.Application.Service
return await taskConsistentRuleQueryable.ToListAsync();
}
[HttpPost]
[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
public async Task<IResponseOutput> UpdateTrialVirtualSiteCode(UpdateTrialSiteCodeCommand inCommand)
{
var trial = await _trialRepository.FirstOrDefaultAsync(t => t.Id == inCommand.TrialId);
trial.VitrualSiteCode = inCommand.VirtualSiteCode;
await _trialVirtualSiteCodeUpdateRepository.AddAsync(new TrialVirtualSiteCodeUpdate() { VirturalSiteCode = inCommand.VirtualSiteCode,TrialId=inCommand.TrialId });
await _trialRepository.SaveChangesAsync();
return ResponseOutput.Ok();
}
public async Task<List<UpdateTrialSiteCodeCommandView>> GetUpdateVirtualSiteCodeList(Guid trialId)
{
var list = await _trialVirtualSiteCodeUpdateRepository.Where(t => t.TrialId == trialId).Select(t => new UpdateTrialSiteCodeCommandView() { TrialId = trialId, VirtualSiteCode = t.VirturalSiteCode, Creatime = t.CreateTime }).ToListAsync();
return list;
}
[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
@ -748,6 +781,22 @@ namespace IRaCIS.Core.Application.Service
return ResponseOutput.NotOk(_localizer["TaskConsistent_MedicalAuditTaskExists"]);
}
if (_trialSiteRepository.Where(t => t.TrialId == addOrEditTaskConsistentRule.TrialId, false, true).Any(t => t.TrialSiteCode == addOrEditTaskConsistentRule.BlindTrialSiteCode))
{
return ResponseOutput.NotOk(_localizer["TaskConsistent_SiteCodeExists"]);
}
var trial = await _trialRepository.FirstOrDefaultAsync(t => t.Id == addOrEditTaskConsistentRule.TrialId);
if (string.IsNullOrEmpty(trial.VitrualSiteCode))
{
await _trialVirtualSiteCodeUpdateRepository.AddAsync(new TrialVirtualSiteCodeUpdate() { VirturalSiteCode = addOrEditTaskConsistentRule.BlindTrialSiteCode,TrialId=addOrEditTaskConsistentRule.TrialId });
}
trial.VitrualSiteCode = addOrEditTaskConsistentRule.BlindTrialSiteCode;
var entity = await _taskConsistentRuleRepository.InsertOrUpdateAsync(addOrEditTaskConsistentRule, true, verifyExp1);
return ResponseOutput.Ok(entity.Id.ToString());

20
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/PersonalWorkstationViewModel.cs
View File

@ -379,6 +379,9 @@ namespace IRaCIS.Core.Application.Contracts
public class UserToBeDoneRecord
{
public int? TrialWaitSignDocCount { get; set; }
public int? SysWaitSignDocCount { get; set; }
#region PM/APM
public int? PM_SiteSurveryCount { get; set; }
public int? PM_CheckCount { get; set; }
@ -386,11 +389,9 @@ namespace IRaCIS.Core.Application.Contracts
public int? PM_ReReadingApprovalCount { get; set; }
public int? PM_TrialWaitSignDocCount { get; set; }
public int? PM_SysWaitSignDocCount { get; set; }
public int? PM_ClinicalDataCount { get; set; }
public int? ClinicalDataCount { get; set; }
#endregion
#region CRC
@ -404,9 +405,7 @@ namespace IRaCIS.Core.Application.Contracts
public int? CRC_ClinicalDataTobeDoneCount { get; set; }
public int? CRC_ClinialDataTobeConfirmCount { get; set; }
public int? CRC_TrialWaitSignDocCount { get; set; }
public int? CRC_SysWaitSignDocCount { get; set; }
#endregion
@ -417,9 +416,7 @@ namespace IRaCIS.Core.Application.Contracts
public int? SPM_ReReadingApprovalCount { get; set; }
public int? SPM_TrialWaitSignDocCount { get; set; }
public int? SPM_SysWaitSignDocCount { get; set; }
#endregion
@ -428,9 +425,7 @@ namespace IRaCIS.Core.Application.Contracts
public int? IQC_IamgeQCCount { get; set; }
public int? IQC_QCQuestionCount { get; set; }
public int? IQC_TrialWaitSignDocCount { get; set; }
public int? IQC_SysWaitSignDocCount { get; set; }
#endregion
@ -438,17 +433,12 @@ namespace IRaCIS.Core.Application.Contracts
public int? IR_IamgeWaitReadingCount { get; set; }
public int? IR_MedicalReviewCount { get; set; }
public int? IR_TrialWaitSignDocCount { get; set; }
public int? IR_SysWaitSignDocCount { get; set; }
#endregion
#region MIM
public int? MIM_MedicalReviewCount { get; set; }
public int? MIM_TrialWaitSignDocCount { get; set; }
public int? MIM_SysWaitSignDocCount { get; set; }
#endregion

24
IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
View File

@ -1241,32 +1241,12 @@ namespace IRaCIS.Core.Application
var record = new UserToBeDoneRecord()
{
#region sign document
IsHaveSysDocNeedNeedSign = needSignSysDocCont > 0,
//TrialNeedSignList= trialNeedSignList,
PM_SysWaitSignDocCount = isPM ? needSignSysDocCont : 0,
PM_TrialWaitSignDocCount = isPM ? needSignTrialCount : 0,
CRC_SysWaitSignDocCount = isCRC ? needSignSysDocCont : 0,
CRC_TrialWaitSignDocCount = isCRC ? needSignTrialCount : 0,
SPM_SysWaitSignDocCount = isSPMOrCPM ? needSignSysDocCont : 0,
SPM_TrialWaitSignDocCount = isSPMOrCPM ? needSignTrialCount : 0,
IQC_SysWaitSignDocCount = isIQC ? needSignSysDocCont : 0,
IQC_TrialWaitSignDocCount = isIQC ? needSignTrialCount : 0,
IR_SysWaitSignDocCount = isIR ? needSignSysDocCont : 0,
IR_TrialWaitSignDocCount = isIR ? needSignTrialCount : 0,
MIM_SysWaitSignDocCount = isMIM ? needSignSysDocCont : 0,
MIM_TrialWaitSignDocCount = isMIM ? needSignTrialCount : 0,
#endregion
SysWaitSignDocCount = isPM ? needSignSysDocCont : 0,
TrialWaitSignDocCount = isPM ? needSignTrialCount : 0,
#region PM

2
IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs
View File

@ -151,6 +151,8 @@ namespace IRaCIS.Application.Contracts
public Guid TrialReadingCriterionId { get; set; }
public List<ReadingCategory> ReadingCategorys { get; set; }
public bool IsJoinAnalysis { get; set; } = true;
}

43
IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs Normal file
View File

@ -0,0 +1,43 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2024-02-29 15:48:36
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
///<summary>
///TrialVirtualSiteCodeUpdate
///</summary>
[Table("TrialVirtualSiteCodeUpdate")]
public class TrialVirtualSiteCodeUpdate : Entity, IAuditAdd
{
public Guid TrialId { get; set; }
/// <summary>
/// CreateTime
/// </summary>
[Required]
public DateTime CreateTime { get; set; }
/// <summary>
/// CreateUserId
/// </summary>
[Required]
public Guid CreateUserId { get; set; }
/// <summary>
/// VirturalSiteCode
/// </summary>
[Required]
public string VirturalSiteCode { get; set; }
}
}

59
IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs Normal file
View File

@ -0,0 +1,59 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2024-02-29 15:51:46
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
///<summary>
///EnrollReadingCriterion
///</summary>
[Table("EnrollReadingCriterion")]
public class EnrollReadingCriterion : Entity, IAuditAdd
{
/// <summary>
/// Id
/// </summary>
[Key]
[Required]
public Guid Id { get; set; }
/// <summary>
/// EnrollId
/// </summary>
[Required]
public Guid EnrollId { get; set; }
/// <summary>
/// TrialReadingCriterionId
/// </summary>
[Required]
public Guid TrialReadingCriterionId { get; set; }
/// <summary>
/// IsJoinAnalysis
/// </summary>
[Required]
public bool IsJoinAnalysis { get; set; }
/// <summary>
/// CreateTime
/// </summary>
[Required]
public DateTime CreateTime { get; set; }
/// <summary>
/// CreateUserId
/// </summary>
[Required]
public Guid CreateUserId { get; set; }
}
}

2
IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs
View File

@ -15,6 +15,8 @@ namespace IRaCIS.Core.Domain.Models
[Table("EnrollReadingCategory")]
public class EnrollReadingCategory : Entity, IAuditAdd
{
public bool IsJoinAnalysis { get; set; }=true;
/// <summary>
/// EnrollId
/// </summary>

2
IRaCIS.Core.Domain/Trial/Trial.cs
View File

@ -359,6 +359,8 @@ namespace IRaCIS.Core.Domain.Models
public int IndicationEnum { get; set; } = -1;
public string VitrualSiteCode { get; set; }
#region 邮件配置
/// <summary>
/// 发件箱账号

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

@ -672,6 +672,8 @@ namespace IRaCIS.Core.Infra.EFCore
public virtual DbSet<Internationalization> Internationalization { get; set; }
public virtual DbSet<TrialVirtualSiteCodeUpdate> TrialVirtualSiteCodeUpdate { get; set; }
public virtual DbSet<EnrollReadingCriterion> EnrollReadingCriterion { get; set; }
}

6
IRaCIS.Core.Test/DbHelper.ttinclude
View File

@ -1,10 +1,10 @@
<#+
public class config
{
public static readonly string ConnectionString = "Server=123.56.94.154,1433\\MSSQLSERVER;Database=Test.IRC;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true";
public static readonly string DbDatabase = "Test.IRC";
public static readonly string ConnectionString = "Server=123.56.94.154,1435;Database=Test_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true";
public static readonly string DbDatabase = "Test_IRC";
//表名称用字符串,拼接
public static readonly string TableName = "ReadingTaskQuestionMark";
public static readonly string TableName = "EnrollReadingCriterion";
//具体文件里面 例如service 可以配置是否分页
}
#>