Compare commits
1 Commits
prod-his2
...
9239da35f8
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9239da35f8 |
@@ -119,6 +119,7 @@ export default class RetrieveMetadataLoaderAsync extends RetrieveMetadataLoader
|
||||
async preLoad() {
|
||||
const preLoaders = this.getPreLoaders();
|
||||
const result = await this.runLoaders(preLoaders);
|
||||
console.log('Raw QIDO series result:', result); // Debug: Check if '0008103E' is present
|
||||
const sortCriteria = this.sortCriteria;
|
||||
const sortFunction = this.sortFunction;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { utils, classes } from '@ohif/core';
|
||||
import { utils, classes, DicomMetadataStore } from '@ohif/core';
|
||||
import { id } from './id';
|
||||
import getDisplaySetMessages from './getDisplaySetMessages';
|
||||
import getDisplaySetsFromUnsupportedSeries from './getDisplaySetsFromUnsupportedSeries';
|
||||
@@ -75,6 +75,10 @@ const makeDisplaySet = instances => {
|
||||
? DYNAMIC_VOLUME_LOADER_SCHEME
|
||||
: DEFAULT_VOLUME_LOADER_SCHEME;
|
||||
|
||||
// Get series metadata from store
|
||||
const study = DicomMetadataStore.getStudy(instance.StudyInstanceUID);
|
||||
const series = study?.series?.find(s => s.SeriesInstanceUID === instance.SeriesInstanceUID);
|
||||
|
||||
// set appropriate attributes to image set...
|
||||
const messages = getDisplaySetMessages(instances, isReconstructable, isDynamicVolume);
|
||||
|
||||
@@ -88,7 +92,7 @@ const makeDisplaySet = instances => {
|
||||
SeriesNumber: instance.SeriesNumber || 0,
|
||||
FrameRate: instance.FrameTime,
|
||||
SOPClassUID: instance.SOPClassUID,
|
||||
SeriesDescription: instance.SeriesDescription || '',
|
||||
SeriesDescription: series?.SeriesDescription || instance.SeriesDescription || '',
|
||||
Modality: instance.Modality,
|
||||
isMultiFrame: isMultiFrame(instance),
|
||||
countIcon: isReconstructable ? 'icon-mpr' : undefined,
|
||||
|
||||
@@ -23,9 +23,9 @@ window.config = {
|
||||
// above, the number of requests can be go a lot higher.
|
||||
prefetch: 25,
|
||||
},
|
||||
expertise_host: `http://<IP_NV_VIEWER>`, // IP ke NV di PACS Server, untuk fetch expertise bawaan versi NV
|
||||
pacs_document_host: `<IP_NV_VIEWER>`, // IP ke NV di PACS Server untuk ambil pdf
|
||||
pacs_document_port: 8080,
|
||||
expertise_host: `http://152.42.173.210`, // IP ke NV di PACS Server, untuk fetch expertise bawaan versi NV
|
||||
pacs_document_host: `152.42.173.210`, // IP ke NV di PACS Server untuk ambil pdf
|
||||
pacs_document_port: 8585,
|
||||
defaultDataSourceName: 'local-proxy',
|
||||
dataSources: [
|
||||
{
|
||||
@@ -34,8 +34,8 @@ window.config = {
|
||||
configuration: {
|
||||
friendlyName: 'Static WADO Local Data',
|
||||
name: 'DCM4CHEE',
|
||||
qidoRoot: `http://<IP_DICOMWEBPROXY>:<PORT_DICOMWEBPROXY_OHIF>/rs`, // IP ke dicomweb-proxy PACS Server. URI selalu /rs
|
||||
wadoRoot: `http://<IP_DICOMWEBPROXY>:<PORT_DICOMWEBPROXY_OHIF>/rs`, // IP ke dicomweb-proxy PACS Server. URI selalu /rs
|
||||
qidoRoot: `http://152.42.173.210:5000/rs`, // IP ke dicomweb-proxy PACS Server. URI selalu /rs
|
||||
wadoRoot: `http://152.42.173.210:5000/rs`, // IP ke dicomweb-proxy PACS Server. URI selalu /rs
|
||||
qidoSupportsIncludeField: false,
|
||||
supportsReject: true,
|
||||
supportsStow: true,
|
||||
|
||||
@@ -321,6 +321,8 @@ export default class DisplaySetService extends PubSubService {
|
||||
const handler = this.extensionManager.getModuleEntry(SOPClassHandlerId);
|
||||
|
||||
if (handler.sopClassUids.includes(instance.SOPClassUID)) {
|
||||
// Add this debug
|
||||
console.log('Using SOPHandler:', SOPClassHandlerId, 'for SOPClass:', instance.SOPClassUID);
|
||||
// Check if displaySets are already created using this SeriesInstanceUID/SOPClassHandler pair.
|
||||
let displaySets = existingDisplaySets.filter(
|
||||
displaySet => displaySet.SOPClassHandlerId === SOPClassHandlerId
|
||||
@@ -363,6 +365,16 @@ export default class DisplaySetService extends PubSubService {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Add debug
|
||||
console.log(
|
||||
'Created displaySets from Series:',
|
||||
displaySets.map(ds => ({
|
||||
uid: ds.displaySetInstanceUID,
|
||||
desc: ds.SeriesDescription,
|
||||
seriesUID: ds.SeriesInstanceUID,
|
||||
}))
|
||||
);
|
||||
|
||||
// applying hp-defined viewport settings to the displaysets
|
||||
displaySets.forEach(ds => {
|
||||
Object.keys(settings).forEach(key => {
|
||||
|
||||
Reference in New Issue
Block a user