fix: Source id

ministero-salute · Apr 10, 2024 · 294a0f5 · 294a0f5
1 parent 4eef364
commit 294a0f5
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/service/impl/FhirSRV.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/service/impl/FhirSRV.java
@@ -49,7 +49,7 @@
 @Slf4j
 public class FhirSRV implements IFhirSRV {
 
-	private static final String PATH_CUSTODIAN_ID = "ClinicalDocument > custodian > assignedCustodian > representedCustodianOrganization > id";
+	private static final String PATH_ID = "ClinicalDocument > id";
 	private static final String PATH_PATIENT_ID = "ClinicalDocument > recordTarget > patientRole> id";
 	private static final String EXTENSION_ATTRIBUTE = "extension";
 
@@ -141,12 +141,11 @@ private SubmissionSetEntryDTO createSubmissionSetEntry(final org.jsoup.nodes.Doc
 		sse.setAuthorRole(authorSlotDTO.getAuthorRole());
 		sse.setPatientId(buildPatient(docCDA));
 		String sourceIdRoot = "";
-		final Element custodianPath = docCDA.select(PATH_CUSTODIAN_ID).first();
-		if (custodianPath != null) {
-			sourceIdRoot = custodianPath.attr("root");
+		final Element idPath = docCDA.select(PATH_ID).first();
+		if (idPath != null) {
+			sourceIdRoot = idPath.attr("root");
+			sse.setSourceId(sourceIdRoot.substring(0, sourceIdRoot.length()-4));
 		}
-
-		sse.setSourceId(sourceIdRoot);
 		sse.setUniqueID(identificativoSottomissione);
 
 		sse.setSubmissionTime(new SimpleDateFormat(Constants.Misc.INI_DATE_PATTERN).format(new Date()));
@@ -159,7 +158,8 @@ private SubmissionSetEntryDTO createSubmissionSetEntry(final org.jsoup.nodes.Doc
 		}
 		return sse;
 	}
-
+
+
 
 	private DocumentEntryDTO createDocumentEntry(final org.jsoup.nodes.Document docCDA,
 			final PublicationCreateReplaceMetadataDTO requestBody, final Integer size, final String hash,
@@ -206,7 +206,7 @@ private DocumentEntryDTO createDocumentEntry(final org.jsoup.nodes.Document docC
 					administrativeRequestList.add(en.getCode() + "^" + en.getDescription());	
 				}
 				de.setAdministrativeRequest(administrativeRequestList);
-				
+
 			}
 
 			de.setAuthorRole(authorSlotDTO.getAuthorRole());