Merge pull request #836 from hapifhir/gg-202206-r4b

R4b update
This commit is contained in:
Grahame Grieve 2022-06-14 13:26:51 +10:00 committed by GitHub
commit 2783a5e3aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
196 changed files with 247 additions and 200 deletions

View File

@ -1,7 +1,11 @@
package org.hl7.fhir.convertors.misc;
import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.r4.formats.IParser.OutputStyle;
import org.hl7.fhir.r4.formats.JsonParser;
import org.hl7.fhir.r4.model.OperationOutcome;
import org.hl7.fhir.r4.model.OperationOutcome.IssueSeverity;
import org.hl7.fhir.r4.model.OperationOutcome.IssueType;
import org.hl7.fhir.r4.model.ValueSet;
import org.hl7.fhir.r4.utils.client.FHIRToolingClient;
import org.hl7.fhir.utilities.CSVReader;
@ -12,6 +16,8 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.net.URISyntaxException;
import java.text.ParseException;
import java.util.HashMap;
import java.util.Map;
public class VSACImporter extends OIDBasedValueSetImporter {
@ -28,25 +34,42 @@ public class VSACImporter extends OIDBasedValueSetImporter {
private void process(String source, String dest, String apiKey) throws FHIRException, IOException, URISyntaxException {
CSVReader csv = new CSVReader(new FileInputStream(source));
csv.readHeaders();
Map<String, String> errs = new HashMap<>();
FHIRToolingClient fhirToolingClient = new FHIRToolingClient("https://cts.nlm.nih.gov/fhir", "fhir/vsac");
fhirToolingClient.setUsername("apikey");
fhirToolingClient.setPassword(apiKey);
fhirToolingClient.setTimeout(30000);
int i = 0;
int j = 0;
while (csv.line()) {
String oid = csv.cell("OID");
try {
ValueSet vs = fhirToolingClient.read(ValueSet.class, oid);
new JsonParser().compose(new FileOutputStream(Utilities.path(dest, "ValueSet-" + oid + ".json")), vs);
try {
ValueSet vse = fhirToolingClient.expandValueset(vs.getUrl(), null);
vs.setExpansion(vse.getExpansion());
j++;
} catch (Exception e) {
errs.put(oid, "Expansion: " +e.getMessage());
System.out.println(e.getMessage());
}
new JsonParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path(dest, "ValueSet-" + oid + ".json")), vs);
i++;
if (i % 100 == 0) {
System.out.println(i);
System.out.println(":"+i+" ("+j+")");
}
} catch (Exception e) {
System.out.println("Unable to fetch OID " + oid + ": " + e.getMessage());
errs.put(oid, e.getMessage());
}
}
OperationOutcome oo = new OperationOutcome();
for (String oid : errs.keySet()) {
oo.addIssue().setSeverity(IssueSeverity.ERROR).setCode(IssueType.EXCEPTION).setDiagnostics(errs.get(oid)).addLocation(oid);
}
new JsonParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.path(dest, "other", "OperationOutcome-vsac-errors.json")), oo);
System.out.println("Done. " + i + " ValueSets");
}
}

View File

@ -81,7 +81,7 @@ public class JavaCoreGenerator {
System.out.println("Process Expansions");
updateExpansions(master, expansions);
System.out.println("Generate Model");
System.out.println("Generate Model in "+dest);
System.out.println(" .. Constants");
JavaConstantsGenerator cgen = new JavaConstantsGenerator(new FileOutputStream(Utilities.path(dest, "src", "main", "java", "org", "hl7", "fhir", jid, "model", "Constants.java")), master, config, date, npm.version(), jid);
cgen.generate();

View File

@ -1,6 +1,7 @@
package org.hl7.fhir.r4.utils.client;
import okhttp3.Headers;
import okhttp3.Request;
import okhttp3.internal.http2.Header;
import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.r4.model.*;
@ -363,6 +364,27 @@ public class FHIRToolingClient {
return feed;
}
public ValueSet expandValueset(String vsUrl, Parameters expParams) {
Map<String,String> parameters = new HashMap<>();
parameters.put("url", vsUrl);
org.hl7.fhir.r4.utils.client.network.ResourceRequest<Resource> result = null;
try {
result = client.issueGetResourceRequest(resourceAddress.resolveOperationUri(ValueSet.class, "expand", parameters),
getPreferredResourceFormat(),
generateHeaders(),
"ValueSet/$expand?url=" + vsUrl,
TIMEOUT_OPERATION_EXPAND);
if (result.isUnsuccessfulRequest()) {
throw new EFhirClientException("Server returned error code " + result.getHttpStatus(), (OperationOutcome) result.getPayload());
}
} catch (IOException e) {
e.printStackTrace();
}
return result == null ? null : (ValueSet) result.getPayload();
}
public ValueSet expandValueset(ValueSet source, Parameters expParams) {
Parameters p = expParams == null ? new Parameters() : expParams.copy();
p.addParameter().setName("valueSet").setResource(source);
@ -383,7 +405,6 @@ public class FHIRToolingClient {
return result == null ? null : (ValueSet) result.getPayload();
}
public Parameters lookupCode(Map<String, String> params) {
org.hl7.fhir.r4.utils.client.network.ResourceRequest<Resource> result = null;
try {

View File

@ -30,7 +30,7 @@ package org.hl7.fhir.r4b.formats;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0

View File

@ -31,7 +31,7 @@ package org.hl7.fhir.r4b.formats;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0

View File

@ -30,7 +30,7 @@ package org.hl7.fhir.r4b.formats;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -30,7 +30,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-snapshot1
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0-snapshot1
@ -41,6 +41,6 @@ public class Constants {
public final static String VERSION = "4.3.0-snapshot1";
public final static String VERSION_MM = "4.3";
public final static String DATE = "Fri, Apr 22, 2022 11:20+1000";
public final static String DATE = "Mon, Jun 13, 2022 17:19+0300";
public final static String URI_REGEX = "((http|https)://([A-Za-z0-9\\\\\\.\\:\\%\\$]*\\/)*)?(Account|ActivityDefinition|AdministrableProductDefinition|AdverseEvent|AllergyIntolerance|Appointment|AppointmentResponse|AuditEvent|Basic|Binary|BiologicallyDerivedProduct|BodyStructure|Bundle|CapabilityStatement|CarePlan|CareTeam|CatalogEntry|ChargeItem|ChargeItemDefinition|Citation|Claim|ClaimResponse|ClinicalImpression|ClinicalUseDefinition|CodeSystem|Communication|CommunicationRequest|CompartmentDefinition|Composition|ConceptMap|Condition|Consent|Contract|Coverage|CoverageEligibilityRequest|CoverageEligibilityResponse|DetectedIssue|Device|DeviceDefinition|DeviceMetric|DeviceRequest|DeviceUseStatement|DiagnosticReport|DocumentManifest|DocumentReference|Encounter|Endpoint|EnrollmentRequest|EnrollmentResponse|EpisodeOfCare|EventDefinition|Evidence|EvidenceReport|EvidenceVariable|ExampleScenario|ExplanationOfBenefit|FamilyMemberHistory|Flag|Goal|GraphDefinition|Group|GuidanceResponse|HealthcareService|ImagingStudy|Immunization|ImmunizationEvaluation|ImmunizationRecommendation|ImplementationGuide|Ingredient|InsurancePlan|Invoice|Library|Linkage|List|Location|ManufacturedItemDefinition|Measure|MeasureReport|Media|Medication|MedicationAdministration|MedicationDispense|MedicationKnowledge|MedicationRequest|MedicationStatement|MedicinalProductDefinition|MessageDefinition|MessageHeader|MolecularSequence|NamingSystem|NutritionOrder|NutritionProduct|Observation|ObservationDefinition|OperationDefinition|OperationOutcome|Organization|OrganizationAffiliation|PackagedProductDefinition|Parameters|Patient|PaymentNotice|PaymentReconciliation|Person|PlanDefinition|Practitioner|PractitionerRole|Procedure|Provenance|Questionnaire|QuestionnaireResponse|RegulatedAuthorization|RelatedPerson|RequestGroup|ResearchDefinition|ResearchElementDefinition|ResearchStudy|ResearchSubject|RiskAssessment|Schedule|SearchParameter|ServiceRequest|Slot|Specimen|SpecimenDefinition|StructureDefinition|StructureMap|Subscription|SubscriptionStatus|SubscriptionTopic|Substance|SubstanceDefinition|SupplyDelivery|SupplyRequest|Task|TerminologyCapabilities|TestReport|TestScript|ValueSet|VerificationResult|VisionPrescription)\\/[A-Za-z0-9\\-\\.]{1,64}(\\/_history\\/[A-Za-z0-9\\-\\.]{1,64})?";
}

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import org.hl7.fhir.instance.model.api.*;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

View File

@ -29,7 +29,7 @@ package org.hl7.fhir.r4b.model;
POSSIBILITY OF SUCH DAMAGE.
*/
// Generated on Fri, Apr 22, 2022 11:20+1000 for FHIR v4.3.0-cibuild
// Generated on Mon, Jun 13, 2022 17:19+0300 for FHIR v4.3.0
import java.util.ArrayList;
import java.util.Date;

Some files were not shown because too many files have changed in this diff Show More