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

修改查询条件
continuous-integration/drone/push Build is passing Details

Test_HIR_Net8
hang 2025-08-28 15:01:18 +08:00
parent afaba95ff2
commit 525cae7232
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
IRC.Core.SCP/Service/DicomArchiveService.cs
View File

@ -139,6 +139,28 @@ namespace IRaCIS.Core.SCP.Service
findPatient.PatientName = dataset.GetSingleValueOrDefault(DicomTag.PatientName, string.Empty);
findPatient.PatientSex = dataset.GetSingleValueOrDefault(DicomTag.PatientSex, string.Empty);
findPatient.PatientAge = dataset.GetSingleValueOrDefault(DicomTag.PatientAge, string.Empty);
if (findPatient.PatientBirthDate.Length == 8)
{
var birthDateStr = $"{findPatient.PatientBirthDate[0]}{findPatient.PatientBirthDate[1]}{findPatient.PatientBirthDate[2]}{findPatient.PatientBirthDate[3]}-{findPatient.PatientBirthDate[4]}{findPatient.PatientBirthDate[5]}-{findPatient.PatientBirthDate[6]}{findPatient.PatientBirthDate[7]}";
var yearStr = $"{findPatient.PatientBirthDate[0]}{findPatient.PatientBirthDate[1]}{findPatient.PatientBirthDate[2]}{findPatient.PatientBirthDate[3]}";
int year = 0;
var canParse = int.TryParse(yearStr, out year);
if (canParse && year > 1900)
{
findPatient.PatientBirthDate = birthDateStr;
}
else
{
findPatient.PatientBirthDate = string.Empty;
}
}
}
if (findStudy == null)

4
IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
View File

@ -526,6 +526,8 @@ namespace IRaCIS.Core.Application.ViewModel
public string? PatientName { get; set; }
public string? PatientIdStr { get; set; }
public EvaluateProgress? EvaluateProgressEnum { get; set; }
}
public class VisitTaskQuery : PageInput
@ -660,7 +662,7 @@ namespace IRaCIS.Core.Application.ViewModel
[NotDefault]
public Guid TrialReadingCriterionId { get; set; }
public EvaluateProgress EvaluateProgressEnum { get; set; }
public EvaluateProgress? EvaluateProgressEnum { get; set; }
}

2
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
View File

@ -17,6 +17,7 @@ using IRaCIS.Core.Infrastructure.Extention;
using MassTransit;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using System.Linq;
using System.Linq.Dynamic.Core;
using System.Reactive.Subjects;
using Subject = IRaCIS.Core.Domain.Models.Subject;
@ -1307,6 +1308,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
UnReadCanReadTaskList = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned)
.Where(t => inQuery.EvaluateProgressEnum != null ? t.EvaluateProgressEnum == inQuery.EvaluateProgressEnum : true)
.Where(y => y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true))
.OrderBy(x => x.VisitTaskNum)
.Select(u => new IRUnreadTaskView()