Updates to encounter processing
Added diagnosis observation to encounter tab
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/SheetHeaderUtil.java b/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/SheetHeaderUtil.java
index ec16c73..ba451ca 100644
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/SheetHeaderUtil.java
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/SheetHeaderUtil.java
@@ -87,6 +87,7 @@
row2.createCell(offset++).setCellValue(replaceSpace("Location"));
row2.getSheet().setColumnHidden(offset - 1, hideColumns);
offset = addCodeHeader(row2, offset, "Encounter");
+ offset = createProblemObservationHeader(row1, row2, offset);
row2.createCell(offset++).setCellValue(replaceSpace("Organization"));
row2.createCell(offset++).setCellValue(replaceSpace("Author"));
offset = addSectionHeader(row2, offset);
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/SpreadsheetSerializer.java b/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/SpreadsheetSerializer.java
index 42e914e..765eb1c 100644
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/SpreadsheetSerializer.java
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/SpreadsheetSerializer.java
@@ -1185,6 +1185,7 @@
static int serializeEncounter(Row row, int offset, Encounter encounter) {
+ System.out.println(encounter.eClass().getName());
Cell cell = row.createCell(offset++);
StringBuffer sb = new StringBuffer();
@@ -1246,6 +1247,21 @@
offset = SpreadsheetSerializer.appendCode(
row, offset, encounter.getSection(), encounter.getCode(), encounter.getText());
+ boolean hasDiagnosis = false;
+ for (Act act : encounter.getActs()) {
+ for (Observation observation : act.getObservations()) {
+
+ offset = SpreadsheetSerializer.serializeProblemObservationClinicalStatement(row, offset, observation);
+ hasDiagnosis = true;
+ break;
+ }
+
+ }
+
+ if (hasDiagnosis) {
+ offset = offset + 10;
+ }
+
offset = SpreadsheetSerializer.appendOrganizationAndAuthor(row, offset, encounter.getAuthors());
return offset;
diff --git a/pom.xml b/pom.xml
index c9510c5..c1566e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,8 +10,8 @@
<packaging>pom</packaging>
<properties>
- <tycho-version>1.7.0</tycho-version>
- <tychoExtrasVersion>2.0.0</tychoExtrasVersion>
+ <tycho-version>1.4.0</tycho-version>
+ <tychoExtrasVersion>1.4.0</tychoExtrasVersion>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/mdht/org.eclipse.mdht</tycho.scmUrl>
<jarSignerVersion>1.1.2</jarSignerVersion>
<findbugs.version>3.0.1</findbugs.version>
