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