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

修改

Uat_Study
he 2023-06-29 17:24:37 +08:00
parent 8683273022
commit fe260a6a06
13 changed files with 246 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs
View File

@ -37,6 +37,8 @@ namespace IRaCIS.Core.Application.Service
private readonly IRepository<ClinicalForm> _clinicalFormRepository;
private readonly IRepository<Subject> _subjectRepository;
private readonly IRepository<ReadModuleCriterionFrom> _readModuleCriterionFromRepository;
private readonly IRepository<ReadModule> _readModuleRepository;
private readonly IRepository<ClinicalQuestionAnswer> _clinicalQuestionAnswerRepository;
private readonly IRepository<ClinicalTableAnswer> _clinicalTableAnswerRepository;
@ -55,6 +57,8 @@ namespace IRaCIS.Core.Application.Service
IRepository<ReadingClinicalData> readingClinicalDataRepository,
IRepository<ClinicalForm> clinicalFormRepository,
IRepository<Subject> subjectRepository,
IRepository<ReadModuleCriterionFrom> readModuleCriterionFromRepository,
IRepository<ReadModule> readModuleRepository,
IRepository<SubjectVisit> subjectVisitRepository,
IRepository<ClinicalTableAnswer> clinicalTableAnswerRepository,
IRepository<ClinicalQuestionAnswer> clinicalQuestionAnswerRepository,
@ -76,6 +80,8 @@ namespace IRaCIS.Core.Application.Service
_clinicalFormRepository = clinicalFormRepository;
this._subjectRepository = subjectRepository;
this._readModuleCriterionFromRepository = readModuleCriterionFromRepository;
this._readModuleRepository = readModuleRepository;
_clinicalTableAnswerRepository = clinicalTableAnswerRepository;
_iClinicalQuestionService = iClinicalQuestionService;
}
@ -393,5 +399,65 @@ namespace IRaCIS.Core.Application.Service
return ResponseOutput.Ok(true);
}
}
/// <summary>
/// 获取CRC确认列表
/// </summary>
/// <param name="inDto"></param>
/// <returns></returns>
[HttpPost]
public async Task<List<GetCRCConfirmListOutDto>> GetCRCConfirmList(GetCRCConfirmListInDto inDto)
{
List<GetCRCConfirmListOutDto> result = await _readModuleRepository.Where(x => x.TrialId == inDto.TrialId)
.Select(x => new GetCRCConfirmListOutDto()
{
IsCRCConfirm = x.IsCRCConfirm,
LatestScanDate = x.SubjectVisit.LatestScanDate,
ReadingSetType = x.ReadingSetType,
IsPMConfirm = x.IsPMConfirm,
ReadModuleId=x.Id,
}).OrderBy(x => x.LatestScanDate).ToListAsync();
var formList = await _clinicalFormRepository.Where(x => x.TrialId == inDto.TrialId)
.Where(x=> x.ClinicalDataTrialSet.UploadRole==UploadRole.CRC)
.Where(x=> x.ClinicalDataTrialSet.ClinicalDataLevel==ClinicalLevel.ImageRead|| x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.OncologyRead)
.Select(x =>new CRCConfirmFormList
{
CkeckDate=x.CheckDate,
ClinicalDataLevel= x.ClinicalDataTrialSet.ClinicalDataLevel,
}).ToListAsync();
var confirmList = await _readModuleCriterionFromRepository.Where(x => x.TrialId == inDto.TrialId).ToListAsync();
result.ForEach(x =>
{
if (x.IsCRCConfirm)
{
x.FormCount = confirmList.Where(y => y.ReadModuleId == x.ReadModuleId).Count();
}
else
{
if (x.ReadingSetType == ReadingSetType.ImageReading)
{
x.FormCount = formList.Where(y => y.ClinicalDataLevel == ClinicalLevel.ImageRead&&y.CkeckDate<=x.LatestScanDate).Count();
}
else
{
x.FormCount = formList.Where(y => y.ClinicalDataLevel == ClinicalLevel.OncologyRead&&y.CkeckDate <= x.LatestScanDate).Count();
}
}
});
return result;
}
}
}

6
IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs
View File

@ -472,7 +472,11 @@ namespace IRaCIS.Core.Application.Service
{
question.GroupId = questionRelation[question.GroupId ?? default(Guid)];
}
addTrialDataList.Add(question);
if (question.RelevanceId != null)
{
question.RelevanceId = questionRelation[question.RelevanceId ?? default(Guid)];
}
addTrialDataList.Add(question);
};

39
IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs
View File

@ -1,4 +1,5 @@
using System;
using IRaCIS.Core.Domain.Share;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@ -93,7 +94,41 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string Answer { get; set; } = string.Empty;
}
public class SubmitClinicalFormInDto
public class GetCRCConfirmListInDto
{
public Guid TrialId { get; set; }
}
public class CRCConfirmFormList
{
public DateTime? CkeckDate { get; set; }
/// <summary>
/// 临床级别
/// </summary>
public ClinicalLevel ClinicalDataLevel { get; set; }
}
public class GetCRCConfirmListOutDto
{
public Guid ReadModuleId { get; set; }
public bool IsPMConfirm { get; set; }
public ReadingSetType ReadingSetType { get; set; }
public bool IsCRCConfirm { get; set; } = false;
/// <summary>
/// 最晚拍片日期
/// </summary>
public DateTime? LatestScanDate { get; set; }
public int FormCount { get; set; }
}
public class SubmitClinicalFormInDto
{
/// <summary>
/// VisitId

42
IRaCIS.Core.Application/Service/Reading/Dto/ClinicalQuestionDto.cs
View File

@ -128,15 +128,25 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public int ShowOrder { get; set; } = 0;
/// <summary>
/// 是否必填
/// </summary>
public bool IsRequired { get; set; } = false;
/// <summary>
/// 是否必填
/// </summary>
public IsRequired IsRequired { get; set; }
/// <summary>
/// 父问题Id
/// </summary>
public Guid? ParentId { get; set; }
/// <summary>
/// 关联Value
/// </summary>
public string RelevanceValue { get; set; } = string.Empty;
/// <summary>
/// 关联ID
/// </summary>
public Guid? RelevanceId { get; set; }
/// <summary>
/// 父问题Id
/// </summary>
public Guid? ParentId { get; set; }
/// <summary>
/// 父问题触发值
@ -297,15 +307,15 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public int ShowOrder { get; set; }
/// <summary>
/// 是否必填
/// </summary>
public bool IsRequired { get; set; }
/// <summary>
/// 是否必填
/// </summary>
public IsRequired IsRequired { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 创建人

26
IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs
View File

@ -72,15 +72,25 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public int ShowOrder { get; set; } = 0;
/// <summary>
/// 是否必填
/// </summary>
public bool IsRequired { get; set; } = false;
/// <summary>
/// 是否必填
/// </summary>
public IsRequired IsRequired { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 关联Value
/// </summary>
public string RelevanceValue { get; set; } = string.Empty;
/// <summary>
/// 关联ID
/// </summary>
public Guid? RelevanceId { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 创建人

14
IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs
View File

@ -64,15 +64,15 @@ namespace IRaCIS.Core.Domain.Models
/// 排序
/// </summary>
public int ShowOrder { get; set; }
/// <summary>
/// 是否必填
/// </summary>
public bool IsRequired { get; set; }
/// 是否必填
/// </summary>
public IsRequired IsRequired { get; set; }
/// <summary>
/// 创建时间
/// </summary>
/// 创建时间
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>

20
IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs
View File

@ -75,12 +75,22 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 是否必填
/// </summary>
public bool IsRequired { get; set; } = false;
public IsRequired IsRequired { get; set; }
/// <summary>
/// 系统临床问题Id
/// </summary>
public Guid? SystemClinicalQuestionId { get; set; }
/// <summary>
/// 关联Value
/// </summary>
public string RelevanceValue { get; set; } = string.Empty;
/// <summary>
/// 关联ID
/// </summary>
public Guid? RelevanceId { get; set; }
/// <summary>
/// 系统临床问题Id
/// </summary>
public Guid? SystemClinicalQuestionId { get; set; }
/// <summary>
/// 创建时间

14
IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs
View File

@ -64,15 +64,15 @@ namespace IRaCIS.Core.Domain.Models
/// 排序
/// </summary>
public int ShowOrder { get; set; }
/// <summary>
/// 是否必填
/// </summary>
public bool IsRequired { get; set; }
/// 是否必填
/// </summary>
public IsRequired IsRequired { get; set; }
/// <summary>
/// 创建时间
/// </summary>
/// 创建时间
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>

7
IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs
View File

@ -54,6 +54,11 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public Guid? ReadingId { get; set; }
}
[JsonIgnore]
[ForeignKey("ClinicalDataTrialSetId")]
public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; }
}
}

52
IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs Normal file
View File

@ -0,0 +1,52 @@
//--------------------------------------------------------------------
// 此代码由T4模板自动生成 byzhouhang 20210918
// 生成时间 2023-06-29 16:36:05
// 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
using System;
using IRaCIS.Core.Domain.Share;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
///<summary>
///ReadModuleCriterionFrom
///</summary>
[Table("ReadModuleCriterionFrom")]
public class ReadModuleCriterionFrom : Entity, IAuditAdd
{
/// <summary>
/// 阅片期Id
/// </summary>
public Guid ReadModuleId { get; set; }
/// <summary>
/// 受试者Id
/// </summary>
public Guid SubjectId { get; set; }
/// <summary>
/// 项目Id
/// </summary>
public Guid TrialId { get; set; }
/// <summary>
/// 表单Id
/// </summary>
public Guid ClinicalFormId { get; set; }
/// <summary>
/// 创建人
/// </summary>
public Guid CreateUserId { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateTime { get; set; }
}
}

6
IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs
View File

@ -75,11 +75,11 @@ namespace IRaCIS.Core.Domain.Models
public DateTime UpdateTime { get; set; }
public bool IsCRCConfirm { get; set; } = false;
public bool IsDeleted { get; set; }
public bool IsPMConfirm { get; set; } = false;
public bool IsDeleted { get; set; }
public DateTime? DeletedTime { get; set; }

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

@ -418,8 +418,8 @@ namespace IRaCIS.Core.Infra.EFCore
public virtual DbSet<ClinicalTableAnswer> ClinicalTableAnswer { get; set; }
public virtual DbSet<ClinicalForm> ClinicalForm { get; set; }
public virtual DbSet<ReadModuleCriterionFrom> ReadModuleCriterionFrom { get; set; }
public virtual DbSet<ClinicalForm> ClinicalForm { get; set; }
#endregion

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

@ -4,7 +4,7 @@
public static readonly string ConnectionString = "Server=123.56.94.154,1433\\MSSQLSERVER;Database=IRaCIS_New_Tet;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true";
public static readonly string DbDatabase = "IRaCIS_New_Tet";
//表名称用字符串,拼接
public static readonly string TableName = "ClinicalForm";
public static readonly string TableName = "ReadModuleCriterionFrom";
//具体文件里面 例如service 可以配置是否分页
}
#>