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

Merge branch 'Test.IRC' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test.IRC
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2023-11-24 11:19:43 +08:00
parent c4f0b0d60d ec64533b4b
commit 2eced17ca9
7 changed files with 63 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10195,37 +10195,37 @@
受试者ID 受试者ID
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.DTO.GetConsistencyCheckFileDto.FileName"> <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetUserUploadFileDto.FileName">
<summary> <summary>
文件名称 文件名称
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.DTO.GetConsistencyCheckFileDto.FilePath"> <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetUserUploadFileDto.FilePath">
<summary> <summary>
文件路径 文件路径
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.DTO.GetConsistencyCheckFileDto.RelativePath"> <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetUserUploadFileDto.RelativePath">
<summary> <summary>
相对路径 相对路径
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.DTO.GetConsistencyCheckFileDto.CreateUserId"> <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetUserUploadFileDto.CreateUserId">
<summary> <summary>
创建人 创建人
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.DTO.GetConsistencyCheckFileDto.CreateTime"> <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetUserUploadFileDto.CreateTime">
<summary> <summary>
创建时间 创建时间
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.DTO.GetConsistencyCheckFileDto.TrialId"> <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetUserUploadFileDto.TrialId">
<summary> <summary>
项目ID 项目ID
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Contracts.DTO.GetConsistencyCheckFileDto.CreateUserName"> <member name="P:IRaCIS.Core.Application.Contracts.DTO.GetUserUploadFileDto.CreateUserName">
<summary> <summary>
创建者名称 创建者名称
</summary> </summary>

2
IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs
View File

@ -129,7 +129,7 @@ namespace IRaCIS.Core.Application.Contracts.DTO
} }
public class GetConsistencyCheckFileDto/*: ConsistencyCheckFile*/ public class GetUserUploadFileDto/*: ConsistencyCheckFile*/
{ {
/// <summary> /// <summary>
/// 文件名称 /// 文件名称

4
IRaCIS.Core.Application/Service/QC/QCListService.cs
View File

@ -849,10 +849,10 @@ namespace IRaCIS.Core.Application.Image.QA
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public async Task<PageOutput<GetConsistencyCheckFileDto>> GetConsistencyCheckFile(GetConsistencyCheckFileInDto indto) public async Task<PageOutput<GetUserUploadFileDto>> GetConsistencyCheckFile(GetConsistencyCheckFileInDto indto)
{ {
var query = _repository.Where<InspectionFile>(t => t.TrialId == indto.TrialId) var query = _repository.Where<InspectionFile>(t => t.TrialId == indto.TrialId)
.ProjectTo<GetConsistencyCheckFileDto>(_mapper.ConfigurationProvider); .ProjectTo<GetUserUploadFileDto>(_mapper.ConfigurationProvider);
return await query.ToPagedListAsync(indto.PageIndex, indto.PageSize, "CreateTime", false); return await query.ToPagedListAsync(indto.PageIndex, indto.PageSize, "CreateTime", false);
} }

2
IRaCIS.Core.Application/Service/QC/_MapConfig.cs
View File

@ -494,7 +494,7 @@ namespace IRaCIS.Core.Application.Service
; ;
// 一致性核查文件 // 一致性核查文件
CreateMap<InspectionFile, GetConsistencyCheckFileDto>() CreateMap<InspectionFile, GetUserUploadFileDto>()
.ForMember(d => d.CreateUserName, u => u.MapFrom(t => t.User.FirstName + "/" + t.User.LastName)); .ForMember(d => d.CreateUserName, u => u.MapFrom(t => t.User.FirstName + "/" + t.User.LastName));

12
IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
View File

@ -1713,7 +1713,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var taskAnswer = await GetVisitTaskAnswerList(inDto); var taskAnswer = await GetVisitTaskAnswerList(inDto);
if (inDto.IsBaseLine) if (inDto.IsBaseLine)
{ {
return string.Empty; return "NA";
} }
@ -2053,7 +2053,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{ {
if (inDto.IsBaseLine) if (inDto.IsBaseLine)
{ {
return string.Empty; return FDGPETOverallAssessment.NA.GetEnumInt();
} }
var lastTaskId = await GetLastVisitTaskId(inDto); var lastTaskId = await GetLastVisitTaskId(inDto);
@ -2620,10 +2620,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{ {
NewLesionAssessment result = NewLesionAssessment.No; NewLesionAssessment result = NewLesionAssessment.No;
//if (inDto.IsBaseLine) if (inDto.IsBaseLine)
//{ {
// return NewLesionAssessment.NA.GetEnumInt(); return NewLesionAssessment.NA.GetEnumInt();
//} }
var tableRows = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.NewLesions).SelectMany(x => x.TableRowInfoList).ToList(); var tableRows = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.NewLesions).SelectMany(x => x.TableRowInfoList).ToList();

45
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -2095,6 +2095,10 @@ namespace IRaCIS.Core.Infra.EFCore.Common
{ {
extraIdentification = "/ConfirmSelect"; extraIdentification = "/ConfirmSelect";
} }
else if (_userInfo.RequestUrl == "ClinicalDataSet/applyTrialClinical")
{
extraIdentification = "/applyTrialClinical";
}
//获取配置的标准名称 //获取配置的标准名称
@ -2135,6 +2139,47 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}); });
} }
//临床数据问题
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialClinicalQuestion)))
{
var type = GetEntityAuditOpt(item);
var entity = item.Entity as TrialClinicalQuestion;
var trialId= await _dbContext.ClinicalDataTrialSet.Where(t => t.Id == entity.TrialClinicalId).Select(t => t.TrialId).FirstOrDefaultAsync();
var GroupName = entity.GroupId == null ? entity.QuestionName: _dbContext.TrialClinicalQuestion.Where(t => t.Id == entity.GroupId).Select(t => t.QuestionName).FirstOrDefault();
var GroupEnName = entity.GroupId == null ? entity.QuestionEnName : _dbContext.TrialClinicalQuestion.Where(t => t.Id == entity.GroupId).Select(t => t.QuestionEnName).FirstOrDefault();
await InsertInspection<TrialClinicalQuestion>(entity, type, x => new InspectionConvertDTO()
{
TrialId= trialId,
},
new {
GroupName= GroupName,
GroupEnName= GroupEnName,
}
);
}
//临床数据表格问题
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialClinicalTableQuestion)))
{
var type = GetEntityAuditOpt(item);
var entity = item.Entity as TrialClinicalTableQuestion;
var trialId = await _dbContext.ClinicalDataTrialSet.Where(t => t.Id == entity.TrialClinicalId).Select(t => t.TrialId).FirstOrDefaultAsync();
await InsertInspection<TrialClinicalTableQuestion>(entity, type, x => new InspectionConvertDTO()
{
TrialId = trialId,
}
);
}
// CRC PM 临床数据 // CRC PM 临床数据
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ReadingClinicalData))) foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ReadingClinicalData)))
{ {

1
IRaCIS.Core.Infra.EFCore/Common/Dto/SetDictionaryValueDto.cs
View File

@ -152,6 +152,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common.Dto
public bool IsSelfDefine = false; public bool IsSelfDefine = false;
// 额外标识
public string ExtraIndentification = string.Empty; public string ExtraIndentification = string.Empty;