Mercurial > hg > orthanc-java

comparison Samples/FHIR/src/main/java/OrthancResource.java @ 15:b69bc09e2969

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 26 Oct 2023 13:51:32 +0200
parents 0dc05fe76bd5
children 1c407ba1d311
comparison
equal deleted inserted replaced
14:0dc05fe76bd5 15:b69bc09e2969
195 Patient patient = new Patient(); 195 Patient patient = new Patient();
196 patient.setId(getTags().getOrDefault(Toolbox.TAG_PATIENT_ID, "")); 196 patient.setId(getTags().getOrDefault(Toolbox.TAG_PATIENT_ID, ""));
197 197
198 String birthDate = getTags().getOrDefault(Toolbox.TAG_PATIENT_BIRTH_DATE, ""); 198 String birthDate = getTags().getOrDefault(Toolbox.TAG_PATIENT_BIRTH_DATE, "");
199 if (birthDate != null) { 199 if (birthDate != null) {
200 patient.setBirthDate(Toolbox.parseDicomDate(birthDate)); 200 try {
201 patient.setBirthDate(Toolbox.parseDicomDate(birthDate));
202 } catch (IllegalArgumentException e) {
203 // Ignore incorrect dates
204 }
201 } 205 }
202 206
203 String patientName = getTags().getOrDefault(Toolbox.TAG_PATIENT_NAME, ""); 207 String patientName = getTags().getOrDefault(Toolbox.TAG_PATIENT_NAME, "");
204 if (!patientName.isEmpty()) { 208 if (!patientName.isEmpty()) {
205 patient.addName(); 209 patient.addName();
246 250
247 study.setSubject(Toolbox.createLocalReference("Patient", getTags().getOrDefault(Toolbox.TAG_PATIENT_ID, ""))); 251 study.setSubject(Toolbox.createLocalReference("Patient", getTags().getOrDefault(Toolbox.TAG_PATIENT_ID, "")));
248 252
249 String studyDate = getTags().getOrDefault(Toolbox.TAG_STUDY_DATE, ""); 253 String studyDate = getTags().getOrDefault(Toolbox.TAG_STUDY_DATE, "");
250 if (!studyDate.isEmpty()) { 254 if (!studyDate.isEmpty()) {
251 study.setStarted(Toolbox.parseDicomDate(studyDate)); 255 try {
256 study.setStarted(Toolbox.parseDicomDate(studyDate));
257 } catch (IllegalArgumentException e) {
258 // Ignore incorrect dates
259 }
260 }
261
262 String studyDescription = getTags().getOrDefault(Toolbox.TAG_STUDY_DESCRIPTION, "");
263 if (!studyDescription.isEmpty()) {
264 study.setDescription(studyDescription);
252 } 265 }
253 266
254 study.addIdentifier(); 267 study.addIdentifier();
255 study.getIdentifier().get(0).setSystem("urn:dicom:uid"); 268 study.getIdentifier().get(0).setSystem("urn:dicom:uid");
256 study.getIdentifier().get(0).setValue("urn:oid:" + study.getId()); 269 study.getIdentifier().get(0).setValue("urn:oid:" + study.getId());