Compare commits
1 Commits
bisone-int
...
prod-batam
| Author | SHA1 | Date | |
|---|---|---|---|
|
cf5cb2dfbf |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -12,7 +12,6 @@ coverage/
|
||||
.yarn/
|
||||
.nx/
|
||||
addOns/yarn.lock
|
||||
**.zip
|
||||
|
||||
# YALC (for Erik)
|
||||
.yalc
|
||||
@@ -61,3 +60,4 @@ tests/playwright-report/
|
||||
# Dummy
|
||||
/dump
|
||||
platform/app/dist.zip
|
||||
platform/app/dist-sudirman.zip
|
||||
|
||||
@@ -146,6 +146,7 @@ function ViewerLayout({
|
||||
side="right"
|
||||
activeTabIndex={rightPanelClosedState ? null : 0}
|
||||
servicesManager={servicesManager}
|
||||
expandedWidth={400}
|
||||
/>
|
||||
) : null}
|
||||
</React.Fragment>
|
||||
|
||||
@@ -6,9 +6,7 @@ function OHIFCornerstonePdfViewport({ displaySets }) {
|
||||
var [url, setUrl] = useState(null);
|
||||
|
||||
const sopInstanceUid = displaySets[0].SOPInstanceUID;
|
||||
url = `http://${window.config.pacs_document_host}:${window.config.pacs_document_port}/rid/IHERetrieveDocument?requestType=DOCUMENT&documentUID=${sopInstanceUid}&preferredContentType=application%2Fpdf`;
|
||||
|
||||
// console.log('PDF URL:', url);
|
||||
url = `http://128.199.154.150:8080/rid/IHERetrieveDocument?requestType=DOCUMENT&documentUID=${sopInstanceUid}&preferredContentType=application%2Fpdf`;
|
||||
|
||||
useEffect(() => {
|
||||
document.body.addEventListener('drag', makePdfDropTarget);
|
||||
@@ -35,15 +33,13 @@ function OHIFCornerstonePdfViewport({ displaySets }) {
|
||||
|
||||
const { pdfUrl } = displaySets[0];
|
||||
|
||||
// console.log('Dicomweb PDF URL:', pdfUrl);
|
||||
useEffect(() => {
|
||||
const load = async () => {
|
||||
setUrl(await pdfUrl);
|
||||
};
|
||||
|
||||
// useEffect(() => {
|
||||
// const load = async () => {
|
||||
// setUrl(await pdfUrl);
|
||||
// };
|
||||
|
||||
// load();
|
||||
// }, [pdfUrl]);
|
||||
load();
|
||||
}, [pdfUrl]);
|
||||
|
||||
return (
|
||||
<div
|
||||
@@ -54,7 +50,9 @@ function OHIFCornerstonePdfViewport({ displaySets }) {
|
||||
data={url}
|
||||
type="application/pdf"
|
||||
className={style}
|
||||
></object>
|
||||
>
|
||||
<div>No online PDF viewer installed</div>
|
||||
</object>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -24,22 +24,10 @@ window.config = {
|
||||
prefetch: 25,
|
||||
},
|
||||
expertise: false, //* Tambahan untuk enable expertise (CustomizableViewportOverlay)
|
||||
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`,
|
||||
expertise_host: `http://192.168.2.13`, // IP ke NV di PACS Server, untuk fetch expertise bawaan versi NV
|
||||
pacs_document_host: `192.168.2.13`, // IP ke NV di PACS Server untuk ambil pdf
|
||||
pacs_document_port: 8080,
|
||||
// filterQueryParam: false,
|
||||
// defaultDataSourceName: 'dicomweb',
|
||||
defaultDataSourceName: 'local-proxy',
|
||||
/* Dynamic config allows user to pass "configUrl" query string this allows to load config without recompiling application. The regex will ensure valid configuration source */
|
||||
// dangerouslyUseDynamicConfig: {
|
||||
// enabled: true,
|
||||
// // regex will ensure valid configuration source and default is /.*/ which matches any character. To use this, setup your own regex to choose a specific source of configuration only.
|
||||
// // Example 1, to allow numbers and letters in an absolute or sub-path only.
|
||||
// // regex: /(0-9A-Za-z.]+)(\/[0-9A-Za-z.]+)*/
|
||||
// // Example 2, to restricts to either hosptial.com or othersite.com.
|
||||
// // regex: /(https:\/\/hospital.com(\/[0-9A-Za-z.]+)*)|(https:\/\/othersite.com(\/[0-9A-Za-z.]+)*)/
|
||||
// regex: /.*/,
|
||||
// },
|
||||
dataSources: [
|
||||
{
|
||||
namespace: '@ohif/extension-default.dataSourcesModule.dicomweb',
|
||||
@@ -47,9 +35,8 @@ window.config = {
|
||||
configuration: {
|
||||
friendlyName: 'Static WADO Local Data',
|
||||
name: 'DCM4CHEE',
|
||||
qidoRoot: `http://152.42.173.210:5000/rs`,
|
||||
wadoRoot: `http://152.42.173.210:5000/rs`,
|
||||
qidoSupportsIncludeField: false,
|
||||
qidoRoot: `http://192.168.2.13:5000/rs`, // IP ke dicomweb-proxy PACS Server. URI selalu /rs
|
||||
wadoRoot: `http://192.168.2.13:5000/rs`, // IP ke dicomweb-proxy PACS Server. URI selalu /rs qidoSupportsIncludeField: false,
|
||||
supportsReject: true,
|
||||
supportsStow: true,
|
||||
imageRendering: 'wadors',
|
||||
|
||||
@@ -10,6 +10,25 @@ window.config = {
|
||||
showCPUFallbackMessage: true,
|
||||
showLoadingIndicator: true,
|
||||
strictZSpacingForVolumeViewport: true,
|
||||
// This is an array, but we'll only use the first entry for now
|
||||
// Remove OIDC configuration since proxy handles authentication
|
||||
// oidc: [
|
||||
// {
|
||||
// // ~ REQUIRED
|
||||
// // Authorization Server URL
|
||||
// authority: 'https://accounts.google.com',
|
||||
// client_id: '382212153306-7q39hdie4ecj0uhemkitvedo93bnvfhn.apps.googleusercontent.com',
|
||||
// redirect_uri: '/callback',
|
||||
// response_type: 'id_token token',
|
||||
// scope:
|
||||
// 'email profile openid https://www.googleapis.com/auth/cloudplatformprojects.readonly https://www.googleapis.com/auth/cloud-healthcare', // email profile openid
|
||||
// // ~ OPTIONAL
|
||||
// post_logout_redirect_uri: '/logout-redirect.html',
|
||||
// revoke_uri: 'https://accounts.google.com/o/oauth2/revoke?token=',
|
||||
// automaticSilentRenew: true,
|
||||
// revokeAccessTokenOnSignout: true,
|
||||
// },
|
||||
// ],
|
||||
extensions: [],
|
||||
modes: [],
|
||||
showStudyList: true,
|
||||
@@ -34,6 +53,12 @@ window.config = {
|
||||
dicomUploadEnabled: true,
|
||||
omitQuotationForMultipartRequest: true,
|
||||
configurationAPI: 'ohif.dataSourceConfigurationAPI.google',
|
||||
// defaultDicomStoreConfiguredItems: {
|
||||
// id: 'projects/ohifproxy/locations/asia-southeast2/datasets/sas-storage',
|
||||
// itemType: '3',
|
||||
// name: 'store-1',
|
||||
// url: 'https://healthcare.googleapis.com/v1/projects/ohifproxy/locations/asia-southeast2/datasets/sas-storage/dicomStores/store-1'
|
||||
// },
|
||||
},
|
||||
},
|
||||
{
|
||||
|
||||
@@ -356,21 +356,14 @@ const SidePanel = ({
|
||||
}
|
||||
|
||||
setIsExpertiseLoading(true);
|
||||
const url = `${window.config.expertise_host}?accessionNo=${accessionNumber}`;
|
||||
const url = `${window.config.expertise_host}/nv/query.php?method=view&AccessionNumber=${encodeURIComponent(accessionNumber)}`;
|
||||
|
||||
const response = await fetch(url);
|
||||
const data = await response.json();
|
||||
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),
|
||||
};
|
||||
console.log('Study data:', data);
|
||||
|
||||
setExpertiseData(formattedExpertiseData);
|
||||
if (data?.study?.expertise && data.study.expertise.length > 0) {
|
||||
setExpertiseData(data.study.expertise[0]);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error fetching expertise data:', error);
|
||||
@@ -379,32 +372,6 @@ 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
|
||||
|
||||
@@ -474,7 +441,7 @@ const SidePanel = ({
|
||||
});
|
||||
|
||||
return (
|
||||
<ScrollArea className="border-input bg-background h-[500px] w-[350px] rounded-md border p-2 text-sm text-white">
|
||||
<ScrollArea className="border-input bg-background h-[500px] w-full rounded-md border p-2 text-sm text-white">
|
||||
<h3 className="mb-4 text-lg font-bold">Expertise</h3>
|
||||
{formattedData.map((section, index) => (
|
||||
<div
|
||||
@@ -485,11 +452,16 @@ const SidePanel = ({
|
||||
{Array.isArray(section.value) ? (
|
||||
<ul className="list-disc pl-6">
|
||||
{section.value.map((item, idx) => (
|
||||
<li key={idx}>{item}</li>
|
||||
<li
|
||||
key={idx}
|
||||
className="break-words"
|
||||
>
|
||||
{item}
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
) : (
|
||||
<p>{section.value}</p>
|
||||
<p className="break-words">{section.value}</p>
|
||||
)}
|
||||
</div>
|
||||
))}
|
||||
|
||||
Reference in New Issue
Block a user