@Test
public void shouldUpdateObservations() throws Exception {
executeDataSet("shouldUpdateObservations.xml");
String json =
"{ \"patientUuid\" : \"a76e8d23-0c38-408c-b2a8-ea5540f01b51\", "
+ "\"visitTypeUuid\" : \"b45ca846-c79a-11e2-b0c0-8e397087571c\", "
+ "\"encounterTypeUuid\": \"2b377dba-62c3-4e53-91ef-b51c68899890\","
+ "\"encounterDateTime\" : \"2013-01-01T00:00:00.000+0000\", "
+ "\"observations\":["
+ "{\"uuid\":\"z9fb7f47-e80a-4056-9285-bd798be13c63\", "
+ " \"groupMembers\" : [{\"uuid\":\"ze48cdcb-6a76-47e3-9f2e-2635032f3a9a\", \"value\":20, \"comment\":\"new gc\" }] }, "
+ "{\"uuid\":\"zf616900-5e7c-4667-9a7f-dcb260abf1de\", \"comment\" : \"new c\", \"value\":100 }"
+ "]}";
EncounterTransaction response =
deserialize(
handle(newPostRequest("/rest/emrapi/encounter", json)), EncounterTransaction.class);
Visit visit = visitService.getVisitByUuid(response.getVisitUuid());
Encounter encounter = (Encounter) visit.getEncounters().toArray()[0];
assertEquals(2, encounter.getObsAtTopLevel(false).size());
Iterator<Obs> iterator = encounter.getObsAtTopLevel(false).iterator();
Obs obs1 = iterator.next();
assertEquals("zf616900-5e7c-4667-9a7f-dcb260abf1de", obs1.getUuid());
assertEquals(new Double(100), obs1.getValueNumeric());
assertEquals("new c", obs1.getComment());
Obs obs2 = iterator.next();
assertEquals("z9fb7f47-e80a-4056-9285-bd798be13c63", obs2.getUuid());
assertEquals(1, obs2.getGroupMembers().size());
Obs member = obs2.getGroupMembers().iterator().next();
assertEquals(new Double(20), member.getValueNumeric());
assertEquals("new gc", member.getComment());
}
@Test
public void shouldAddNewObservation() throws Exception {
executeDataSet("shouldAddNewObservation.xml");
String encounterDateTime = "2005-01-02T00:00:00.000+0000";
String json =
"{ \"patientUuid\" : \"a76e8d23-0c38-408c-b2a8-ea5540f01b51\", "
+ "\"visitTypeUuid\" : \"b45ca846-c79a-11e2-b0c0-8e397087571c\", "
+ "\"encounterTypeUuid\": \"2b377dba-62c3-4e53-91ef-b51c68899890\", "
+ "\"encounterDateTime\" : \""
+ encounterDateTime
+ "\", "
+ "\"observations\":["
+ "{\"concept\": {\"uuid\": \"d102c80f-1yz9-4da3-bb88-8122ce8868dd\"}, \"conceptName\":\"Should be Ignored\", \"value\":20}, "
+ "{\"concept\": {\"uuid\": \"8f8e7340-a067-11e3-a5e2-0800200c9a66\"}, \"value\": {\"uuid\": \"e7167090-a067-11e3-a5e2-0800200c9a66\"}}, "
+ "{\"concept\": {\"uuid\": \"e102c80f-1yz9-4da3-bb88-8122ce8868dd\"}, \"value\":\"text value\", \"comment\":\"overweight\"}]}";
MockHttpServletResponse response1 = handle(newPostRequest("/rest/emrapi/encounter", json));
EncounterTransaction response = deserialize(response1, EncounterTransaction.class);
Visit visit = visitService.getVisitByUuid(response.getVisitUuid());
Encounter encounter = visit.getEncounters().iterator().next();
assertEquals(3, encounter.getObs().size());
Iterator<Obs> obsIterator = encounter.getObs().iterator();
Map<String, Obs> map = new HashMap<String, Obs>();
while (obsIterator.hasNext()) {
Obs obs = obsIterator.next();
map.put(obs.getConcept().getDatatype().getHl7Abbreviation(), obs);
}
Obs textObservation = map.get(ConceptDatatype.TEXT);
assertEquals("text value", textObservation.getValueText());
assertEquals("a76e8d23-0c38-408c-b2a8-ea5540f01b51", textObservation.getPerson().getUuid());
assertEquals("e102c80f-1yz9-4da3-bb88-8122ce8868dd", textObservation.getConcept().getUuid());
assertEquals("f13d6fae-baa9-4553-955d-920098bec08f", textObservation.getEncounter().getUuid());
assertEquals("overweight", textObservation.getComment());
// TODO : change the observation startTime logic to take current time as start time when
// startTime is not passed by the client
// assertEquals(DateUtils.parseDate(encounterDateTime, dateTimeFormat),
// textObservation.getObsDatetime());
assertEquals(
"e7167090-a067-11e3-a5e2-0800200c9a66",
map.get(ConceptDatatype.CODED).getValueCoded().getUuid());
assertEquals(new Double(20.0), map.get(ConceptDatatype.NUMERIC).getValueNumeric());
}
/**
* This is an equivalent to a copy constructor. Creates a new copy of the given <code>obsToCopy
* </code> with a null obs id
*
* @param obsToCopy The Obs that is going to be copied
* @return a new Obs object with all the same attributes as the given obs
*/
public static Obs newInstance(Obs obsToCopy) {
Obs newObs =
new Obs(
obsToCopy.getPerson(),
obsToCopy.getConcept(),
obsToCopy.getObsDatetime(),
obsToCopy.getLocation());
newObs.setObsGroup(obsToCopy.getObsGroup());
newObs.setAccessionNumber(obsToCopy.getAccessionNumber());
newObs.setValueCoded(obsToCopy.getValueCoded());
newObs.setValueDrug(obsToCopy.getValueDrug());
newObs.setValueGroupId(obsToCopy.getValueGroupId());
newObs.setValueDatetime(obsToCopy.getValueDatetime());
newObs.setValueNumeric(obsToCopy.getValueNumeric());
newObs.setValueModifier(obsToCopy.getValueModifier());
newObs.setValueText(obsToCopy.getValueText());
newObs.setComment(obsToCopy.getComment());
newObs.setOrder(obsToCopy.getOrder());
newObs.setEncounter(obsToCopy.getEncounter());
newObs.setDateStarted(obsToCopy.getDateStarted());
newObs.setDateStopped(obsToCopy.getDateStopped());
newObs.setCreator(obsToCopy.getCreator());
newObs.setDateCreated(obsToCopy.getDateCreated());
newObs.setVoided(obsToCopy.getVoided());
newObs.setVoidedBy(obsToCopy.getVoidedBy());
newObs.setDateVoided(obsToCopy.getDateVoided());
newObs.setVoidReason(obsToCopy.getVoidReason());
newObs.setValueComplex(obsToCopy.getValueComplex());
newObs.setComplexData(obsToCopy.getComplexData());
if (obsToCopy.getGroupMembers() != null)
for (Obs member : obsToCopy.getGroupMembers()) {
// if the obs hasn't been saved yet, no need to duplicate it
if (member.getObsId() == null) newObs.addGroupMember(member);
else newObs.addGroupMember(Obs.newInstance(member));
}
return newObs;
}
@Test
public void shouldAddNewObservationGroup() throws Exception {
executeDataSet("shouldAddNewObservation.xml");
String encounterDateTime = "2005-01-02T00:00:00.000+0000";
String observationTime = "2005-01-02T12:00:00.000+0000";
String json =
"{ \"patientUuid\" : \"a76e8d23-0c38-408c-b2a8-ea5540f01b51\", "
+ "\"visitTypeUuid\" : \"b45ca846-c79a-11e2-b0c0-8e397087571c\", "
+ "\"encounterTypeUuid\": \"2b377dba-62c3-4e53-91ef-b51c68899890\", "
+ "\"encounterDateTime\" : \""
+ encounterDateTime
+ "\", "
+ "\"observations\":["
+ "{\"concept\":{\"uuid\": \"e102c80f-1yz9-4da3-bb88-8122ce8868dd\"}, "
+ " \"groupMembers\" : [{\"concept\":{\"uuid\": \"d102c80f-1yz9-4da3-bb88-8122ce8868dd\"}, \"value\":20, \"comment\":\"overweight\", \"observationDateTime\": \""
+ observationTime
+ "\"}] }"
+ "]}";
EncounterTransaction response =
deserialize(
handle(newPostRequest("/rest/emrapi/encounter", json)), EncounterTransaction.class);
Visit visit = visitService.getVisitByUuid(response.getVisitUuid());
Encounter encounter = (Encounter) visit.getEncounters().toArray()[0];
assertEquals(1, encounter.getObs().size());
Obs obs = (Obs) encounter.getAllObs().toArray()[0];
assertEquals("e102c80f-1yz9-4da3-bb88-8122ce8868dd", obs.getConcept().getUuid());
assertEquals(1, obs.getGroupMembers().size());
Obs member = obs.getGroupMembers().iterator().next();
assertEquals("d102c80f-1yz9-4da3-bb88-8122ce8868dd", member.getConcept().getUuid());
assertEquals(new Double(20.0), member.getValueNumeric());
assertEquals("a76e8d23-0c38-408c-b2a8-ea5540f01b51", member.getPerson().getUuid());
assertEquals("f13d6fae-baa9-4553-955d-920098bec08f", member.getEncounter().getUuid());
assertEquals("overweight", member.getComment());
assertEquals(
new SimpleDateFormat(dateTimeFormat).parse(observationTime), member.getObsDatetime());
}
/**
* Adds the column headers and column data to the DataSet
*
* @param dataSet
* @param encounters
* @param patientIdentifierTypes
* @param optionalColumns
* @param columnDisplayFormat
* @param maxColumnHeaderWidth
* @param allColumns
* @param fieldMap
* @return
*/
public DataSet addData(
SimpleDataSet dataSet,
List<Encounter> encounters,
List<PatientIdentifierType> patientIdentifierTypes,
List<EncounterAndObsDataSetDefinition.ObsOptionalColumn> optionalColumns,
List<EncounterAndObsDataSetDefinition.ColumnDisplayFormat> columnDisplayFormat,
Integer maxColumnHeaderWidth,
Set<ObsColumnDescriptor> allColumns,
Map<Encounter, Map<ObsColumnDescriptor, Obs>> fieldMap) {
for (Encounter encounter : encounters) {
DataSetRow row = new DataSetRow();
List<String> providerNames = new ArrayList<String>();
for (EncounterProvider ep : encounter.getEncounterProviders()) {
providerNames.add(ep.getProvider().getName());
}
// Add the standard columns for encounters
DataSetColumn c1 =
new DataSetColumn(
ObjectUtil.trimStringIfNeeded("ENCOUNTER_ID", maxColumnHeaderWidth),
ObjectUtil.trimStringIfNeeded("ENCOUNTER_ID", maxColumnHeaderWidth),
Integer.class);
row.addColumnValue(c1, encounter.getEncounterId());
DataSetColumn c2 =
new DataSetColumn(
ObjectUtil.trimStringIfNeeded("ENCOUNTER_DATETIME", maxColumnHeaderWidth),
ObjectUtil.trimStringIfNeeded("ENCOUNTER_DATETIME", maxColumnHeaderWidth),
String.class);
row.addColumnValue(c2, encounter.getEncounterDatetime().toString());
DataSetColumn c3 =
new DataSetColumn(
ObjectUtil.trimStringIfNeeded("LOCATION", maxColumnHeaderWidth),
ObjectUtil.trimStringIfNeeded("LOCATION", maxColumnHeaderWidth),
String.class);
row.addColumnValue(
c3, (encounter.getLocation() != null) ? encounter.getLocation().getName() : EMPTY);
DataSetColumn c4 =
new DataSetColumn(
ObjectUtil.trimStringIfNeeded("PROVIDER", maxColumnHeaderWidth),
ObjectUtil.trimStringIfNeeded("PROVIDER", maxColumnHeaderWidth),
String.class);
row.addColumnValue(c4, OpenmrsUtil.join(providerNames, ", "));
DataSetColumn c5 =
new DataSetColumn(
ObjectUtil.trimStringIfNeeded("INTERNAL_PATIENT_ID", maxColumnHeaderWidth),
ObjectUtil.trimStringIfNeeded("INTERNAL_PATIENT_ID", maxColumnHeaderWidth),
Integer.class);
row.addColumnValue(
c5, encounter.getPatient() != null ? encounter.getPatient().getPatientId() : EMPTY);
if (patientIdentifierTypes != null) {
for (PatientIdentifierType pit : patientIdentifierTypes) {
List<PatientIdentifier> patientIdentifiers =
encounter.getPatient().getPatientIdentifiers(pit);
StringBuffer sbPatientIdentifiers = new StringBuffer();
int count = 0;
for (PatientIdentifier patientIdentifier : patientIdentifiers) {
if (count > 0) {
sbPatientIdentifiers.append(", ");
}
sbPatientIdentifiers.append(patientIdentifier.toString());
count++;
}
DataSetColumn c6 =
new DataSetColumn(
pit.getName(),
ObjectUtil.trimStringIfNeeded(pit.getName(), maxColumnHeaderWidth),
String.class);
row.addColumnValue(c6, sbPatientIdentifiers.toString());
}
}
Map<ObsColumnDescriptor, Obs> obsInEncounter = fieldMap.get(encounter);
// Look up all obs for a given encounter based on column headers for all encounters
for (ObsColumnDescriptor columnKey : allColumns) {
Obs obs = obsInEncounter.get(columnKey);
String columnName = columnKey.format(columnDisplayFormat, maxColumnHeaderWidth);
DataSetColumn obsDsc = new DataSetColumn(columnName, columnName, String.class);
StringBuffer columnValue = new StringBuffer();
if (obs != null && obs.getValueCoded() != null) {
if (columnDisplayFormat.contains(
EncounterAndObsDataSetDefinition.ColumnDisplayFormat.ID)) {
columnValue.append(obs.getValueCoded());
}
if (columnDisplayFormat.contains(EncounterAndObsDataSetDefinition.ColumnDisplayFormat.ID)
&& columnDisplayFormat.contains(
EncounterAndObsDataSetDefinition.ColumnDisplayFormat.BEST_SHORT_NAME)) {
columnValue.append("_");
}
if (columnDisplayFormat.contains(
EncounterAndObsDataSetDefinition.ColumnDisplayFormat.BEST_SHORT_NAME)) {
String conceptName = obs.getValueAsString(Context.getLocale());
columnValue.append(
maxColumnHeaderWidth != null
&& conceptName.length() > maxColumnHeaderWidth - columnValue.length()
? conceptName.substring(0, maxColumnHeaderWidth - columnValue.length() - 1)
: conceptName);
}
row.addColumnValue(obsDsc, (obs != null) ? columnValue.toString() : EMPTY);
} else {
row.addColumnValue(
obsDsc, (obs != null) ? obs.getValueAsString(Context.getLocale()) : EMPTY);
}
String dateColumnName =
columnKey.format(
columnDisplayFormat,
maxColumnHeaderWidth != null ? maxColumnHeaderWidth - 5 : null);
DataSetColumn obsDscDate =
new DataSetColumn(dateColumnName + "_DATE", dateColumnName + "_DATE", String.class);
row.addColumnValue(obsDscDate, (obs != null) ? obs.getObsDatetime().toString() : EMPTY);
String parentColumnName =
columnKey.format(
columnDisplayFormat,
maxColumnHeaderWidth != null ? maxColumnHeaderWidth - 7 : null);
DataSetColumn obsDscParent =
new DataSetColumn(
parentColumnName + "_PARENT", parentColumnName + "_PARENT", String.class);
row.addColumnValue(
obsDscParent,
(obs != null && obs.getObsGroup() != null) ? obs.getObsGroup().getId() : EMPTY);
if (optionalColumns != null) {
if (optionalColumns.contains(
EncounterAndObsDataSetDefinition.ObsOptionalColumn.VALUE_MODIFIER)) {
String valModColumnName =
columnKey.format(
columnDisplayFormat,
maxColumnHeaderWidth != null ? maxColumnHeaderWidth - 10 : null);
DataSetColumn obsDscValueModifier =
new DataSetColumn(
valModColumnName + "_VALUE_MOD", valModColumnName + "_VALUE_MOD", String.class);
row.addColumnValue(obsDscValueModifier, (obs != null) ? obs.getValueModifier() : EMPTY);
}
if (optionalColumns.contains(
EncounterAndObsDataSetDefinition.ObsOptionalColumn.ACCESSION_NUMBER)) {
String accessionNumColumnName =
columnKey.format(
columnDisplayFormat,
maxColumnHeaderWidth != null ? maxColumnHeaderWidth - 14 : null);
DataSetColumn obsDscAccessionNumber =
new DataSetColumn(
accessionNumColumnName + "_ACCESSION_NUM",
accessionNumColumnName + "_ACCESSION_NUM",
String.class);
row.addColumnValue(
obsDscAccessionNumber, (obs != null) ? obs.getAccessionNumber() : EMPTY);
}
if (optionalColumns.contains(
EncounterAndObsDataSetDefinition.ObsOptionalColumn.COMMENT)) {
String commentColumnName =
columnKey.format(
columnDisplayFormat,
maxColumnHeaderWidth != null ? maxColumnHeaderWidth - 8 : null);
DataSetColumn obsDscComment =
new DataSetColumn(
commentColumnName + "_COMMENT", commentColumnName + "_COMMENT", String.class);
row.addColumnValue(obsDscComment, (obs != null) ? obs.getComment() : EMPTY);
}
}
}
dataSet.addRow(row);
}
return dataSet;
}