DoseQuantity has wrong info for unit. Fixed.

gt-health · Apr 20, 2017 · b76e2f0 · b76e2f0
1 parent 17127d5
commit b76e2f0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/gt-fhir-entities/src/main/java/edu/gatech/i3l/fhir/dstu2/entities/MedicationOrderView.java b/gt-fhir-entities/src/main/java/edu/gatech/i3l/fhir/dstu2/entities/MedicationOrderView.java
@@ -350,7 +350,8 @@ public IResource getRelatedResource() {
         	Concept myUnitConcept = this.getDoseUnitConcept();
         	SimpleQuantityDt dose;
         	if (myUnitConcept != null) {
-        		dose = new SimpleQuantityDt(doseValue, "http://unitsofmeasure.org", myUnitConcept.getConceptCode());
+        		dose = new SimpleQuantityDt(doseValue, "http://unitsofmeasure.org", myUnitConcept.getName());
+        		dose.setCode(myUnitConcept.getConceptCode());
         	} else {
         		dose = new SimpleQuantityDt(doseValue);
         	}

diff --git a/gt-fhir-webapp/src/main/webapp/WEB-INF/fhir-server-database-config.xml b/gt-fhir-webapp/src/main/webapp/WEB-INF/fhir-server-database-config.xml
@@ -21,12 +21,10 @@
 	and other properties supported by BasicDataSource.
 	-->
 	<bean id="myPersistenceDataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
-<!-- 		<property name="url" value="jdbc:postgresql://dhppoc.i3l.gatech.edu:5432/postgres?currentSchema=omop_v5" />
- -->		
- 		<property name="url" value="jdbc:postgresql://ohdsi_v5.i3l.gatech.edu:5432/postgres?currentSchema=mimic_v5" />
+ 		<property name="url" value="jdbc:postgresql://localhost:5432/postgres?currentSchema=omop_v5" />
 		<property name="driverClassName" value="org.postgresql.Driver"></property>
-		<property name="username" value="fhir_user"/>
-		<property name="password" value="R1chard_0n_fire"/>
+		<property name="username" value="omop_v5"/>
+		<property name="password" value="i3lworks"/>
 	</bean>
 
 	<!--