Fixed some incorrectly coded codes. Tested false autopsyindicators an…

…d autopsy results available. Moved version up by a minor version.

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>edu.gatech</groupId>
   <artifactId>VRDR</artifactId>
-  <version>v0.1.0-STUBallot1-REVISED.1</version>
+  <version>v0.1.1-STUBallot1-REVISED.1</version>
   <packaging>jar</packaging>
 
   <name>VRDR</name>

src/main/java/edu/gatech/VRDR/model/FuneralHome.java

@@ -19,4 +19,4 @@ public FuneralHome(String name, Address address) {
 		setName(name);
 		addAddress(address);
 	}
-}
+}

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"));
 }

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";
 }

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"));
 }

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"));
-}
+}

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"));