Updated a mispelling of AutopsyPerformedIndicator. Updated some misna…

…med fields in the model.

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>edu.gatech</groupId>
   <artifactId>VRDR</artifactId>
-  <version>v0.1.4-R4</version>
+  <version>v0.1.5-R4</version>
   <packaging>jar</packaging>
 
   <name>VRDR</name>

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

@@ -5,7 +5,7 @@
 import org.hl7.fhir.r4.model.Reference;
 
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
-import edu.gatech.VRDR.model.util.AutopsyPerformedIdentifierUtil;
+import edu.gatech.VRDR.model.util.AutopsyPerformedIndicatorUtil;
 import edu.gatech.VRDR.model.util.CommonUtil;
 
 @ResourceDef(name = "Observation", profile = "http://hl7.org/fhir/us/vrdr/StructureDefinition/VRDR-Autopsy-Performed-Indicator")
@@ -14,8 +14,8 @@ public class AutopsyPerformedIndicator extends Observation {
 	public AutopsyPerformedIndicator() {
 		super();
 		CommonUtil.initResource(this);
-		setStatus(AutopsyPerformedIdentifierUtil.status);
-		setCode(AutopsyPerformedIdentifierUtil.code);
+		setStatus(AutopsyPerformedIndicatorUtil.status);
+		setCode(AutopsyPerformedIndicatorUtil.code);
 	}
 
 	public AutopsyPerformedIndicator(boolean autopsyPerformed) {
@@ -51,7 +51,7 @@ public Reference getDecedent() {
 
 	public void addAutopsyResultsAvailableComponent(CodeableConcept concept) {
 		ObservationComponentComponent component = new ObservationComponentComponent();
-		component.setCode(AutopsyPerformedIdentifierUtil.componentAutopsyResultsAvailableCode);
+		component.setCode(AutopsyPerformedIndicatorUtil.componentAutopsyResultsAvailableCode);
 		component.setValue(concept);
 		addComponent(component);
 	}

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

@@ -22,4 +22,4 @@ public DeathLocation(String name, String description, CodeableConcept type, Addr
 		setAddress(address);
 		setPhysicalType(physicalType);
 	}
-}
+}

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

@@ -1,5 +1,7 @@
 package edu.gatech.VRDR.model;
 
+import org.hl7.fhir.r4.model.Address;
+import org.hl7.fhir.r4.model.CodeableConcept;
 import org.hl7.fhir.r4.model.Location;
 
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
@@ -12,4 +14,13 @@ public InjuryLocation() {
 		super();
 		CommonUtil.initResource(this);
 	}
+	public InjuryLocation(String name, String description, CodeableConcept type, Address address,
+			CodeableConcept physicalType) {
+		this();
+		setName(name);
+		setDescription(description);
+		addType(type);
+		setAddress(address);
+		setPhysicalType(physicalType);
+	}
 }

src/main/java/edu/gatech/VRDR/model/util/AutopsyPerformedIdentifierUtil.java → src/main/java/edu/gatech/VRDR/model/util/AutopsyPerformedIndicatorUtil.java

@@ -5,7 +5,7 @@
 import org.hl7.fhir.r4.model.Observation;
 import org.hl7.fhir.r4.model.Observation.ObservationStatus;
 
-public class AutopsyPerformedIdentifierUtil {
+public class AutopsyPerformedIndicatorUtil {
 	public static final CodeableConcept code = new CodeableConcept()
 			.addCoding(new Coding("http://loinc.org", "85699-7", "Autopsy was performed"));
 	public static final CodeableConcept componentAutopsyResultsAvailableCode = new CodeableConcept()

src/main/java/edu/gatech/VRDR/model/util/DeathCertificateUtil.java

@@ -12,4 +12,4 @@ public class DeathCertificateUtil {
 	public static final Composition.CompositionAttestationMode attesterMode = Composition.CompositionAttestationMode.LEGAL;
 	public static final CodeableConcept eventCodeFixedValue = new CodeableConcept()
 			.addCoding(new Coding().setCode("308646001").setSystem("http://snomed.info/sct").setDisplay("Death certification (procedure)"));
-}
+}