From b95edc4332f27852268763dce4b664f70e74ddee Mon Sep 17 00:00:00 2001 From: Vincenzo Ingenito <54367888+vincenzo-ingenito@users.noreply.github.com> Date: Mon, 18 Dec 2023 14:49:48 +0100 Subject: [PATCH] feat: Update ad2.5 --- .../client/impl/FhirMappingClient.java | 8 +- .../ms/gtw/dispatcher/dto/AbstractDTO.java | 17 -- .../gtw/dispatcher/dto/DocumentEntryDTO.java | 2 - .../dispatcher/dto/KafkaStatusManagerDTO.java | 2 +- .../request/PublicationMetadataReqDTO.java | 3 +- .../request/TSPublicationCreationReqDTO.java | 3 +- .../dto/request/ValidationCDAReqDTO.java | 3 +- .../request/client/ValidationRequestDTO.java | 3 +- .../dto/response/EdsResponseDTO.java | 5 +- .../dto/response/ErrorResponseDTO.java | 3 +- .../dto/response/LogTraceInfoDTO.java | 3 +- .../dto/response/client/TransformResDTO.java | 4 +- .../gtw/dispatcher/enums/DescriptionEnum.java | 17 +- .../gtw/dispatcher/enums/EventCodeEnum.java | 124 +++++++++++-- .../gtw/dispatcher/enums/LowLevelDocEnum.java | 20 +- .../enums/PracticeSettingCodeEnum.java | 174 +++++++++--------- .../ms/gtw/dispatcher/enums/RoleEnum.java | 12 +- .../enums/SubjectOrganizationEnum.java | 3 +- .../service/impl/DocumentReferenceSRV.java | 5 +- .../fse2/ms/gtw/dispatcher/EnumsTest.java | 2 +- 20 files changed, 241 insertions(+), 172 deletions(-) delete mode 100644 src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/AbstractDTO.java diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/client/impl/FhirMappingClient.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/client/impl/FhirMappingClient.java index 7497fc33..22ec4766 100644 --- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/client/impl/FhirMappingClient.java +++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/client/impl/FhirMappingClient.java @@ -14,8 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; import org.springframework.web.client.ResourceAccessException; import org.springframework.web.client.RestTemplate; @@ -41,16 +39,14 @@ public class FhirMappingClient implements IFhirMappingClient { public TransformResDTO callConvertCdaInBundle(final FhirResourceDTO resourceToConvert) { TransformResDTO out = null; log.debug("Fhir Mapping Client - Calling Fhir Mapping to execute conversion"); - ResponseEntity response = null; String url = msUrlCFG.getFhirMappingEngineHost() + "/v1/documents/transform"; HttpHeaders headers = new HttpHeaders(); headers.set("Content-Type", "application/json"); HttpEntity entity = new HttpEntity<>(resourceToConvert, headers); try { - response = restTemplate.exchange(url, HttpMethod.POST, entity, TransformResDTO.class); - out = response.getBody(); + out = restTemplate.postForObject(url, entity, TransformResDTO.class); } catch(ResourceAccessException cex) { - log.error("Connect error while call document transform :" + msUrlCFG.getFhirMappingEngineHost(),cex); + log.error("Connect error while call document transform :",cex); throw new ConnectionRefusedException(msUrlCFG.getFhirMappingEngineHost(),"Connection refused"); } return out; diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/AbstractDTO.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/AbstractDTO.java deleted file mode 100644 index 030af60d..00000000 --- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/AbstractDTO.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * SPDX-License-Identifier: AGPL-3.0-or-later - * - * Copyright (C) 2023 Ministero della Salute - * - * This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License along with this program. If not, see . - */ -package it.finanze.sanita.fse2.ms.gtw.dispatcher.dto; - -public abstract class AbstractDTO { - - -} \ No newline at end of file diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/DocumentEntryDTO.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/DocumentEntryDTO.java index 13c32a3c..9f39a10f 100644 --- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/DocumentEntryDTO.java +++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/DocumentEntryDTO.java @@ -28,11 +28,9 @@ public class DocumentEntryDTO { private String author; private String authorRole; private String authorInstitution; - private String languageCode; private String repositoryUniqueId; private String patientId; private String conservazioneANorma; - private String firma; private List description; private String serviceStartTime; private String serviceStopTime; diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/KafkaStatusManagerDTO.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/KafkaStatusManagerDTO.java index 8fe56a87..0f7e3841 100644 --- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/KafkaStatusManagerDTO.java +++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/KafkaStatusManagerDTO.java @@ -24,7 +24,7 @@ */ @Getter @Builder -public class KafkaStatusManagerDTO extends AbstractDTO { +public class KafkaStatusManagerDTO { private String traceId; diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/request/PublicationMetadataReqDTO.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/request/PublicationMetadataReqDTO.java index e64993fa..045bcfb3 100644 --- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/request/PublicationMetadataReqDTO.java +++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/request/PublicationMetadataReqDTO.java @@ -17,7 +17,6 @@ import io.swagger.v3.oas.annotations.media.ArraySchema; import io.swagger.v3.oas.annotations.media.Schema; -import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.AbstractDTO; import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.AdministrativeReqEnum; import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.AttivitaClinicaEnum; import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.HealthcareFacilityEnum; @@ -32,7 +31,7 @@ @Setter @NoArgsConstructor @AllArgsConstructor -public class PublicationMetadataReqDTO extends AbstractDTO { +public class PublicationMetadataReqDTO { @Schema(description = "Tipologia struttura che ha prodotto il documento", required = true) private HealthcareFacilityEnum tipologiaStruttura; diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/request/TSPublicationCreationReqDTO.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/request/TSPublicationCreationReqDTO.java index 4712de10..09f27e5f 100644 --- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/request/TSPublicationCreationReqDTO.java +++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/request/TSPublicationCreationReqDTO.java @@ -16,7 +16,6 @@ import javax.validation.constraints.Size; import io.swagger.v3.oas.annotations.media.Schema; -import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.AbstractDTO; import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.AttivitaClinicaEnum; import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.HealthDataFormatEnum; import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.HealthcareFacilityEnum; @@ -37,7 +36,7 @@ @NoArgsConstructor @AllArgsConstructor @Builder -public class TSPublicationCreationReqDTO extends AbstractDTO { +public class TSPublicationCreationReqDTO { @Schema(description = "Formato dei dati sanitari") private HealthDataFormatEnum healthDataFormat; diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/request/ValidationCDAReqDTO.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/request/ValidationCDAReqDTO.java index 260d72c5..437e757d 100644 --- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/request/ValidationCDAReqDTO.java +++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/request/ValidationCDAReqDTO.java @@ -14,7 +14,6 @@ import com.fasterxml.jackson.databind.annotation.JacksonStdImpl; import io.swagger.v3.oas.annotations.media.Schema; -import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.AbstractDTO; import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.ActivityEnum; import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.HealthDataFormatEnum; import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.InjectionModeEnum; @@ -35,7 +34,7 @@ @Jacksonized @Builder @JacksonStdImpl -public class ValidationCDAReqDTO extends AbstractDTO { +public class ValidationCDAReqDTO{ @Schema(description = "Formato dei dati sanitari") private HealthDataFormatEnum healthDataFormat; diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/request/client/ValidationRequestDTO.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/request/client/ValidationRequestDTO.java index 9d3f4fa0..7a2a9010 100644 --- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/request/client/ValidationRequestDTO.java +++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/request/client/ValidationRequestDTO.java @@ -12,7 +12,6 @@ package it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.request.client; import io.swagger.v3.oas.annotations.media.Schema; -import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.AbstractDTO; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -25,7 +24,7 @@ @Setter @NoArgsConstructor @AllArgsConstructor -public class ValidationRequestDTO extends AbstractDTO { +public class ValidationRequestDTO { @Schema(description = "cda") private String cda; diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/response/EdsResponseDTO.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/response/EdsResponseDTO.java index 11c4b6e2..436a4c89 100644 --- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/response/EdsResponseDTO.java +++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/response/EdsResponseDTO.java @@ -11,17 +11,14 @@ */ package it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.response; -import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.AbstractDTO; import lombok.AllArgsConstructor; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @Data -@EqualsAndHashCode(callSuper = true) @NoArgsConstructor @AllArgsConstructor -public class EdsResponseDTO extends AbstractDTO { +public class EdsResponseDTO { private boolean esito; diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/response/ErrorResponseDTO.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/response/ErrorResponseDTO.java index 02a29cbf..7d53ba5e 100644 --- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/response/ErrorResponseDTO.java +++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/response/ErrorResponseDTO.java @@ -16,7 +16,6 @@ import javax.validation.constraints.Size; import io.swagger.v3.oas.annotations.media.Schema; -import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.AbstractDTO; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -30,7 +29,7 @@ @Builder @AllArgsConstructor @EqualsAndHashCode(callSuper=false) -public class ErrorResponseDTO extends AbstractDTO { +public class ErrorResponseDTO { /** * Trace id log. diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/response/LogTraceInfoDTO.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/response/LogTraceInfoDTO.java index c4d6ca59..ed33fef0 100644 --- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/response/LogTraceInfoDTO.java +++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/response/LogTraceInfoDTO.java @@ -11,13 +11,12 @@ */ package it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.response; -import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.AbstractDTO; import lombok.Data; import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = false) -public class LogTraceInfoDTO extends AbstractDTO { +public class LogTraceInfoDTO { /** * Span. diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/response/client/TransformResDTO.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/response/client/TransformResDTO.java index 30889004..0b533e14 100644 --- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/response/client/TransformResDTO.java +++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/response/client/TransformResDTO.java @@ -13,7 +13,6 @@ import org.bson.Document; -import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.AbstractDTO; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -25,8 +24,7 @@ @Data @NoArgsConstructor @AllArgsConstructor -@EqualsAndHashCode(callSuper=true) -public class TransformResDTO extends AbstractDTO { +public class TransformResDTO { private String errorMessage; diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/enums/DescriptionEnum.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/enums/DescriptionEnum.java index ab94b421..01a027ba 100644 --- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/enums/DescriptionEnum.java +++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/enums/DescriptionEnum.java @@ -16,14 +16,15 @@ @Getter public enum DescriptionEnum { - DESC_OID1("2.16.840.1.113883.2.9.6.1.5"), - DESC_OID2("2.16.840.1.113883.2.9.6.1.51"), - DESC_OID3("2.16.840.1.113883.6.73"), - DESC_OID4("2.16.840.1.113883.2.9.6.1.11"), - DESC_OID5("2.16.840.1.113883.2.9.2.COD_REGIONE.6.1.11"), - DESC_OID6("2.16.840.1.113883.2.9.6.1.5"), - DESC_OID7("2.16.840.1.113883.6.73"); - + PRESCRIZIONE_FARMACEUTICA_AIC("2.16.840.1.113883.2.9.6.1.5"), + PRESCRIZIONE_FARMACEUTICA_GRUPPOEQ("2.16.840.1.113883.2.9.6.1.51"), + PRESCRIZIONE_FARMACEUTICA_ATC("2.16.840.1.113883.6.73"), + PRESCRIZIONE_SPECIALISTICA_CAT_NAZ("2.16.840.1.113883.2.9.6.1.11"), + PRESCRIZIONE_SPECIALISTICA_CAT_REG("2.16.840.1.113883.2.9.2.COD_REGIONE.6.1.11"), + EROGAZIONE_FARMACEUTICA_AIC("2.16.840.1.113883.2.9.6.1.5"), + EROGAZIONE_FARMACEUTICA_ATC("2.16.840.1.113883.6.73"); + + private String oid; private DescriptionEnum(String inOid) { diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/enums/EventCodeEnum.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/enums/EventCodeEnum.java index 79d9d6cc..6aabca45 100644 --- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/enums/EventCodeEnum.java +++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/enums/EventCodeEnum.java @@ -15,19 +15,6 @@ public enum EventCodeEnum { - P99("P99", "Oscuramento del documento"), - P97("P97", "Oscuramento al genitore"), - P98("P98", "Oscuramento all’assistito"), - J07BX03("J07BX03", "Vaccino per Covid-19"), - LP418019_8("LP418019-8", "Tampone antigenico per Covid-19"), - LP417541_2("LP417541-2", "Tampone molecolare per Covid-19"), - _96118_5("96118-5", "Test Sierologico qualitativo"), - _94503_0("94503-0", "Test Sierologico quantitativo"), - pay("pay", "Prescrizione farmaceutica non a carico SSN"), - PUBLICPOL("PUBLICPOL", "Prescrizione farmaceutica SSN"), - LP267463_0("LP267463-0", "Reddito"), - LP199190_2("LP199190-2", "Patologia"), - _90768_3("90768-3", "Analisi sangue donatore"), J07AC("J07AC","Anthrax vaccines"), J07AC01("J07AC01","anthrax antigen"), J07AD("J07AD","Brucellosis vaccines"), @@ -125,7 +112,6 @@ public enum EventCodeEnum { J07BM01("J07BM01","papillomavirus (human types 6, 11, 16, 18)"), J07BM02("J07BM02","papillomavirus (human types 16, 18)"), J07BM03("J07BM03","papillomavirus (human types 6, 11, 16, 18, 31, 33, 45, 52, 58)"), - J07BN("J07BN","Covid-19 vaccines"), J07BN01("J07BN01","covid-19, RNA-based vaccine"), J07BN02("J07BN02","covid-19, viral vector, non-replicating"), J07BN03("J07BN03","covid-19, inactivated virus"), @@ -149,7 +135,115 @@ public enum EventCodeEnum { J07CA12("J07CA12","diphtheria-pertussis-poliomyelitis-tetanus-hepatitis B"), J07CA13("J07CA13","diphtheria-haemophilus influenzae B-pertussis-tetanus-hepatitis B-meningococcus A + C"), J07XA("J07XA","Parasitic vaccines"), - J07XA01("J07XA01","malaria vaccines"); + J07XA01("J07XA01","malaria vaccines"), + _1001000221103("1001000221103","Inactivated whole Vibrio cholerae antigen only vaccine product in oral dose form"), + _1011000221100("1011000221100","Live attenuated Vibrio cholerae antigen only vaccine product in oral dose form"), + _1031000221108("1031000221108","Human poliovirus antigen-containing vaccine product"), + _1051000221104("1051000221104","Live attenuated Human poliovirus serotypes 1 and 3 antigens only vaccine product in oral dose form"), + _1052328007("1052328007","Streptococcus pneumoniae Danish serotype 4, 6B, 9V, 14, 18C, 19F, and 23F capsular polysaccharide antigens conjugated only vaccine product"), + _1081000221109("1081000221109","Live attenuated Rotavirus antigen only vaccine product"), + _1101000221104("1101000221104","Clostridium tetani toxoid antigen-containing vaccine product"), + _1119254000("1119254000","Streptococcus pneumoniae Danish serotype 1, 3, 4, 5, 6A, 6B, 7F, 9V, 14, 18C, 19A, 19F, and 23F capsular polysaccharide antigens only vaccine product"), + _1119305005("1119305005","SARS-CoV-2 antigen vaccine"), + _1119349007("1119349007","SARS-CoV-2 mRNA vaccine"), + _1121000221106("1121000221106","Live attenuated Yellow fever virus antigen only vaccine product"), + _1131000221109("1131000221109","Vaccine product containing only inactivated whole Rabies lyssavirus antigen"), + _1157024006("1157024006","Inactivated whole SARS-CoV-2 antigen vaccine"), + _1162643001("1162643001","SARS-CoV-2 recombinant spike protein antigen vaccine"), + _1181000221105("1181000221105","Influenza virus antigen only vaccine product"), + _1801000221105("1801000221105","Streptococcus pneumoniae capsular polysaccharide antigen conjugated only vaccine product"), + _1861000221106("1861000221106","Bacillus Calmette-Guerin antigen only vaccine product"), + _1981000221108("1981000221108","Neisseria meningitidis serogroup B antigen only vaccine product"), + _2171000221104("2171000221104","Salmonella enterica subspecies enterica serovar Typhi capsular polysaccharide unconjugated antigen only vaccine product in parenteral dose form"), + _2221000221107("2221000221107","Live attenuated Human alphaherpesvirus 3 only vaccine product"), + _28531000087107("28531000087107","COVID-19 vaccine"), + _29061000087103("29061000087103","COVID-19 non-replicating viral vector vaccine"), + _37146000("37146000","Typhus vaccine"), + _409568008("409568008","Pentavalent botulinum toxoid vaccine"), + _428601009("428601009","Paratyphoid vaccine"), + _601000221108("601000221108","Bordetella pertussis antigen-containing vaccine product"), + _774618008("774618008","Whole cell Bordetella pertussis and Clostridium tetani toxoid adsorbed and Corynebacterium diphtheriae toxoid antigens only vaccine product"), + _775641005("775641005","Clostridium tetani toxoid adsorbed and Corynebacterium diphtheriae toxoid antigens only vaccine product"), + _777725002("777725002","Clostridium tetani toxoid antigen adsorbed only vaccine product"), + _836368004("836368004","Bacteria antigen-containing vaccine product"), + _836369007("836369007","Virus antigen-containing vaccine product"), + _836374004("836374004","Hepatitis B virus antigen-containing vaccine product"), + _836375003("836375003","Hepatitis A virus antigen-containing vaccine product"), + _836377006("836377006","Influenza virus antigen-containing vaccine product"), + _836378001("836378001","Japanese encephalitis virus antigen-containing vaccine product"), + _836379009("836379009","Human papillomavirus antigen-containing vaccine product"), + _836380007("836380007","Haemophilus influenzae type B antigen-containing vaccine product"), + _836381006("836381006","Corynebacterium diphtheriae antigen-containing vaccine product"), + _836382004("836382004","Measles morbillivirus antigen-containing vaccine product"), + _836383009("836383009","Vibrio cholerae antigen-containing vaccine product"), + _836384003("836384003","Bacillus anthracis antigen-containing vaccine product"), + _836385002("836385002","Yellow fever virus antigen-containing vaccine product"), + _836387005("836387005","Rotavirus antigen-containing vaccine product"), + _836388000("836388000","Rubella virus antigen-containing vaccine product"), + _836389008("836389008","Vaccinia virus antigen-containing vaccine product"), + _836390004("836390004","Salmonella enterica subspecies enterica serovar Typhi antigen-containing vaccine product"), + _836393002("836393002","Rabies lyssavirus antigen-containing vaccine product"), + _836397001("836397001","Coxiella burnetii antigen-containing vaccine product"), + _836398006("836398006","Streptococcus pneumoniae antigen-containing vaccine product"), + _836401009("836401009","Neisseria meningitidis antigen-containing vaccine product"), + _836402002("836402002","Bacillus Calmette-Guerin antigen-containing vaccine product"), + _836403007("836403007","Tick-borne encephalitis virus antigen-containing vaccine product"), + _836495005("836495005","Human alphaherpesvirus 3 antigen-containing vaccine product"), + _836498007("836498007","Mumps orthorubulavirus antigen-containing vaccine product"), + _836500008("836500008","Haemophilus influenzae type B and Neisseria meningitidis serogroup C antigens only vaccine product"), + _840549009("840549009","Yersinia pestis antigen-containing vaccine product"), + _840563003("840563003","Dengue virus antigen-containing vaccine product"), + _840599008("840599008","Borrelia burgdorferi antigen-containing vaccine product"), + _863911006("863911006","Clostridium tetani antigen-containing vaccine product"), + _871726005("871726005","Rabies lyssavirus antigen only vaccine product"), + _871737006("871737006","Mumps orthorubulavirus antigen only vaccine product"), + _871738001("871738001","Live attenuated Mumps orthorubulavirus antigen only vaccine product"), + _871739009("871739009","Human poliovirus antigen only vaccine product"), + _871740006("871740006","Inactivated whole Human poliovirus antigen only vaccine product"), + _871742003("871742003","Clostridium tetani antigen only vaccine product"), + _871751006("871751006","Hepatitis A virus antigen only vaccine product"), + _871759008("871759008","Acellular Bordetella pertussis only vaccine product"), + _871764007("871764007","Haemophilus influenzae type b antigen only vaccine product"), + _871765008("871765008","Measles morbillivirus antigen only vaccine product"), + _871768005("871768005","Influenza virus antigen only vaccine product in nasal dose form"), + _871772009("871772009","Influenza A virus subtype H1N1 antigen only vaccine product"), + _871803007("871803007","Hepatitis A and Hepatitis B virus antigens only vaccine product"), + _871804001("871804001","Hepatitis A virus and Salmonella enterica subspecies enterica serovar Typhi antigens only vaccine product"), + _871806004("871806004","Haemophilus influenzae type B and Hepatitis B virus antigens only vaccine product"), + _871826000("871826000","Clostridium tetani and Corynebacterium diphtheriae antigens only vaccine product"), + _871831003("871831003","Measles morbillivirus and Mumps orthorubulavirus and Rubella virus antigens only vaccine product"), + _871837004("871837004","Clostridium tetani and Corynebacterium diphtheriae and Human poliovirus antigens only vaccine product"), + _871839001("871839001","Bordetella pertussis and Clostridium tetani and Corynebacterium diphtheriae and Haemophilus influenzae type B antigens only vaccine product"), + _871866001("871866001","Neisseria meningitidis serogroup C only vaccine product"), + _871871008("871871008","Neisseria meningitidis serogroup A and C only vaccine product"), + _871873006("871873006","Neisseria meningitidis serogroup A, C, W135 and Y only vaccine product"), + _871875004("871875004","Bordetella pertussis and Clostridium tetani and Corynebacterium diphtheriae antigens only vaccine product"), + _871876003("871876003","Acellular Bordetella pertussis and Clostridium tetani and Corynebacterium diphtheriae antigens only vaccine product"), + _871878002("871878002","Bordetella pertussis and Clostridium tetani and Corynebacterium diphtheriae and Human poliovirus antigens only vaccine product"), + _871887006("871887006","Bordetella pertussis and Clostridium tetani and Corynebacterium diphtheriae and Haemophilus influenzae type B and Human poliovirus antigens only vaccine product"), + _871889009("871889009","Acellular Bordetella pertussis and Corynebacterium diphtheriae and Hepatitis B virus and inactivated whole Human poliovirus antigens only vaccine product"), + _871895005("871895005","Bordetella pertussis and Clostridium tetani and Corynebacterium diphtheriae and Haemophilus influenzae type B and Hepatitis B virus and Human poliovirus antigens only vaccine product"), + _871908002("871908002","Human alphaherpesvirus 3 and Measles morbillivirus and Mumps orthorubulavirus and Rubella virus antigens only vaccine product"), + _871918007("871918007","Rickettsia antigen-containing vaccine product"), + _871921009("871921009","Staphylococcus toxoid vaccine"), + _921000221108("921000221108","Neisseria meningitidis antigen only vaccine product"), + _971000221109("971000221109","Live attenuated Salmonella enterica subspecies enterica serovar Typhi antigen only vaccine product in oral dose form"), + _981000221107("981000221107","Streptococcus pneumoniae antigen only vaccine product"), + P99("P99", "Oscuramento del documento"), + P97("P97", "Oscuramento al genitore"), + P98("P98", "Oscuramento all’assistito"), + J07BN("J07BN", "Vaccino per Covid-19"), + LP418019_8("LP418019-8", "Tampone antigenico per Covid-19"), + LP417541_2("LP417541-2", "Tampone molecolare per Covid-19"), + _96118_5("96118-5", "Test Sierologico qualitativo"), + _94503_0("94503-0", "Test Sierologico quantitativo"), + pay("pay" ,"Prescrizione farmaceutica non a carico SSN"), + PUBLICPOL("PUBLICPOL", "Prescrizione farmaceutica SSN"), + LP267463_0("LP267463-0", "Reddito"), + LP199190_2("LP199190-2", "Patologia"), + _90768_3("90768-3" ,"Analisi sangue donatore"); + + @Getter private String code; diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/enums/LowLevelDocEnum.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/enums/LowLevelDocEnum.java index aadb05c0..f8dd05cd 100644 --- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/enums/LowLevelDocEnum.java +++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/enums/LowLevelDocEnum.java @@ -15,21 +15,27 @@ @Getter public enum LowLevelDocEnum { + TXT("TXT","TXT"), + PDF("PDF","PDF"), + EROGATO_SISTEMATS("SistemaTS-Prestazione","Erogato SistemaTS"), + EROGATO_SISTEMATS_FARMACEUTICA("2.16.840.1.113883.2.9.10.1.13.1.1","Erogato SistemaTS farmaceutica"), + EROGATO_SISTEMATS_SPECIALISTICA("2.16.840.1.113883.2.9.10.1.13.1.2","Erogato SistemaTS specialistica"), + PRESCRIZIONE_SISTEMATS("SistemaTS-Prescrizione","Prescrizione Sistema TS"), + PRESCRIZIONE_FARMACEUTICA_SISTEMATS("2.16.840.1.113883.2.9.10.1.2.1","Prescrizione farmaceutica Sistema TS"), + PRESCRIZIONE_SPECIALISTICA_SISTEMATS("2.16.840.1.113883.2.9.10.1.13.1.1","Prescrizione specialistica Sistema TS"), + ESENZIONE_REDDITO_SISTEMATS("SistemaTS-Esenzione","Esenzione da reddito SistemaTS"), PRESCRIZIONE("2.16.840.1.113883.2.9.10.1.2","Prescrizione"), REFERTO_LABORATORIO("2.16.840.1.113883.2.9.10.1.1","Referto di Laboratorio"), - PROFILO_SANITARIO_SINTETICO("2.16.840.1.113883.2.9.10.2.4.1.1","Profilo Sanitario Sintetico"), - PDF("PDF","PDF"), - TXT("TXT","TXT"), + PROFILO_SANITARIO_SINTETICO("2.16.840.1.113883.2.9.10.1.4.1.1","Profilo Sanitario Sintetico"), LETTERA_DIMISSIONE_OSPEDALIERA("2.16.840.1.113883.2.9.10.1.5","Lettera di Dimissione Ospedaliera"), - REFERTO_RADIOLOGIA("2.16.840.1.113883.2.9.10.1.7","Referto di Radiologia"), + REFERTO_RADIOLOGIA("2.16.840.1.113883.2.9.10.1.7.1","Referto di Radiologia"), PIANO_TERAPEUTICO("2.16.840.1.113883.2.9.4.3.14","Piano Terapeutico"), SCHEDA_SINGOLA_VACCINAZIONE("2.16.840.1.113883.2.9.10.1.11.1.1","Scheda della singola Vaccinazione"), CERTIFICATO_VACCINALE("2.16.840.1.113883.2.9.10.1.11.1.2","Certificato Vaccinale"), VERBALE_PRONTO_SOCCORSO("2.16.840.1.113883.2.9.10.1.6.1","Verbale di Pronto Soccorso"), REFERTO_SPECIALISTICA_AMBULATORIALE("2.16.840.1.113883.2.9.10.1.9.1","Referto di Specialistica Ambulatoriale"), - EROGATO_SISTEMATS("SistemaTS-Prestazione","Erogato SistemaTS"), - PRESCRIZIONE_SISTEMATS("SistemaTS-Esenzione","Prescrizione SistemaTS"), - ESENZIONE_REDDITO_SISTEMATS("SistemaTS-Prescrizione","Esenzione da reddito SistemaTS"); + DOCUMENTO_GENERICO("2.16.840.1.113883.2.9.10.1.12.1","Documento generico"); + private String code; private String description; diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/enums/PracticeSettingCodeEnum.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/enums/PracticeSettingCodeEnum.java index 074f5643..0d5ffd4f 100644 --- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/enums/PracticeSettingCodeEnum.java +++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/enums/PracticeSettingCodeEnum.java @@ -15,91 +15,95 @@ public enum PracticeSettingCodeEnum { - AD_PSC001("AD_PSC001","Allergologia"), - AD_PSC002("AD_PSC002","Day Hospital"), - AD_PSC003("AD_PSC003","Anatomia e Istologia Patologica"), - AD_PSC005("AD_PSC005","Angiologia"), - AD_PSC006("AD_PSC006","Cardiochirurgia Pediatrica"), - AD_PSC007("AD_PSC007","Cardiochirurgia"), - AD_PSC008("AD_PSC008","Cardiologia"), - AD_PSC009("AD_PSC009","Chirurgia Generale"), - AD_PSC010("AD_PSC010","Chirurgia Maxillo-Facciale"), - AD_PSC011("AD_PSC011","Chirurgia Pediatrica"), - AD_PSC012("AD_PSC012","Chirurgia Plastica"), - AD_PSC013("AD_PSC013","Chirurgia Toracica"), - AD_PSC014("AD_PSC014","Chirurgia Vascolare"), - AD_PSC015("AD_PSC015","Medicina Sportiva"), - AD_PSC018("AD_PSC018","Ematologia e Immunoematologia"), - AD_PSC019("AD_PSC019","Malattie Endocrine, del Ricambio e della Nutrizione"), - AD_PSC020("AD_PSC020","Immunologia"), - AD_PSC021("AD_PSC021","Geriatria"), - AD_PSC024("AD_PSC024","Malattie Infettive e Tropicali"), - AD_PSC025("AD_PSC025","Medicina del Lavoro"), - AD_PSC026("AD_PSC026","Medicina Generale"), - AD_PSC027("AD_PSC027","Medicina Legale"), - AD_PSC028("AD_PSC028","Unita Spinale"), - AD_PSC029("AD_PSC029","Nefrologia"), - AD_PSC030("AD_PSC030","Neurochirurgia"), - AD_PSC031("AD_PSC031","Nido"), - AD_PSC032("AD_PSC032","Neurologia"), - AD_PSC033("AD_PSC033","Neuropsichiatria Infantile"), - AD_PSC034("AD_PSC034","Oculistica"), - AD_PSC035("AD_PSC035","Odontoiatria e Stomatologia"), - AD_PSC036("AD_PSC036","Ortopedia e Traumatologia"), - AD_PSC037("AD_PSC037","Ostetricia e Ginecologia"), - AD_PSC038("AD_PSC038","Otorinolaringoiatria"), - AD_PSC039("AD_PSC039","Pediatria"), - AD_PSC040("AD_PSC040","Psichiatria"), - AD_PSC042("AD_PSC042","Tossicologia"), - AD_PSC043("AD_PSC043","Urologia"), - AD_PSC046("AD_PSC046","Grandi Ustioni Pediatriche"), - AD_PSC047("AD_PSC047","Grandi Ustionati"), - AD_PSC048("AD_PSC048","Nefrologia (Abilitazione Trapianto Rene)"), - AD_PSC049("AD_PSC049","Terapia Intensiva"), - AD_PSC050("AD_PSC050","Unità Coronarica"), - AD_PSC051("AD_PSC051","Astanteria"), - AD_PSC052("AD_PSC052","Dermatologia"), - AD_PSC054("AD_PSC054","Emodialisi"), - AD_PSC055("AD_PSC055","Farmacologia Clinica"), - AD_PSC056("AD_PSC056","Recupero e Riabilitazione Funzionale"), - AD_PSC057("AD_PSC057","Fisiopatologia della Riabilitazione Umana"), - AD_PSC058("AD_PSC058","Gastroenterologia"), - AD_PSC060("AD_PSC060","Lungodegenti"), - AD_PSC061("AD_PSC061","Medicina Nucleare"), - AD_PSC062("AD_PSC062","Neonatologia"), - AD_PSC064("AD_PSC064","Oncologia"), - AD_PSC065("AD_PSC065","Oncoematologia Pediatrica"), - AD_PSC066("AD_PSC066","Oncoematologia"), - AD_PSC068("AD_PSC068","Pneumologia, Fisiopatologia Respiratoria, Tisiologia"), - AD_PSC069("AD_PSC069","Radiologia"), - AD_PSC070("AD_PSC070","Radioterapia"), - AD_PSC071("AD_PSC071","Reumatologia"), - AD_PSC073("AD_PSC073","Terapia Intensiva Neonatale"), - AD_PSC074("AD_PSC074","Radioterapia Oncologica"), - AD_PSC075("AD_PSC075","Neuro-Riabilitazione"), - AD_PSC076("AD_PSC076","Neurochirurgia Pediatrica"), - AD_PSC077("AD_PSC077","Nefrologia Pediatrica"), - AD_PSC078("AD_PSC078","Urologia Pediatrica"), - AD_PSC082("AD_PSC082","Anestesia e Rianimazione"), - AD_PSC097("AD_PSC097","Detenuti"), - AD_PSC098("AD_PSC098","Day Surgery Plurispecialistica"), - AD_PSC100("AD_PSC100","Laboratorio Analisi Chimico Cliniche"), - AD_PSC101("AD_PSC101","Microbiologia e Virologia"), - AD_PSC102("AD_PSC102","Centro Trasfusionale e Immunoematologico"), - AD_PSC103("AD_PSC103","Radiodiagnostica"), - AD_PSC104("AD_PSC104","Neuroradiologia"), - AD_PSC106("AD_PSC106","Pronto Soccorso e OBI"), - AD_PSC107("AD_PSC107","Poliambulatorio"), - AD_PSC109("AD_PSC109","Centrale Operativa 118"), - AD_PSC121("AD_PSC121","Comparti Operatori - Degenza Ordinaria"), - AD_PSC122("AD_PSC122","Comparti Operatori - Day Surgery"), - AD_PSC126("AD_PSC126","Libera Professione Degenza"), - AD_PSC127("AD_PSC127","Hospice Ospedaliero"), - AD_PSC129("AD_PSC129","Trapianto Organi e Tessuti"), - AD_PSC130("AD_PSC130","Medicina di Base"), - AD_PSC131("AD_PSC131","Assistenza Territoriale"), - AD_PSC199("AD_PSC199","Raccolta Consenso"), - AD_PSC999("AD_PSC999","Altro"); + AD_PSC001("AD_PSC001", "Allergologia"), + AD_PSC002("AD_PSC002", "Day Hospital"), + AD_PSC003("AD_PSC003", "Anatomia e Istologia Patologica"), + AD_PSC004("AD_PSC004", "Osservazione breve intensiva (OBI)"), + AD_PSC005("AD_PSC005", "Angiologia"), + AD_PSC006("AD_PSC006", "Cardiochirurgia Pediatrica"), + AD_PSC007("AD_PSC007", "Cardiochirurgia"), + AD_PSC008("AD_PSC008", "Cardiologia"), + AD_PSC009("AD_PSC009", "Chirurgia Generale"), + AD_PSC010("AD_PSC010", "Chirurgia Maxillo-Facciale"), + AD_PSC011("AD_PSC011", "Chirurgia Pediatrica"), + AD_PSC012("AD_PSC012", "Chirurgia Plastica"), + AD_PSC013("AD_PSC013", "Chirurgia Toracica"), + AD_PSC014("AD_PSC014", "Chirurgia Vascolare"), + AD_PSC015("AD_PSC015", "Medicina Sportiva"), + AD_PSC018("AD_PSC018", "Ematologia e Immunoematologia"), + AD_PSC019("AD_PSC019", "Malattie Endocrine, del Ricambio e della Nutrizione"), + AD_PSC020("AD_PSC020", "Immunologia"), + AD_PSC021("AD_PSC021", "Geriatria"), + AD_PSC024("AD_PSC024", "Malattie Infettive e Tropicali"), + AD_PSC025("AD_PSC025", "Medicina del Lavoro"), + AD_PSC026("AD_PSC026", "Medicina Generale"), + AD_PSC027("AD_PSC027", "Medicina Legale"), + AD_PSC028("AD_PSC028", "Unita Spinale"), + AD_PSC029("AD_PSC029", "Nefrologia"), + AD_PSC030("AD_PSC030", "Neurochirurgia"), + AD_PSC031("AD_PSC031", "Nido"), + AD_PSC032("AD_PSC032", "Neurologia"), + AD_PSC033("AD_PSC033", "Neuropsichiatria Infantile"), + AD_PSC034("AD_PSC034", "Oculistica"), + AD_PSC035("AD_PSC035", "Odontoiatria e Stomatologia"), + AD_PSC036("AD_PSC036", "Ortopedia e Traumatologia"), + AD_PSC037("AD_PSC037", "Ostetricia e Ginecologia"), + AD_PSC038("AD_PSC038", "Otorinolaringoiatria"), + AD_PSC039("AD_PSC039", "Pediatria"), + AD_PSC040("AD_PSC040", "Psichiatria"), + AD_PSC041("AD_PSC041", "Medicina termale"), + AD_PSC042("AD_PSC042", "Tossicologia"), + AD_PSC043("AD_PSC043", "Urologia"), + AD_PSC046("AD_PSC046", "Grandi Ustioni Pediatriche"), + AD_PSC047("AD_PSC047", "Grandi Ustionati"), + AD_PSC048("AD_PSC048", "Nefrologia (Abilitazione Trapianto Rene)"), + AD_PSC049("AD_PSC049", "Terapia Intensiva"), + AD_PSC050("AD_PSC050", "Unità Coronarica"), + AD_PSC051("AD_PSC051", "Astanteria"), + AD_PSC052("AD_PSC052", "Dermatologia"), + AD_PSC054("AD_PSC054", "Emodialisi"), + AD_PSC055("AD_PSC055", "Farmacologia Clinica"), + AD_PSC056("AD_PSC056", "Recupero e Riabilitazione Funzionale"), + AD_PSC057("AD_PSC057", "Fisiopatologia della Riabilitazione Umana"), + AD_PSC058("AD_PSC058", "Gastroenterologia"), + AD_PSC060("AD_PSC060", "Lungodegenti"), + AD_PSC061("AD_PSC061", "Medicina Nucleare"), + AD_PSC062("AD_PSC062", "Neonatologia"), + AD_PSC064("AD_PSC064", "Oncologia"), + AD_PSC065("AD_PSC065", "Oncoematologia Pediatrica"), + AD_PSC066("AD_PSC066", "Oncoematologia"), + AD_PSC067("AD_PSC067", "Pensionanti"), + AD_PSC068("AD_PSC068", "Pneumologia, Fisiopatologia Respiratoria, Tisiologia"), + AD_PSC069("AD_PSC069", "Radiologia"), + AD_PSC070("AD_PSC070", "Radioterapia"), + AD_PSC071("AD_PSC071", "Reumatologia"), + AD_PSC072("AD_PSC072", "Terapia Intensiva pediatrica"), + AD_PSC073("AD_PSC073", "Terapia Intensiva Neonatale"), + AD_PSC074("AD_PSC074", "Radioterapia Oncologica"), + AD_PSC075("AD_PSC075", "Neuro-Riabilitazione"), + AD_PSC076("AD_PSC076", "Neurochirurgia Pediatrica"), + AD_PSC077("AD_PSC077", "Nefrologia Pediatrica"), + AD_PSC078("AD_PSC078", "Urologia Pediatrica"), + AD_PSC094("AD_PSC094", "Terapia semi-intensiva"), + AD_PSC096("AD_PSC096", "Terapia del dolore"), + AD_PSC097("AD_PSC097", "Detenuti"), + AD_PSC098("AD_PSC098", "Day Surgery"), + AD_PSC099("AD_PSC099", "Cure palliative"), + AD_PSC100("AD_PSC100", "Laboratorio Analisi Chimico Cliniche"), + AD_PSC101("AD_PSC101", "Microbiologia e Virologia"), + AD_PSC102("AD_PSC102", "Centro Trasfusionale e Immunoematologico"), + AD_PSC103("AD_PSC103", "Radiodiagnostica"), + AD_PSC104("AD_PSC104", "Neuroradiologia"), + AD_PSC107("AD_PSC107", "Poliambulatorio"), + AD_PSC109("AD_PSC109", "Centrale Operativa 118"), + AD_PSC121("AD_PSC121", "Comparti Operatori - Degenza Ordinaria"), + AD_PSC122("AD_PSC122", "Comparti Operatori - Day Surgery"), + AD_PSC126("AD_PSC126", "Libera Professione Degenza"), + AD_PSC129("AD_PSC129", "Trapianto Organi e Tessuti"), + AD_PSC130("AD_PSC130", "Medicina di Base"), + AD_PSC131("AD_PSC131", "Assistenza Territoriale"), + AD_PSC199("AD_PSC199", "Raccolta Consenso"), + AD_PSC999("AD_PSC999", "Altro"); @Getter private final String code; diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/enums/RoleEnum.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/enums/RoleEnum.java index e93069c1..9d49ed14 100644 --- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/enums/RoleEnum.java +++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/enums/RoleEnum.java @@ -15,7 +15,7 @@ public enum RoleEnum { - AAS("AAS", "Personale di assistenza ad alta specializzazione"), + AAS("AAS","Personale di assistenza ad alta specializzazione"), APR("APR", "Medico Medicina Generale Pediatra di Libera Scelta"), PSS("PSS", "Professionista del sociale"), INF("INF", "Personale infermieristico"), @@ -25,17 +25,17 @@ public enum RoleEnum { OAM("OAM", "Operatore amministrativo"), ASS("ASS", "Assistito"), TUT("TUT", "Tutore"), - ING("ING", "Informal giver (Assistito)"), - GEN("GEN", "Genitore Assistito"), + ING("ING", "Informal giver"), + GEN("GEN", "Genitore"), NOR("NOR", "Nodo regionale"), DRS("DRS", "Dirigente sanitario"), RSA("RSA", "Medico RSA"), MRP("MRP", "Medico Rete di Patologia"), INI("INI", "Infrastruttura Nazionale per l’Interoperabilità"), - OGC("OGC", "Operatore per la gestione dei consensi"), - OPI("OPI", "Operatore di informativa"), + OGC("OGC", "Operatore per la gestione dei consensi."), + OPI("OPI", "Operatore di informativa."), MDS("MDS", "Ruolo del Ministero della Salute per la gestione del DGC"); - + @Getter private String code; @Getter diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/enums/SubjectOrganizationEnum.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/enums/SubjectOrganizationEnum.java index 477a5c44..8d7b9964 100644 --- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/enums/SubjectOrganizationEnum.java +++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/enums/SubjectOrganizationEnum.java @@ -28,7 +28,7 @@ public enum SubjectOrganizationEnum { REGIONE_UMBRIA("100", "Regione Umbria"), REGIONE_MARCHE("110", "Regione Marche"), REGIONE_LAZIO("120", "Regione Lazio"), - REGIONE_ABBRUZZO("130", "Regione Abruzzo"), + REGIONE_ABRUZZO("130", "Regione Abruzzo"), REGIONE_MOLISE("140", "Regione Molise"), REGIONE_CAMPANIA("150", "Regione Campania"), REGIONE_PUGLIA("160", "Regione Puglia"), @@ -41,6 +41,7 @@ public enum SubjectOrganizationEnum { SASN("001", "SASN"), MDS("999", "MDS"); + @Getter private final String code; @Getter diff --git a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/service/impl/DocumentReferenceSRV.java b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/service/impl/DocumentReferenceSRV.java index 45770513..3f01b820 100644 --- a/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/service/impl/DocumentReferenceSRV.java +++ b/src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/service/impl/DocumentReferenceSRV.java @@ -56,8 +56,7 @@ public class DocumentReferenceSRV implements IDocumentReferenceSRV { private FhirMappingClient client; @Override - public ResourceDTO createFhirResources(final String cda, - String authorRole,final PublicationCreationReqDTO requestBody, + public ResourceDTO createFhirResources(final String cda, String authorRole,final PublicationCreationReqDTO requestBody, final Integer size, final String hash, String transformId, String engineId) { final ResourceDTO output = new ResourceDTO(); try { @@ -226,9 +225,7 @@ private DocumentEntryDTO createDocumentEntry(final org.jsoup.nodes.Document docC if (authorElement != null) { de.setAuthor(authorElement.attr(EXTENSION_ATTRIBUTE)); } - de.setFirma("true^Documento firmato"); - de.setLanguageCode("it-IT"); de.setRepositoryUniqueId(requestBody.getIdentificativoRep()); if(requestBody.getDescriptions() != null) { diff --git a/src/test/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/EnumsTest.java b/src/test/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/EnumsTest.java index 94acba9b..7f67fee2 100644 --- a/src/test/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/EnumsTest.java +++ b/src/test/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/EnumsTest.java @@ -189,7 +189,7 @@ void testAccreditamentoPrefixEnum() { @DisplayName("DescriptionEnum test") void testDescriptionEnum() { String oid = "2.16.840.1.113883.2.9.6.1.5"; - assertEquals(oid, DescriptionEnum.DESC_OID1.getOid()); + assertEquals(oid, DescriptionEnum.PRESCRIZIONE_FARMACEUTICA_AIC.getOid()); } @Test