From c3e720fe78db657eec93975fc98bdfab252451e3 Mon Sep 17 00:00:00 2001 From: LaurentPV Date: Tue, 18 Feb 2025 17:56:56 +0100 Subject: [PATCH] avoid exception if modality is null to create manufacturer model --- .../shanoir/uploader/action/FindDicomActionListener.java | 3 ++- .../shanoir/uploader/action/ImportFromTableRunner.java | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/shanoir-uploader/src/main/java/org/shanoir/uploader/action/FindDicomActionListener.java b/shanoir-uploader/src/main/java/org/shanoir/uploader/action/FindDicomActionListener.java index 83369e36ce..16980d4728 100644 --- a/shanoir-uploader/src/main/java/org/shanoir/uploader/action/FindDicomActionListener.java +++ b/shanoir-uploader/src/main/java/org/shanoir/uploader/action/FindDicomActionListener.java @@ -121,7 +121,8 @@ public void actionPerformed(ActionEvent event) { + mainWindow.patientIDTF.getText() + " " + mainWindow.birthDate.toString() + " " + mainWindow.studyDescriptionTF.getText() + " " - + mainWindow.studyDate.toString()) ; + + mainWindow.studyDate.toString() + " " + + mainWindow.modality); this.mainWindow.isFromPACS = true; this.mainWindow.setCursor(Cursor diff --git a/shanoir-uploader/src/main/java/org/shanoir/uploader/action/ImportFromTableRunner.java b/shanoir-uploader/src/main/java/org/shanoir/uploader/action/ImportFromTableRunner.java index 288cb6f32c..9171eb8726 100644 --- a/shanoir-uploader/src/main/java/org/shanoir/uploader/action/ImportFromTableRunner.java +++ b/shanoir-uploader/src/main/java/org/shanoir/uploader/action/ImportFromTableRunner.java @@ -122,7 +122,8 @@ protected Void doInBackground() throws Exception { String patientName = importJob.getDicomQuery().getPatientName(); String patientID = importJob.getDicomQuery().getPatientID(); String studyDate = importJob.getDicomQuery().getStudyDate(); - String importJobIdentifier = "[Line: " + i + ", patientName: " + patientName + ", patientID: " + patientID + ", studyDate: " + studyDate + "]"; + String modality = importJob.getDicomQuery().getModality(); + String importJobIdentifier = "[Line: " + i + ", patientName: " + patientName + ", patientID: " + patientID + ", studyDate: " + studyDate + ", modality: " + modality + "]"; logger.info("\r\n------------------------------------------------------\r\n" + "Starting importJob " + importJobIdentifier + "\r\n" + "------------------------------------------------------"); @@ -294,7 +295,12 @@ private boolean importData(ImportJob importJob, org.shanoir.uploader.model.rest. logger.error(importJob.getErrorMessage()); return false; } + + // Modality is mandatory to create a new Manufacturer model, but not mandatory in the dicom query String modality = importJob.getDicomQuery().getModality(); + if (modality == null || modality.isBlank()) { + modality = importJob.getSelectedSeries().iterator().next().getModality(); + } Integer datasetModalityType = DatasetModalityType.getIdFromModalityName(modality); String magneticFieldStrength = uploadJob.getMriInformation().getMagneticFieldStrength(); if (magneticFieldStrength == null || magneticFieldStrength.isBlank() || "unknown".equals(magneticFieldStrength)) {