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

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

IRC_NewDev
hang 2024-06-03 15:13:53 +08:00
parent 0accb453e5 e2b285c792
commit 9e1e32f16d
4 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs
View File

@ -22,6 +22,7 @@ namespace IRaCIS.Application.Services
public IRepository<SubjectVisit> _subjectVisitRepository; public IRepository<SubjectVisit> _subjectVisitRepository;
private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository; private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository;
private readonly IRepository<TrialClinicalDataSetCriterion> _trialClinicalDataSetCriterionRepository;
private readonly IRepository<ReadingQuestionCriterionTrial> _iReadingQuestionCriterionTrialRepository; private readonly IRepository<ReadingQuestionCriterionTrial> _iReadingQuestionCriterionTrialRepository;
private readonly IRepository<ClinicalDataSystemSet> _clinicalDataSystemSetRepository; private readonly IRepository<ClinicalDataSystemSet> _clinicalDataSystemSetRepository;
private readonly IRepository<PreviousPDF> _previousPDFRepository; private readonly IRepository<PreviousPDF> _previousPDFRepository;
@ -34,6 +35,7 @@ namespace IRaCIS.Application.Services
public ClinicalDataSetService(IRepository<SubjectVisit> subjectVisitRepository, public ClinicalDataSetService(IRepository<SubjectVisit> subjectVisitRepository,
IClinicalQuestionService iClinicalQuestionService, IClinicalQuestionService iClinicalQuestionService,
IRepository<ClinicalDataTrialSet> ClinicalDataTrialSetRepository, IRepository<ClinicalDataTrialSet> ClinicalDataTrialSetRepository,
IRepository<TrialClinicalDataSetCriterion> trialClinicalDataSetCriterionRepository,
IRepository<ReadingQuestionCriterionTrial> iReadingQuestionCriterionTrialRepository, IRepository<ReadingQuestionCriterionTrial> iReadingQuestionCriterionTrialRepository,
IRepository<ClinicalDataSystemSet> ClinicalDataSystemSetRepository, IRepository<ClinicalDataSystemSet> ClinicalDataSystemSetRepository,
IRepository<PreviousPDF> previousPDFRepository, IRepository<PreviousPDF> previousPDFRepository,
@ -51,6 +53,7 @@ namespace IRaCIS.Application.Services
_trialClinicalQuestionRepository = trialClinicalQuestionRepository; _trialClinicalQuestionRepository = trialClinicalQuestionRepository;
_systemClinicalQuestionRepository = systemClinicalQuestionRepository; _systemClinicalQuestionRepository = systemClinicalQuestionRepository;
_clinicalDataTrialSetRepository = ClinicalDataTrialSetRepository; _clinicalDataTrialSetRepository = ClinicalDataTrialSetRepository;
this._trialClinicalDataSetCriterionRepository = trialClinicalDataSetCriterionRepository;
this._iReadingQuestionCriterionTrialRepository = iReadingQuestionCriterionTrialRepository; this._iReadingQuestionCriterionTrialRepository = iReadingQuestionCriterionTrialRepository;
_clinicalDataSystemSetRepository = ClinicalDataSystemSetRepository; _clinicalDataSystemSetRepository = ClinicalDataSystemSetRepository;
this._previousPDFRepository = previousPDFRepository; this._previousPDFRepository = previousPDFRepository;
@ -243,7 +246,10 @@ namespace IRaCIS.Application.Services
//indto.CriterionEnumListStr = $"|{String.Join('|', indto.CriterionEnumList)}|"; //indto.CriterionEnumListStr = $"|{String.Join('|', indto.CriterionEnumList)}|";
var entity = await _clinicalDataTrialSetRepository.InsertOrUpdateAsync(indto, true); //var entity = _mapper.Map<TEntity>(from);
indto.CreateTime = DateTime.Now;
var entity = await _clinicalDataTrialSetRepository.InsertOrUpdateAsync(indto);
entity.TrialClinicalDataSetCriteriaList = indto.TrialCriterionIdList.Select(t => new TrialClinicalDataSetCriterion() entity.TrialClinicalDataSetCriteriaList = indto.TrialCriterionIdList.Select(t => new TrialClinicalDataSetCriterion()
{ {
@ -253,7 +259,7 @@ namespace IRaCIS.Application.Services
if (indto.Id != null) if (indto.Id != null)
{ {
await _repository.BatchDeleteAsync<TrialClinicalDataSetCriterion>(t => t.TrialClinicalDataSetId == entity.Id); await _trialClinicalDataSetCriterionRepository.DeleteFromQueryAsync(t => t.TrialClinicalDataSetId == entity.Id);
await _repository.AddRangeAsync<TrialClinicalDataSetCriterion>(entity.TrialClinicalDataSetCriteriaList); await _repository.AddRangeAsync<TrialClinicalDataSetCriterion>(entity.TrialClinicalDataSetCriteriaList);
} }

10
IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs
View File

@ -44,10 +44,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary> /// </summary>
public UploadRole UploadRole { get; set; } public UploadRole UploadRole { get; set; }
/// <summary> public DateTime CreateTime { get; set; }
/// 是否启用
/// </summary> /// <summary>
public bool IsEnable { get; set; } /// 是否启用
/// </summary>
public bool IsEnable { get; set; }
/// <summary> /// <summary>
/// 项目ID /// 项目ID

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

@ -10,6 +10,7 @@ using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
using NetTopologySuite.Index.HPRtree; using NetTopologySuite.Index.HPRtree;
using Newtonsoft.Json; using Newtonsoft.Json;
using SharpCompress.Common; using SharpCompress.Common;
using SharpCompress.Compressors.Xz;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -143,8 +144,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common
case "configTrialBasicInfo/ConfigTrialBasicInfoConfirm": case "configTrialBasicInfo/ConfigTrialBasicInfoConfirm":
extraIdentification = $"/{oldentity.IsTrialBasicLogicConfirmed.ToString()}"; extraIdentification = $"/{oldentity.IsTrialBasicLogicConfirmed.ToString()}";
break; break;
case "configTrialBasicInfo/ConfigTrialProcessInfoConfirm":
extraIdentification = $"/{oldentity.IsTrialProcessConfirmed.ToString()}";
break;
case "configTrialBasicInfo/ConfigTrialUrgentInfoConfirm": case "configTrialBasicInfo/ConfigTrialUrgentInfoConfirm":
extraIdentification = $"/{oldentity.IsTrialUrgentConfirmed.ToString()}"; extraIdentification = $"/{oldentity.IsTrialUrgentConfirmed.ToString()}";
break; break;
@ -2168,8 +2172,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
if (entity.TrialClinicalDataSetCriteriaList == null || entity.TrialClinicalDataSetCriteriaList.Count() == 0) if (entity.TrialClinicalDataSetCriteriaList == null || entity.TrialClinicalDataSetCriteriaList.Count() == 0)
{ {
criterionNameList = await _dbContext.TrialClinicalDataSetCriterion.Where(t => t.TrialClinicalDataSetId == entity.Id).Select(t => t.TrialReadingCriterion.CriterionName).ToListAsync(); criterionNameList = await _dbContext.TrialClinicalDataSetCriterion.Where(t => t.TrialClinicalDataSetId == entity.Id).Select(t => t.TrialReadingCriterion.CriterionName).ToListAsync();
} }
else else
{ {
var ids = entity.TrialClinicalDataSetCriteriaList.Select(t => t.TrialReadingCriterionId).ToList(); var ids = entity.TrialClinicalDataSetCriteriaList.Select(t => t.TrialReadingCriterionId).ToList();

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

@ -159,8 +159,10 @@ namespace IRaCIS.Core.Infra.EFCore.Common.Dto
public string BlindName { get; set; } = string.Empty; public string BlindName { get; set; } = string.Empty;
//标识操作 是否区分接口 /// <summary>
public bool IsDistinctionInterface=true; /// 标识操作 是否区分接口
/// </summary>
public bool IsDistinctionInterface=true;
public bool IsSelfDefine = false; public bool IsSelfDefine = false;