Updated a few concept code names. Fixed the death location extension …

…from death date having the wrong extension url.
gt-health · Sep 9, 2020 · 389fd1c · 389fd1c
1 parent f545a15
commit 389fd1c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>edu.gatech</groupId>
   <artifactId>VRDR</artifactId>
-  <version>v0.1.6-R4</version>
+  <version>v0.1.7-R4</version>
   <packaging>jar</packaging>
 
   <name>VRDR</name>

diff --git a/src/main/java/edu/gatech/VRDR/model/DecedentAge.java b/src/main/java/edu/gatech/VRDR/model/DecedentAge.java
@@ -6,7 +6,7 @@
 import edu.gatech.VRDR.model.util.CommonUtil;
 import edu.gatech.VRDR.model.util.DecedentAgeUtil;
 
-@ResourceDef(name = "Observation", profile = "http://hl7.org/fhir/us/vrdr/StructureDefinition/VRDR-DECEDENT-AGE")
+@ResourceDef(name = "Observation", profile = "http://hl7.org/fhir/us/vrdr/StructureDefinition/VRDR-Decedent-Age")
 public class DecedentAge extends Observation {
 	public DecedentAge() {
 		CommonUtil.initResource(this);

diff --git a/src/main/java/edu/gatech/VRDR/model/util/DeathDateUtil.java b/src/main/java/edu/gatech/VRDR/model/util/DeathDateUtil.java
@@ -8,7 +8,7 @@ public class DeathDateUtil {
 	public static final CodeableConcept code = new CodeableConcept()
 			.addCoding(new Coding("http://loinc.org", "81956-5", "Date and time of death"));
 	public static final ObservationStatus status = ObservationStatus.FINAL;
-	public static final String patientLocationExtensionURL = "http://hl7.org/fhir/us/vrdr/StructureDefinition/VRDR-Death-Location";
+	public static final String patientLocationExtensionURL = "http://hl7.org/fhir/us/vrdr/StructureDefinition/Observation-Location";
 	public static final CodeableConcept componentDatePronouncedDeadCode = new CodeableConcept()
 			.addCoding(new Coding("http://loinc.org", "81616-6", "Date and time pronounced dead"));
 	public static final CodeableConcept method = new CodeableConcept()

diff --git a/src/main/java/edu/gatech/VRDR/model/util/DecedentAgeUtil.java b/src/main/java/edu/gatech/VRDR/model/util/DecedentAgeUtil.java
@@ -7,6 +7,6 @@
 public class DecedentAgeUtil {
 	public static final ObservationStatus status = ObservationStatus.FINAL;
 	public static final CodeableConcept code = new CodeableConcept()
-			.addCoding(new Coding("http://loinc.org", "30525-0", "AGE"));
+			.addCoding(new Coding("http://loinc.org", "30525-0", "Age"));
 
 }
diff --git a/src/main/java/edu/gatech/VRDR/model/util/DecedentUsualWorkUtil.java b/src/main/java/edu/gatech/VRDR/model/util/DecedentUsualWorkUtil.java
@@ -10,7 +10,7 @@ public class DecedentUsualWorkUtil {
 	public static final CodeableConcept code = new CodeableConcept()
 			.addCoding(new Coding().setSystem("http://loinc.org").setCode("21843-8").setDisplay("History of Usual occupation"));
 	public static final CodeableConcept componentUsualIndustryCode = new CodeableConcept()
-			.addCoding(new Coding().setSystem("http://loinc.org").setCode("21844-6"));
+			.addCoding(new Coding().setSystem("http://loinc.org").setCode("21844-6").setDisplay("Usual Industry"));
 	public static final CodeableConcept componentUsualOccupationDuraction= new CodeableConcept()
 			.addCoding(new Coding().setSystem("http://loinc.org").setCode("21847-9"));
 }