diff --git a/pom.xml b/pom.xml index 210eda7..46eaa03 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ edu.gatech VRDR - v0.1.0-STUBallot1-REVISED.1 + v0.1.1-STUBallot1-REVISED.1 jar VRDR diff --git a/src/main/java/edu/gatech/VRDR/model/FuneralHome.java b/src/main/java/edu/gatech/VRDR/model/FuneralHome.java index a35b3fa..830c36c 100644 --- a/src/main/java/edu/gatech/VRDR/model/FuneralHome.java +++ b/src/main/java/edu/gatech/VRDR/model/FuneralHome.java @@ -19,4 +19,4 @@ public FuneralHome(String name, Address address) { setName(name); addAddress(address); } -} +} \ No newline at end of file diff --git a/src/main/java/edu/gatech/VRDR/model/util/DecedentTransportationRoleUtil.java b/src/main/java/edu/gatech/VRDR/model/util/DecedentTransportationRoleUtil.java index 9ac93ed..6adceb6 100644 --- a/src/main/java/edu/gatech/VRDR/model/util/DecedentTransportationRoleUtil.java +++ b/src/main/java/edu/gatech/VRDR/model/util/DecedentTransportationRoleUtil.java @@ -8,6 +8,6 @@ public class DecedentTransportationRoleUtil { public static final Observation.ObservationStatus status = ObservationStatus.FINAL; public static final CodeableConcept code = new CodeableConcept() - .addCoding(new Coding().setSystem("http://loinc.org").setCode("69442-2") - .setDisplay("Timing of recent pregnancy in relation to death")); + .addCoding(new Coding().setSystem("http://loinc.org").setCode("69451-3") + .setDisplay("Transportation role of decedent")); } \ No newline at end of file diff --git a/src/main/java/edu/gatech/VRDR/model/util/DecedentUtil.java b/src/main/java/edu/gatech/VRDR/model/util/DecedentUtil.java index b572180..ebf9cef 100644 --- a/src/main/java/edu/gatech/VRDR/model/util/DecedentUtil.java +++ b/src/main/java/edu/gatech/VRDR/model/util/DecedentUtil.java @@ -13,6 +13,6 @@ public class DecedentUtil { public static final String birthPlaceExtensionURL = "http://hl7.org/fhir/StructureDefinition/birthPlace"; public static final String addressWithinCityLimitsIndicatorExtensionURL = "http://hl7.org/fhir/us/vrdr/StructureDefinition/Within-City-Limits-Indicator"; public static final CodeableConcept identifierTypeFixedValue = new CodeableConcept() - .addCoding(new Coding().setCode("BR").setDisplay("Social Beneficiary Identifier")); + .addCoding(new Coding().setCode("SB").setDisplay("Social Beneficiary Identifier")); public static final String identifierSystem = "urn:oid:2.16.840.1.113883.4.1"; } \ No newline at end of file diff --git a/src/main/java/edu/gatech/VRDR/model/util/ExaminerContactedUtil.java b/src/main/java/edu/gatech/VRDR/model/util/ExaminerContactedUtil.java index 7acce78..d3b13c7 100644 --- a/src/main/java/edu/gatech/VRDR/model/util/ExaminerContactedUtil.java +++ b/src/main/java/edu/gatech/VRDR/model/util/ExaminerContactedUtil.java @@ -8,6 +8,6 @@ public class ExaminerContactedUtil { public static final Observation.ObservationStatus status = ObservationStatus.FINAL; public static final CodeableConcept code = new CodeableConcept() - .addCoding(new Coding().setSystem("http://loinc.org").setCode("69442-2") - .setDisplay("Timing of recent pregnancy in relation to death")); + .addCoding(new Coding().setSystem("http://loinc.org").setCode("74497-9") + .setDisplay("Medical examiner or coroner was contacted")); } \ No newline at end of file diff --git a/src/main/java/edu/gatech/VRDR/model/util/FuneralHomeUtil.java b/src/main/java/edu/gatech/VRDR/model/util/FuneralHomeUtil.java index df0b3bf..a8ee981 100644 --- a/src/main/java/edu/gatech/VRDR/model/util/FuneralHomeUtil.java +++ b/src/main/java/edu/gatech/VRDR/model/util/FuneralHomeUtil.java @@ -6,4 +6,4 @@ public class FuneralHomeUtil { public static final CodeableConcept type = new CodeableConcept() .addCoding(new Coding().setCode("bus").setDisplay("Non-Healthcare Business or Corporation")); -} +} \ No newline at end of file diff --git a/src/test/java/edu/gatech/VRDR/BuildDCD.java b/src/test/java/edu/gatech/VRDR/BuildDCD.java index 71de8af..12a524d 100644 --- a/src/test/java/edu/gatech/VRDR/BuildDCD.java +++ b/src/test/java/edu/gatech/VRDR/BuildDCD.java @@ -22,6 +22,7 @@ import org.hl7.fhir.dstu3.model.Quantity; import org.hl7.fhir.dstu3.model.Reference; import org.hl7.fhir.dstu3.model.Resource; +import org.hl7.fhir.dstu3.model.StringType; import edu.gatech.VRDR.model.AutopsyPerformedIndicator; import edu.gatech.VRDR.model.BirthRecordIdentifier; @@ -132,7 +133,7 @@ public static DeathCertificateDocument buildExampleDeathCertificateDocument() { decedentSpouse.setPatient(decedentReference); contents.add(decedentSpouse); //AutopsyPerformedIndicator: first bool is autopsyPerformed, 2nd is resultsAvailable - AutopsyPerformedIndicator autopsyPerformedIndicator = new AutopsyPerformedIndicator(true,true); + AutopsyPerformedIndicator autopsyPerformedIndicator = new AutopsyPerformedIndicator(false,false); autopsyPerformedIndicator.setSubject(decedentReference); contents.add(autopsyPerformedIndicator); //CauseOfDeathCondition @@ -241,7 +242,6 @@ public static DeathCertificateDocument buildExampleDeathCertificateDocument() { injuryLocation.setType(new CodeableConcept().addCoding(new Coding().setCode("HOSP").setSystem("http://hl7.org/fhir/ValueSet/v3-ServiceDeliveryLocationRoleType"))); injuryLocation.setPhysicalType(new CodeableConcept().addCoding(new Coding().setCode("ro").setSystem("http://hl7.org/fhir/ValueSet/location-physical-type"))); injuryLocation.setAddress(decedentsHome); - deathCertificate.setSubject(decedentReference); contents.add(injuryLocation); //InterestedParty CodeableConcept organizationType = new CodeableConcept().addCoding(new Coding("http://hl7.org/fhir/ValueSet/organization-type","dept","Hospital Department"));