Commit dc2082e4 authored by Tony Schaller's avatar Tony Schaller

Javadoc update for CDA-CH V2 and CDA-CH-LREP

git-svn-id: https://svn.code.sf.net/p/ehealthconnector/code/trunk@1697 e99adb7c-5e35-42fd-8d1b-cdb378af05e8
parent a860a7b6
......@@ -138,9 +138,18 @@ namespace eHealthConnectorDemo
}
public static byte[] readInputFile(String assertionInputFile)
/**
* Read the given file into a byte array.
*
* @param inputFile
* the input file
* @return the byte[]
* @throws IOException
* Signals that an I/O exception has occurred.
*/
public static byte[] readInputFile(String inputFile)
{
File file = new File(assertionInputFile);
File file = new File(inputFile);
Path path = Paths.get(file.getParent(), file.getName());
return Files.readAllBytes(path);
}
......
......@@ -75,6 +75,7 @@ import org.slf4j.LoggerFactory;
/**
* This class contains the demo methods for CDA-CH-EDES.
*/
@SuppressWarnings("deprecation")
public class DemoEdes {
/** The cda extension */
......
......@@ -51,6 +51,7 @@ import org.slf4j.LoggerFactory;
/**
* This class contains the demo methods for CDA-CH-LRPH.
*/
@SuppressWarnings("deprecation")
public class DemoLrph {
/** The cda extension */
......
......@@ -55,6 +55,7 @@ import org.slf4j.LoggerFactory;
/**
* This class contains the demo methods for CDA-CH-LRQC.
*/
@SuppressWarnings("deprecation")
public class DemoLrqc {
/** The JPEG, which will be included in the CDA Document */
......
......@@ -58,6 +58,7 @@ import org.slf4j.LoggerFactory;
/**
* This class contains the demo methods for CDA-CH-LRTP.
*/
@SuppressWarnings("deprecation")
public class DemoLrtp {
/** The cda extension */
......
......@@ -86,6 +86,7 @@ import org.slf4j.LoggerFactory;
/**
* This class contains the demo methods for CDA-CH-MTPS.
*/
@SuppressWarnings("deprecation")
public class DemoMtps {
/**
......
......@@ -81,6 +81,7 @@ import org.slf4j.LoggerFactory;
/**
* This class contains the demo methods for CDA-CH-VACD.
*/
@SuppressWarnings("deprecation")
public class DemoVacd {
/** The cda extension */
......
......@@ -69,10 +69,10 @@ public class CommonResources {
private Person doctorPieksRatschlag = null;
private final FhirContext fhirCtx = new FhirContext(FhirVersionEnum.DSTU3);
private Organization organizationKantonalesSpital;
private Organization orgBAG;
private Organization orgCDSS = null;
private Organization orgBag;
private Organization orgCdss = null;
private Organization orgGruppenpraxisCH = null;
private Organization orgGSK = null;
private Organization orgGsk = null;
private Organization orgLaborPipette = null;
private Organization orgSanofi = null;
......@@ -278,7 +278,7 @@ public class CommonResources {
*
* @return sample data
*/
private Organization createOrganizationBAG() {
private Organization createOrganizationBag() {
Organization bag = new Organization();
bag.setName("Bundesamt für Gesundheit");
......@@ -304,7 +304,7 @@ public class CommonResources {
* company CDSS AG </div> <div class="de"></div>
* <div class="fr"></div>
*/
private Organization createOrganizationCDSS() {
private Organization createOrganizationCdss() {
final Organization fhirOrganization = new Organization();
fhirOrganization.addIdentifier()
.setSystem(FhirCommon.addUrnOid(CodeSystems.GLN.getCodeSystemId()))
......@@ -474,7 +474,7 @@ public class CommonResources {
* for doctors practice Gruppenpraxis CH </div>
* <div class="de"></div> <div class="fr"></div>
*/
private Organization createPracticeGruppenpraxisCH() {
private Organization createPracticeGruppenpraxisCh() {
final Organization fhirOrganization = new Organization();
fhirOrganization.addIdentifier()
.setSystem(FhirCommon.addUrnOid(CodeSystems.GLN.getCodeSystemId()))
......@@ -596,8 +596,8 @@ public class CommonResources {
* company CDSS AG </div> <div class="de"></div>
* <div class="fr"></div>
*/
public Organization getOrganizationBAG() {
return orgBAG;
public Organization getOrganizationBag() {
return orgBag;
}
/**
......@@ -608,8 +608,8 @@ public class CommonResources {
* company CDSS AG </div> <div class="de"></div>
* <div class="fr"></div>
*/
public Organization getOrganizationCDSS() {
return orgCDSS;
public Organization getOrganizationCdss() {
return orgCdss;
}
/**
......@@ -620,7 +620,7 @@ public class CommonResources {
* for doctors practice Gruppenpraxis CH </div>
* <div class="de"></div> <div class="fr"></div>
*/
public Organization getOrganizationGruppenpraxisCH() {
public Organization getOrganizationGruppenpraxisCh() {
return orgGruppenpraxisCH;
}
......@@ -632,8 +632,8 @@ public class CommonResources {
* company GlaxoSmithKline AG </div> <div class="de"></div>
* <div class="fr"></div>
*/
public Organization getOrganizationGSK() {
return orgGSK;
public Organization getOrganizationGsk() {
return orgGsk;
}
/**
......@@ -711,12 +711,12 @@ public class CommonResources {
final SaveMode saveMode = SaveMode.NONE;
orgGruppenpraxisCH = createPracticeGruppenpraxisCH();
orgGruppenpraxisCH = createPracticeGruppenpraxisCh();
FhirCommon.saveResource(log, rscDir, orgGruppenpraxisCH,
"FHIROrganization_GruppenpraxisCH.xml", saveMode);
orgCDSS = createOrganizationCDSS();
FhirCommon.saveResource(log, rscDir, orgCDSS, "FHIROrganization_CDSS.xml", saveMode);
orgCdss = createOrganizationCdss();
FhirCommon.saveResource(log, rscDir, orgCdss, "FHIROrganization_CDSS.xml", saveMode);
organizationKantonalesSpital = createOrganizationKantonalesSpital();
......@@ -726,7 +726,7 @@ public class CommonResources {
patientMusterMax = createPatientMusterMax();
patientMusterFranz = createPatientMusterFranz();
final Reference ref = new Reference();
ref.setResource(getOrganizationGruppenpraxisCH());
ref.setResource(getOrganizationGruppenpraxisCh());
patientSesunaTigrinja.setManagingOrganization(ref);
FhirCommon.saveResource(log, rscDir, patientSesunaTigrinja,
"FHIRPatient_SesunaTigrinja.xml", saveMode);
......@@ -742,15 +742,15 @@ public class CommonResources {
FhirCommon.saveResource(log, rscDir, doctorAuftraggeber, "FHIRPerson_Auftraggeber.xml",
saveMode);
doctorPieksRatschlag = createDoctorPieksRatschlag(getOrganizationCDSS());
doctorPieksRatschlag = createDoctorPieksRatschlag(getOrganizationCdss());
FhirCommon.saveResource(log, rscDir, doctorPieksRatschlag, "FHIRPerson_PieksRatschlag.xml",
saveMode);
orgGSK = new Organization();
orgGSK.setName("GlaxoSmithKline AG");
orgGsk = new Organization();
orgGsk.setName("GlaxoSmithKline AG");
orgSanofi = new Organization();
orgSanofi.setName("Sanofi Pasteur MSD AG");
orgBAG = createOrganizationBAG();
orgBag = createOrganizationBag();
}
}
......@@ -74,6 +74,7 @@ import org.hl7.fhir.dstu3.model.TimeType;
*
* @see org.ehealth_connector.demo.cda.DemoEdes.doDemoWithFhirResource
*/
@SuppressWarnings("deprecation")
public class EdesResources {
private static final DateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
......@@ -81,7 +82,7 @@ public class EdesResources {
new File("").getAbsoluteFile().getAbsolutePath() + "/rsc/demoCdaChEdes")
.getAbsolutePath();
private static CommonResources commonFhir = new CommonResources(rscDir);
private static String loincOID = FhirCommon.oidUrn + "2.16.840.1.113883.6.1";
private static String loincOid = FhirCommon.oidUrn + "2.16.840.1.113883.6.1";
/**
* This is the main method to run for the creation of the FHIR resources
......@@ -235,7 +236,7 @@ public class EdesResources {
private Observation createBloodPressureObs(long systolic, long diastolic, Date dateTime) {
final CodeableConcept fhirObsCode = new CodeableConcept();
fhirObsCode.addCoding().setSystem(loincOID).setCode("8716-3").setDisplay("Vital signs");
fhirObsCode.addCoding().setSystem(loincOid).setCode("8716-3").setDisplay("Vital signs");
final Observation fhirObservation = FhirCommon.createObservation(fhirObsCode);
......@@ -246,7 +247,7 @@ public class EdesResources {
final ObservationComponentComponent fhirSystolicComponent = new ObservationComponentComponent();
CodeableConcept fhirCode = new CodeableConcept();
fhirCode.addCoding().setSystem(loincOID).setCode("8480-6")
fhirCode.addCoding().setSystem(loincOid).setCode("8480-6")
.setDisplay("Systolic blood pressure");
fhirSystolicComponent.setCode(fhirCode);
......@@ -260,7 +261,7 @@ public class EdesResources {
final ObservationComponentComponent fhirDiastolicComponent = new ObservationComponentComponent();
fhirCode = new CodeableConcept();
fhirCode.addCoding().setSystem(loincOID).setCode("8462-4")
fhirCode.addCoding().setSystem(loincOid).setCode("8462-4")
.setDisplay("Diastolic blood pressure");
fhirDiastolicComponent.setCode(fhirCode);
......@@ -284,7 +285,7 @@ public class EdesResources {
private Observation createComment(String comment) {
final CodeableConcept fhirCode = new CodeableConcept();
fhirCode.addCoding().setSystem(loincOID).setCode("48767-8")
fhirCode.addCoding().setSystem(loincOid).setCode("48767-8")
.setDisplay("Annotation comment [Interpretation] Narrative");
final Observation fhirObservation = FhirCommon.createObservation(fhirCode);
......@@ -370,7 +371,7 @@ public class EdesResources {
.addExtension(extAuthorCtnn);
// Custodian
FhirCommon.addDocManifestContent(docManifest, commonFhir.getOrganizationGruppenpraxisCH())
FhirCommon.addDocManifestContent(docManifest, commonFhir.getOrganizationGruppenpraxisCh())
.addExtension(FhirCommon.getExtensionCustodian());
// Legal Authenticator
......@@ -436,7 +437,7 @@ public class EdesResources {
.addExtension(extAuthorEdpn);
// Custodian
FhirCommon.addDocManifestContent(docManifest, commonFhir.getOrganizationGruppenpraxisCH())
FhirCommon.addDocManifestContent(docManifest, commonFhir.getOrganizationGruppenpraxisCh())
.addExtension(FhirCommon.getExtensionCustodian());
// Legal Authenticator
......@@ -490,7 +491,7 @@ public class EdesResources {
private Observation createHeightWeightObs(long height, long weight, Date dateTime) {
final CodeableConcept fhirObsCode = new CodeableConcept();
fhirObsCode.addCoding().setSystem(loincOID).setCode("8716-3").setDisplay("Vital signs");
fhirObsCode.addCoding().setSystem(loincOid).setCode("8716-3").setDisplay("Vital signs");
final Observation fhirObservation = FhirCommon.createObservation(fhirObsCode);
fhirObservation.setCode(fhirObsCode);
......@@ -500,7 +501,7 @@ public class EdesResources {
final ObservationComponentComponent fhirHeightComponent = new ObservationComponentComponent();
CodeableConcept fhirCode = new CodeableConcept();
fhirCode.addCoding().setSystem(loincOID).setCode("8302-2").setDisplay("Body height");
fhirCode.addCoding().setSystem(loincOid).setCode("8302-2").setDisplay("Body height");
fhirHeightComponent.setCode(fhirCode);
Quantity fhirValue = new Quantity();
......@@ -513,7 +514,7 @@ public class EdesResources {
final ObservationComponentComponent fhirWeightComponent = new ObservationComponentComponent();
fhirCode = new CodeableConcept();
fhirCode.addCoding().setSystem(loincOID).setCode("3141-9")
fhirCode.addCoding().setSystem(loincOid).setCode("3141-9")
.setDisplay("Body weight Measured");
fhirWeightComponent.setCode(fhirCode);
......@@ -660,7 +661,8 @@ public class EdesResources {
System.out.println("Output Directory:" + rscDir);
final CodeableConcept docNormalConfCode = new CodeableConcept();
docNormalConfCode.addCoding().setSystem(AbstractCdaChV12FhirConverter.OID_CONFIDENTIALITY_CODE)
docNormalConfCode.addCoding()
.setSystem(AbstractCdaChV12FhirConverter.OID_CONFIDENTIALITY_CODE)
.setCode("normal");
docNormalConfidentiality = new Basic();
docNormalConfidentiality.setCode(docNormalConfCode);
......
......@@ -79,6 +79,7 @@ import org.hl7.fhir.instance.model.api.IBaseResource;
*
* @see org.ehealth_connector.demo.cda.DemoEdes.doDemoEDESFHIRResource
*/
@SuppressWarnings("deprecation")
public class LrqcResources {
private static final String rscDir = new File(
new File("").getAbsoluteFile().getAbsolutePath() + "/rsc/demoCdaChLrxx")
......@@ -256,7 +257,7 @@ public class LrqcResources {
* @return sample data
*/
private Organization createGruppenpraxisChRingversuch() {
final Organization org = commonFhir.getOrganizationGruppenpraxisCH();
final Organization org = commonFhir.getOrganizationGruppenpraxisCh();
final Identifier id1 = FhirCommon.createIdentifier(CodeSystems.GLN.getCodeSystemId(),
"7606666666666");
final Identifier id2 = FhirCommon.createIdentifier("2.999", "RingversuchsNr");
......@@ -493,7 +494,7 @@ public class LrqcResources {
.addExtension(FhirCommon.getExtensionClaimer());
// Recipient
FhirCommon.addDocManifestContent(docManifest, createOrganizationCSCQ())
FhirCommon.addDocManifestContent(docManifest, createOrganizationCscq())
.addExtension(FhirCommon.getExtensionInformationRecipient());
// In Fulfilment of
......@@ -597,7 +598,7 @@ public class LrqcResources {
.addExtension(FhirCommon.getExtensionClaimer());
// Recipient
FhirCommon.addDocManifestContent(docManifest, createOrganizationCSCQ())
FhirCommon.addDocManifestContent(docManifest, createOrganizationCscq())
.addExtension(extInformationRecipient);
// In Fulfilment of
......@@ -662,7 +663,7 @@ public class LrqcResources {
*
* @return sample data
*/
private Organization createOrganizationCSCQ() {
private Organization createOrganizationCscq() {
final Organization fhirOrganization = new Organization();
fhirOrganization.addIdentifier(
FhirCommon.createIdentifier(CodeSystems.GLN.getCodeSystemId(), "7601001326507"));
......
......@@ -80,6 +80,7 @@ import org.hl7.fhir.instance.model.api.IBaseResource;
*
* @see org.ehealth_connector.demo.cda.DemoEdes.doDemoEDESFHIRResource
*/
@SuppressWarnings("deprecation")
public class LrtpResources {
private static final String rscDir = new File(
new File("").getAbsoluteFile().getAbsolutePath() + "/rsc/demoCdaChLrxx")
......@@ -370,12 +371,9 @@ public class LrtpResources {
ObservationInterpretation.NORMAL, "o5", null),
extVitalSignsObservation));
FhirCommon
.addDocManifestContent(docManifest,
commonFhir.createSection(
FhirCommon.createCoding("2.16.840.1.113883.6.1", "8716-3",
"VITAL SIGNS"),
"<table><tbody><tr><th>Beobachtung</th><th>Resultat</th><th>Interpretation</th><th>Code</th><th>Codesystem</th><th>Autor</th><th>Kommentar</th></tr><tr><td>Body height</td><td><content ID='o1'>182 cm</content></td><td>N</td><td>8302-2</td><td>LOINC</td><td>7608888888888</td><td></td></tr><tr><td>Body weight Measured</td><td><content ID='o2'>82 kg</content></td><td>N</td><td>3141-9</td><td>LOINC</td><td>7608888888888</td><td></td></tr><tr><td>Heart rate</td><td><content ID='o3'>70 /min</content></td><td>N</td><td>8867-4</td><td>LOINC</td><td>7608888888888</td><td></td></tr><tr><td>Systolic blood pressure</td><td><content ID='o4'>108 mmHg</content></td><td>N</td><td>8480-6</td><td>LOINC</td><td>7608888888888</td><td></td></tr><tr><td>Diastolic blood pressure</td><td><content ID='o5'>65 mmHg</content></td><td>N</td><td>8462-4</td><td>LOINC</td><td>7608888888888</td><td></td></tr></tbody></table>"))
FhirCommon.addDocManifestContent(docManifest, commonFhir.createSection(
FhirCommon.createCoding("2.16.840.1.113883.6.1", "8716-3", "VITAL SIGNS"),
"<table><tbody><tr><th>Beobachtung</th><th>Resultat</th><th>Interpretation</th><th>Code</th><th>Codesystem</th><th>Autor</th><th>Kommentar</th></tr><tr><td>Body height</td><td><content ID='o1'>182 cm</content></td><td>N</td><td>8302-2</td><td>LOINC</td><td>7608888888888</td><td></td></tr><tr><td>Body weight Measured</td><td><content ID='o2'>82 kg</content></td><td>N</td><td>3141-9</td><td>LOINC</td><td>7608888888888</td><td></td></tr><tr><td>Heart rate</td><td><content ID='o3'>70 /min</content></td><td>N</td><td>8867-4</td><td>LOINC</td><td>7608888888888</td><td></td></tr><tr><td>Systolic blood pressure</td><td><content ID='o4'>108 mmHg</content></td><td>N</td><td>8480-6</td><td>LOINC</td><td>7608888888888</td><td></td></tr><tr><td>Diastolic blood pressure</td><td><content ID='o5'>65 mmHg</content></td><td>N</td><td>8462-4</td><td>LOINC</td><td>7608888888888</td><td></td></tr></tbody></table>"))
.addExtension(extCodedVitalSignsSection);
FhirCommon.addDocManifestContent(docManifest, vitalSignsOrganizer)
......@@ -558,12 +556,9 @@ public class LrtpResources {
"3B9A88CF-E868-490B-B0BF-DA25E7D2F9FA")),
extVitalSignsObservation));
FhirCommon
.addDocManifestContent(docManifest,
commonFhir.createSection(
FhirCommon.createCoding("2.16.840.1.113883.6.1", "8716-3",
"VITAL SIGNS"),
"<table><tbody><tr><th>Beobachtung</th><th>Resultat</th><th>Interpretation</th><th>Code</th><th>Codesystem</th><th>Autor</th><th>Kommentar</th></tr><tr><td>Body height</td><td><content ID='o1'>178 cm</content></td><td>N</td><td>8302-2</td><td>LOINC</td><td>7608888888888</td><td></td></tr><tr><td>Body weight Measured</td><td><content ID='o2'>78 kg</content></td><td>N</td><td>3141-9</td><td>LOINC</td><td>7608888888888</td><td></td></tr></tbody></table>"))
FhirCommon.addDocManifestContent(docManifest, commonFhir.createSection(
FhirCommon.createCoding("2.16.840.1.113883.6.1", "8716-3", "VITAL SIGNS"),
"<table><tbody><tr><th>Beobachtung</th><th>Resultat</th><th>Interpretation</th><th>Code</th><th>Codesystem</th><th>Autor</th><th>Kommentar</th></tr><tr><td>Body height</td><td><content ID='o1'>178 cm</content></td><td>N</td><td>8302-2</td><td>LOINC</td><td>7608888888888</td><td></td></tr><tr><td>Body weight Measured</td><td><content ID='o2'>78 kg</content></td><td>N</td><td>3141-9</td><td>LOINC</td><td>7608888888888</td><td></td></tr></tbody></table>"))
.addExtension(extCodedVitalSignsSection);
FhirCommon.addDocManifestContent(docManifest, vitalSignsOrganizer)
......@@ -659,12 +654,10 @@ public class LrtpResources {
.setValue(new StringType("INT:1479")),
extLaboratoryObservation));
lo2.addRelated(
createRelated(
createLaboratoryObservation("Anti-A32-MFI", null, "true", "l33")
.addReferenceRange(createReferenceRange(100000, 500,
ObservationInterpretation.NORMAL))
.setValue(new StringType("INT:NA")),
extLaboratoryObservation));
createRelated(createLaboratoryObservation("Anti-A32-MFI", null, "true", "l33")
.addReferenceRange(
createReferenceRange(100000, 500, ObservationInterpretation.NORMAL))
.setValue(new StringType("INT:NA")), extLaboratoryObservation));
FhirCommon.addDocManifestContent(docManifest, ls2)
.addExtension(extLaboratorySpecialtySection);
......
......@@ -95,6 +95,7 @@ import org.hl7.fhir.instance.model.api.IBaseResource;
*
* @see org.ehealth_connector.demo.cda.DemoVacd
*/
@SuppressWarnings("deprecation")
public class VacdResources {
private static CommonResources commonFhir;
......@@ -970,22 +971,22 @@ public class VacdResources {
ListResource list = null;
switch (destination) {
case 1:
list = createObsMMRImmunizationAdministration();
list = createObsMmrImmunizationAdministration();
break;
case 2:
list = createObsMMRImmunizationCertificate();
list = createObsMmrImmunizationCertificate();
break;
case 3:
list = createObsMMRImmunizationMaxContent();
list = createObsMmrImmunizationMaxContent();
break;
case 4:
list = createObsMMRImmunizationNoRecommendationResponse();
list = createObsMmrImmunizationNoRecommendationResponse();
break;
case 5:
list = createObsMMRImmunizationRecommendationRequest();
list = createObsMmrImmunizationRecommendationRequest();
break;
case 6:
list = createObsMMRImmunizationRecommendationResponse();
list = createObsMmrImmunizationRecommendationResponse();
break;
}
refMedicationTargets.setResource(list);
......@@ -1366,7 +1367,7 @@ public class VacdResources {
*
* @return sample data
*/
private ListResource createObsMMRImmunizationAdministration() {
private ListResource createObsMmrImmunizationAdministration() {
final ListResource retVal = new ListResource();
retVal.setStatus(ListStatus.CURRENT);
retVal.setMode(ListMode.SNAPSHOT);
......@@ -1388,7 +1389,7 @@ public class VacdResources {
*
* @return sample data
*/
private ListResource createObsMMRImmunizationCertificate() {
private ListResource createObsMmrImmunizationCertificate() {
final ListResource retVal = new ListResource();
retVal.setStatus(ListStatus.CURRENT);
retVal.setMode(ListMode.SNAPSHOT);
......@@ -1410,7 +1411,7 @@ public class VacdResources {
*
* @return sample data
*/
private ListResource createObsMMRImmunizationMaxContent() {
private ListResource createObsMmrImmunizationMaxContent() {
final ListResource retVal = new ListResource();
retVal.setStatus(ListStatus.CURRENT);
retVal.setMode(ListMode.SNAPSHOT);
......@@ -1432,7 +1433,7 @@ public class VacdResources {
*
* @return sample data
*/
private ListResource createObsMMRImmunizationNoRecommendationResponse() {
private ListResource createObsMmrImmunizationNoRecommendationResponse() {
final ListResource retVal = new ListResource();
retVal.setStatus(ListStatus.CURRENT);
retVal.setMode(ListMode.SNAPSHOT);
......@@ -1454,7 +1455,7 @@ public class VacdResources {
*
* @return sample data
*/
private ListResource createObsMMRImmunizationRecommendationRequest() {
private ListResource createObsMmrImmunizationRecommendationRequest() {
final ListResource retVal = new ListResource();
retVal.setStatus(ListStatus.CURRENT);
retVal.setMode(ListMode.SNAPSHOT);
......@@ -1476,7 +1477,7 @@ public class VacdResources {
*
* @return sample data
*/
private ListResource createObsMMRImmunizationRecommendationResponse() {
private ListResource createObsMmrImmunizationRecommendationResponse() {
final ListResource retVal = new ListResource();
retVal.setStatus(ListStatus.CURRENT);
retVal.setMode(ListMode.SNAPSHOT);
......@@ -1722,7 +1723,7 @@ public class VacdResources {
.addExtension(extAuthor);
// Custodian
FhirCommon.addDocManifestContent(docManifest, commonFhir.getOrganizationGruppenpraxisCH())
FhirCommon.addDocManifestContent(docManifest, commonFhir.getOrganizationGruppenpraxisCh())
.addExtension(FhirCommon.getExtensionCustodian());
// Legal Authenticator
......@@ -1733,7 +1734,7 @@ public class VacdResources {
// Body
// -------------------
FhirCommon.addDocManifestContent(docManifest,
createMedicationStatementBOOSTRIXPolio(commonFhir.getOrganizationGSK(),
createMedicationStatementBOOSTRIXPolio(commonFhir.getOrganizationGsk(),
commonFhir.getPatientSesunaTigrinja(), commonFhir.getDoctorAllzeitBereit(),
commonFhir.getDoctorAllzeitBereit(), mediComment, 1))
.addExtension(extImmunization);
......@@ -1745,7 +1746,7 @@ public class VacdResources {
.addExtension(extImmunization);
FhirCommon.addDocManifestContent(docManifest,
createMedicationStatementENGERIX(commonFhir.getOrganizationGSK(),
createMedicationStatementENGERIX(commonFhir.getOrganizationGsk(),
commonFhir.getPatientSesunaTigrinja(), commonFhir.getDoctorAllzeitBereit(),
commonFhir.getDoctorAllzeitBereit(), mediComment, 1))
.addExtension(extImmunization);
......@@ -1795,7 +1796,7 @@ public class VacdResources {
.addExtension(extAuthor);
// Custodian
FhirCommon.addDocManifestContent(docManifest, commonFhir.getOrganizationGruppenpraxisCH())
FhirCommon.addDocManifestContent(docManifest, commonFhir.getOrganizationGruppenpraxisCh())
.addExtension(FhirCommon.getExtensionCustodian());
// Legal Authenticator
......@@ -1806,7 +1807,7 @@ public class VacdResources {
// Body
// -------------------
FhirCommon.addDocManifestContent(docManifest,
createMedicationStatementBOOSTRIXPolio(commonFhir.getOrganizationGSK(),
createMedicationStatementBOOSTRIXPolio(commonFhir.getOrganizationGsk(),
commonFhir.getPatientSesunaTigrinja(), commonFhir.getDoctorAllzeitBereit(),
commonFhir.getDoctorAllzeitBereit(), mediComment, 2))
.addExtension(extImmunization);
......@@ -1818,7 +1819,7 @@ public class VacdResources {
.addExtension(extImmunization);
FhirCommon.addDocManifestContent(docManifest,
createMedicationStatementENGERIX(commonFhir.getOrganizationGSK(),
createMedicationStatementENGERIX(commonFhir.getOrganizationGsk(),
commonFhir.getPatientSesunaTigrinja(), commonFhir.getDoctorAllzeitBereit(),
commonFhir.getDoctorAllzeitBereit(), mediComment, 2))
.addExtension(extImmunization);
......@@ -1867,7 +1868,7 @@ public class VacdResources {
.addExtension(extAuthor);
// Custodian
FhirCommon.addDocManifestContent(docManifest, commonFhir.getOrganizationGruppenpraxisCH())
FhirCommon.addDocManifestContent(docManifest, commonFhir.getOrganizationGruppenpraxisCh())
.addExtension(FhirCommon.getExtensionCustodian());
// Legal Authenticator
......@@ -1878,13 +1879,13 @@ public class VacdResources {
// Body
// -------------------
FhirCommon.addDocManifestContent(docManifest,
createMedicationStatementBOOSTRIXPolio(commonFhir.getOrganizationGSK(),
createMedicationStatementBOOSTRIXPolio(commonFhir.getOrganizationGsk(),
commonFhir.getPatientSesunaTigrinja(), commonFhir.getDoctorAllzeitBereit(),
commonFhir.getDoctorAllzeitBereit(), mediComment, 3))
.addExtension(extImmunization);
FhirCommon.addDocManifestContent(docManifest,
createMedicationStatementBOOSTRIXPolioNotTake(commonFhir.getOrganizationGSK(),
createMedicationStatementBOOSTRIXPolioNotTake(commonFhir.getOrganizationGsk(),
commonFhir.getPatientSesunaTigrinja(), commonFhir.getDoctorAllzeitBereit(),
commonFhir.getDoctorAllzeitBereit(), mediComment, 3))
.addExtension(extImmunizationRecommendation);
......@@ -1916,7 +1917,7 @@ public class VacdResources {
.addExtension(extPregnancyObservation);
FhirCommon.addDocManifestContent(docManifest,
createMedicationStatementENGERIXForRecommendation(commonFhir.getOrganizationGSK(),
createMedicationStatementENGERIXForRecommendation(commonFhir.getOrganizationGsk(),
commonFhir.getPatientSesunaTigrinja(), commonFhir.getDoctorPieksRatschlag(),
null, extExternalDocument, 3))
.addExtension(extImmunizationRecommendation);
......@@ -1968,7 +1969,7 @@ public class VacdResources {
.addExtension(extAuthor);
// Custodian
FhirCommon.addDocManifestContent(docManifest, commonFhir.getOrganizationCDSS())
FhirCommon.addDocManifestContent(docManifest, commonFhir.getOrganizationCdss())
.addExtension(FhirCommon.getExtensionCustodian());
// Legal Authenticator
......@@ -2023,7 +2024,7 @@ public class VacdResources {
.addExtension(extAuthor);
// Custodian
FhirCommon.addDocManifestContent(docManifest, commonFhir.getOrganizationGruppenpraxisCH())
FhirCommon.addDocManifestContent(docManifest, commonFhir.getOrganizationGruppenpraxisCh())
.addExtension(FhirCommon.getExtensionCustodian());
// Legal Authenticator
......@@ -2075,7 +2076,7 @@ public class VacdResources {
.addExtension(extAuthor);
// Custodian
FhirCommon.addDocManifestContent(docManifest, commonFhir.getOrganizationCDSS())
FhirCommon.addDocManifestContent(docManifest, commonFhir.getOrganizationCdss())
.addExtension(FhirCommon.getExtensionCustodian());
// Legal Authenticator
......@@ -2089,7 +2090,7 @@ public class VacdResources {
.addExtension(extImmunization);
FhirCommon.addDocManifestContent(docManifest,
createMedicationStatementENGERIXForRecommendation(commonFhir.getOrganizationGSK(),
createMedicationStatementENGERIXForRecommendation(commonFhir.getOrganizationGsk(),
commonFhir.getPatientSesunaTigrinja(), commonFhir.getDoctorPieksRatschlag(),
null, extExternalDocument, 6))
.addExtension(extImmunizationRecommendation);
......
......@@ -341,7 +341,7 @@ public class XdResources {
// IntendedRecipient
final ArrayList<Reference> recipients = new ArrayList<Reference>();
final Reference refRecipient = new Reference();
refRecipient.setResource(commonFhir.getOrganizationCDSS());
refRecipient.setResource(commonFhir.getOrganizationCdss());
recipients.add(refRecipient);
ss.setRecipient(recipients);
......@@ -714,7 +714,7 @@ public class XdResources {
// IntendedRecipient
final ArrayList<Reference> recipients = new ArrayList<Reference>();
final Reference refRecipient = new Reference();
refRecipient.setResource(commonFhir.getOrganizationCDSS());
refRecipient.setResource(commonFhir.getOrganizationCdss());
recipients.add(refRecipient);
ss.setRecipient(recipients);
......@@ -903,7 +903,7 @@ public class XdResources {
// IntendedRecipient
final ArrayList<Reference> recipients = new ArrayList<Reference>();
final Reference refRecipient = new Reference();
refRecipient.setResource(commonFhir.getOrganizationCDSS());
refRecipient.setResource(commonFhir.getOrganizationCdss());
recipients.add(refRecipient);
ss.setRecipient(recipients);