diff --git a/platform/app/public/config/default.js b/platform/app/public/config/default.js index 60b4ee4..c145905 100644 --- a/platform/app/public/config/default.js +++ b/platform/app/public/config/default.js @@ -6,7 +6,7 @@ window.config = { extensions: [], modes: [], customizationService: {}, - showStudyList: true, + showStudyList: false, // some windows systems have issues with more than 3 web workers maxNumberOfWebWorkers: 3, // below flag is for performance reasons, but it might not work for all servers @@ -24,8 +24,8 @@ window.config = { prefetch: 25, }, expertise: false, //* Tambahan untuk enable expertise (CustomizableViewportOverlay) - expertise_host: `http://192.168.1.29`, //* Tambahan untuk fetch data Expertise) - pacs_document_host: `192.168.1.29`, + expertise_host: `https://devone.aplikasi.web.id/one-api/mockup/pacsmwl/Workorder/get_dummy_expertise`, //* Tambahan untuk fetch data Expertise) + pacs_document_host: `152.42.173.210`, pacs_document_port: 8080, // filterQueryParam: false, // defaultDataSourceName: 'dicomweb', @@ -47,8 +47,8 @@ window.config = { configuration: { friendlyName: 'Static WADO Local Data', name: 'DCM4CHEE', - qidoRoot: `http://192.168.1.29:5000/rs`, - wadoRoot: `http://192.168.1.29:5000/rs`, + qidoRoot: `http://152.42.173.210:5000/rs`, + wadoRoot: `http://152.42.173.210:5000/rs`, qidoSupportsIncludeField: false, supportsReject: true, supportsStow: true, diff --git a/platform/ui-next/src/components/SidePanel/SidePanel.tsx b/platform/ui-next/src/components/SidePanel/SidePanel.tsx index 71d6f37..ed1f7d2 100644 --- a/platform/ui-next/src/components/SidePanel/SidePanel.tsx +++ b/platform/ui-next/src/components/SidePanel/SidePanel.tsx @@ -356,14 +356,21 @@ const SidePanel = ({ } setIsExpertiseLoading(true); - const url = `${window.config.expertise_host}/nv/query.php?method=view&AccessionNumber=${encodeURIComponent(accessionNumber)}`; + const url = `${window.config.expertise_host}?accessionNo=${accessionNumber}`; const response = await fetch(url); const data = await response.json(); - console.log('Study data:', data); + if (data?.status === 'OK' && data?.data) { + // Create expertise data in the format expected by your component + const formattedExpertiseData = { + ordering_physician: data.data.senderDoctorName, + radiologist: data.data.pjDoctorName, + expertise_dttm: data.data.expTime, + // Convert the expertise object to a string format that parseExpertise can handle + expertise: formatExpertiseToString(data.data.expertise), + }; - if (data?.study?.expertise && data.study.expertise.length > 0) { - setExpertiseData(data.study.expertise[0]); + setExpertiseData(formattedExpertiseData); } } catch (error) { console.error('Error fetching expertise data:', error); @@ -372,6 +379,32 @@ const SidePanel = ({ } }; + // Helper function to convert expertise object to string format + const formatExpertiseToString = expertiseObj => { + if (!expertiseObj) return ''; + + let result = ''; + + // Add each section with proper formatting + if (expertiseObj.Indikasi) { + result += `KLINIS: ${expertiseObj.Indikasi}\r\n`; + } + + if (expertiseObj.Teknik) { + result += `TEKNIK: ${expertiseObj.Teknik}\r\n\r\n`; + } + + if (expertiseObj.Deskripsi) { + result += `KETERANGAN:\r\n${expertiseObj.Deskripsi.replace(/\n/g, '\r\n')}\r\n\r\n`; + } + + if (expertiseObj.Kesan) { + result += `KESAN: ${expertiseObj.Kesan}`; + } + + return result; + }; + const getExpertisePanel = () => { if (side !== 'right') return null; // Only show in the right side panel