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

Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

Uat_Study
hang 2023-06-28 09:24:06 +08:00
parent 0c56b55c2a e66b56af58
commit 73fb523b3d
3 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,10 +187,9 @@ namespace IRaCIS.Core.Application.Service
public async Task<IResponseOutput> SubmitClinicalForm(SubmitClinicalFormInDto inDto) public async Task<IResponseOutput> SubmitClinicalForm(SubmitClinicalFormInDto inDto)
{ {
var checkDateQuestionId = await _trialClinicalQuestionRepository.Where(x => x.TrialClinicalId == inDto.ClinicalDataTrialSetId && x.IsCheckDate).Select(x => x.Id).FirstNotNullAsync();
ClinicalForm clinicalForm = new ClinicalForm() { }; ClinicalForm clinicalForm = new ClinicalForm() { };
try
{
clinicalForm = new ClinicalForm() clinicalForm = new ClinicalForm()
{ {
ClinicalDataTrialSetId = inDto.ClinicalDataTrialSetId, ClinicalDataTrialSetId = inDto.ClinicalDataTrialSetId,
@ -198,12 +197,16 @@ namespace IRaCIS.Core.Application.Service
Id = inDto.ClinicalFormId ?? NewId.NextGuid(), Id = inDto.ClinicalFormId ?? NewId.NextGuid(),
ReadingId = inDto.ReadingId, ReadingId = inDto.ReadingId,
VisitId = inDto.VisitId, VisitId = inDto.VisitId,
CheckDate = DateTime.Parse(inDto.QuestionAnswers.Where(x => x.QuestionId == checkDateQuestionId).Select(x => x.Answer).First()),
}; };
try
{
var checkDateQuestionId = await _trialClinicalQuestionRepository.Where(x => x.TrialClinicalId == inDto.ClinicalDataTrialSetId && x.IsCheckDate).Select(x => x.Id).FirstNotNullAsync();
clinicalForm.CheckDate = DateTime.Parse(inDto.QuestionAnswers.Where(x => x.QuestionId == checkDateQuestionId).Select(x => x.Answer).First());
} }
catch (Exception) catch (Exception)
{ {
throw new BusinessValidationFailedException("检查日期问题答案填写错误！");
} }
List<ClinicalQuestionAnswer> clinicalQuestionAnswers = inDto.QuestionAnswers.Select(x => new ClinicalQuestionAnswer() List<ClinicalQuestionAnswer> clinicalQuestionAnswers = inDto.QuestionAnswers.Select(x => new ClinicalQuestionAnswer()

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

@ -61,7 +61,13 @@ namespace IRaCIS.Application.Services
[HttpPost] [HttpPost]
public async Task<IResponseOutput> ApplySystemClinical(ApplySystemClinicalInDto inDto) public async Task<IResponseOutput> ApplySystemClinical(ApplySystemClinicalInDto inDto)
{ {
if (_systemClinicalQuestionRepository.Where(x => x.SystemClinicalId == inDto.SystemClinicalId && x.IsCheckDate).Count() != 1)
var isNeedVerify = await _clinicalDataSystemSetRepository.AnyAsync(x => x.Id == inDto.SystemClinicalId && (x.ClinicalDataLevel == ClinicalLevel.ImageRead || x.ClinicalDataLevel == ClinicalLevel.OncologyRead)
&& x.ClinicalUploadType == ClinicalUploadType.Structuring && x.UploadRole == UploadRole.CRC
);
if (_systemClinicalQuestionRepository.Where(x => isNeedVerify&& x.SystemClinicalId == inDto.SystemClinicalId && x.IsCheckDate).Count() != 1)
{ {
throw new BusinessValidationFailedException(_localizer["ClinicalDataSet_Apply"]); throw new BusinessValidationFailedException(_localizer["ClinicalDataSet_Apply"]);
@ -87,7 +93,12 @@ namespace IRaCIS.Application.Services
[HttpPost] [HttpPost]
public async Task<IResponseOutput> ApplyTrialClinical(ApplyTrialClinicalInDto inDto) public async Task<IResponseOutput> ApplyTrialClinical(ApplyTrialClinicalInDto inDto)
{ {
if (_trialClinicalQuestionRepository.Where(x => x.TrialClinicalId == inDto.TrialClinicalId && x.IsCheckDate).Count() != 1)
var isNeedVerify = await _clinicalDataTrialSetRepository.AnyAsync(x => x.Id == inDto.TrialClinicalId && (x.ClinicalDataLevel == ClinicalLevel.ImageRead|| x.ClinicalDataLevel==ClinicalLevel.OncologyRead)
&& x.ClinicalUploadType == ClinicalUploadType.Structuring && x.UploadRole == UploadRole.CRC
);
if (_trialClinicalQuestionRepository.Where(x => isNeedVerify&& x.TrialClinicalId == inDto.TrialClinicalId && x.IsCheckDate).Count() != 1)
{ {
throw new BusinessValidationFailedException(_localizer["ClinicalDataSet_Apply"]); throw new BusinessValidationFailedException(_localizer["ClinicalDataSet_Apply"]);

5
IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
View File

@ -1239,6 +1239,11 @@ namespace IRaCIS.Core.Domain.Share
[Display(Name = "PDF")] [Display(Name = "PDF")]
PDF = 1, PDF = 1,
/// <summary>
/// 结构化录入
/// </summary>
Structuring = 2,
} }
/// <summary> /// <summary>