Compare commits
No commits in common. "374f024f85912b4b92c02535b77eebfa159a59a9" and "285e742136803981613caf16e22396e72200fea4" have entirely different histories.
374f024f85
...
285e742136
|
|
@ -58,8 +58,6 @@ namespace IRaCIS.Core.Application.ViewModel
|
||||||
public int PacsSearchMaxDays { get; set; }
|
public int PacsSearchMaxDays { get; set; }
|
||||||
|
|
||||||
public PacsType PacsTypeEnum { get; set; }
|
public PacsType PacsTypeEnum { get; set; }
|
||||||
|
|
||||||
public bool IsSupportMutiModality { get; set; }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -136,7 +136,7 @@ namespace IRaCIS.Application.Services
|
||||||
var exp2 = new EntityVerifyExp<HIRHospital>()
|
var exp2 = new EntityVerifyExp<HIRHospital>()
|
||||||
{
|
{
|
||||||
VerifyExp = h => h.HospitalCode.Equals(addOrEditHIRHospital.HospitalCode) ||
|
VerifyExp = h => h.HospitalCode.Equals(addOrEditHIRHospital.HospitalCode) ||
|
||||||
h.HospitalName.Equals(addOrEditHIRHospital.HospitalName) ||
|
h.HospitalName.Equals(addOrEditHIRHospital.HospitalName)||
|
||||||
h.HospitalAliasName.Equals(addOrEditHIRHospital.HospitalAliasName),
|
h.HospitalAliasName.Equals(addOrEditHIRHospital.HospitalAliasName),
|
||||||
|
|
||||||
//医院编码、名称不能重复
|
//医院编码、名称不能重复
|
||||||
|
|
@ -3078,7 +3078,8 @@ namespace IRaCIS.Application.Services
|
||||||
//看当前前端有没有传递modality,有的话以前端为准,没有的话以配置为准 构造同样数量的请求
|
//看当前前端有没有传递modality,有的话以前端为准,没有的话以配置为准 构造同样数量的请求
|
||||||
var requestModalityList = (inQuery.ModalitiesInStudyList != null && inQuery.ModalitiesInStudyList.Count > 0) ? inQuery.ModalitiesInStudyList : find.ModalityList;
|
var requestModalityList = (inQuery.ModalitiesInStudyList != null && inQuery.ModalitiesInStudyList.Count > 0) ? inQuery.ModalitiesInStudyList : find.ModalityList;
|
||||||
|
|
||||||
|
//支持多模态的Pacs
|
||||||
|
var modality = string.Join($"\\", requestModalityList);
|
||||||
|
|
||||||
|
|
||||||
if (inQuery.TrialId == null)
|
if (inQuery.TrialId == null)
|
||||||
|
|
@ -3094,33 +3095,16 @@ namespace IRaCIS.Application.Services
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (find.IsSupportMutiModality)
|
var request = CreateStudyRequest(inQuery, modality);
|
||||||
{
|
|
||||||
//支持多模态的Pacs
|
|
||||||
var modality = string.Join($"\\", requestModalityList);
|
|
||||||
|
|
||||||
var request = CreateStudyRequest(inQuery, modality);
|
request.OnResponseReceived += responseDelegate;
|
||||||
|
|
||||||
request.OnResponseReceived += responseDelegate;
|
await client.AddRequestAsync(request);
|
||||||
|
|
||||||
await client.AddRequestAsync(request);
|
|
||||||
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
foreach (var modality in requestModalityList)
|
|
||||||
{
|
|
||||||
var cloneInQuery = inQuery.Clone();
|
|
||||||
|
|
||||||
var request = CreateStudyRequest(cloneInQuery, modality);
|
|
||||||
|
|
||||||
request.OnResponseReceived += responseDelegate;
|
|
||||||
|
|
||||||
await client.AddRequestAsync(request);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
await client.SendAsync();
|
await client.SendAsync();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
@ -3200,7 +3184,7 @@ namespace IRaCIS.Application.Services
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
var request = CreateStudyRequest(cloneInQuery, find.IsSupportMutiModality ? string.Join($"\\", requestModalityList) : "");
|
var request = CreateStudyRequest(cloneInQuery, "");
|
||||||
request.OnResponseReceived += responseDelegate;
|
request.OnResponseReceived += responseDelegate;
|
||||||
|
|
||||||
await client.AddRequestAsync(request);
|
await client.AddRequestAsync(request);
|
||||||
|
|
|
||||||
|
|
@ -41,8 +41,8 @@ namespace IRaCIS.Core.Domain.Models
|
||||||
|
|
||||||
public int MaxStudyCount { get; set; }
|
public int MaxStudyCount { get; set; }
|
||||||
|
|
||||||
[Comment("是否支持多模态查询")]
|
//[Comment("是否支持多模态查询")]
|
||||||
public bool IsSupportMutiModality { get; set; }
|
//public bool IsSupportMutiModality { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,30 +0,0 @@
|
||||||
using Microsoft.EntityFrameworkCore.Migrations;
|
|
||||||
|
|
||||||
#nullable disable
|
|
||||||
|
|
||||||
namespace IRaCIS.Core.Infra.EFCore.Migrations
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
public partial class addAEModality : Migration
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
protected override void Up(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.AddColumn<bool>(
|
|
||||||
name: "IsSupportMutiModality",
|
|
||||||
table: "DicomAE",
|
|
||||||
type: "bit",
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: false,
|
|
||||||
comment: "是否支持多模态查询");
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
protected override void Down(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.DropColumn(
|
|
||||||
name: "IsSupportMutiModality",
|
|
||||||
table: "DicomAE");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -801,10 +801,6 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
|
||||||
.HasMaxLength(400)
|
.HasMaxLength(400)
|
||||||
.HasColumnType("nvarchar(400)");
|
.HasColumnType("nvarchar(400)");
|
||||||
|
|
||||||
b.Property<bool>("IsSupportMutiModality")
|
|
||||||
.HasColumnType("bit")
|
|
||||||
.HasComment("是否支持多模态查询");
|
|
||||||
|
|
||||||
b.Property<bool>("IsTestOK")
|
b.Property<bool>("IsTestOK")
|
||||||
.HasColumnType("bit");
|
.HasColumnType("bit");
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue