Updates to documents spreadsheet page
added document code
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/CDAValueUtil.java b/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/CDAValueUtil.java
index 6f2bf83..5b2c6dc 100644
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/CDAValueUtil.java
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/CDAValueUtil.java
@@ -62,6 +62,10 @@
public String documentType = "";
+ public String documentCode = "";
+
+ public String documentCodeSystem = "";
+
/**
* @TODO - re-factor methods to use doucmentMetadata for file name versus parameter
*/
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 0f4adf9..ba9b1f4 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
@@ -78,6 +78,8 @@
}
row2.createCell(offset++).setCellValue(replaceSpace("CDA Specification"));
row2.createCell(offset++).setCellValue(replaceSpace("CDA Document Type"));
+ row2.createCell(offset++).setCellValue(replaceSpace("CDA Document Code"));
+ row2.createCell(offset++).setCellValue(replaceSpace("CDA Document System"));
row2.createCell(offset++).setCellValue(replaceSpace("Organization"));
row2.createCell(offset++).setCellValue(replaceSpace("Software"));
row2.createCell(offset++).setCellValue(replaceSpace("Document Date"));
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 46e681c..864d351 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
@@ -894,10 +894,27 @@
}
if (cd != null && cd.getCode() != null) {
- documentMetadata.documentType = cd.getCode().getDisplayName();
+ documentMetadata.documentType = (StringUtils.isEmpty(cd.getCode().getDisplayName())
+ ? "MISSING"
+ : cd.getCode().getDisplayName());
+ documentMetadata.documentCode = (StringUtils.isEmpty(cd.getCode().getCode())
+ ? "MISSING"
+ : cd.getCode().getCode());
+ documentMetadata.documentCodeSystem = (StringUtils.isEmpty(cd.getCode().getCodeSystem())
+ ? "MISSING"
+ : cd.getCode().getCodeSystem());
// row.createCell(offset++).setCellValue(cd.getCode().getDisplayName());
} else {
documentMetadata.documentType = "MISSING";
+ documentMetadata.documentCode = "MISSING";
+ documentMetadata.documentCodeSystem = "MISSING";
+ }
+
+ if (cd != null && cd.getCode() != null) {
+
+ // row.createCell(offset++).setCellValue(cd.getCode().getDisplayName());
+ } else {
+
// row.createCell(offset++).setCellValue("");
}
@@ -1165,6 +1182,12 @@
cell.setCellValue(documentMetadata.documentType);
cell = row.createCell(offset++);
+ cell.setCellValue(documentMetadata.documentCode);
+
+ cell = row.createCell(offset++);
+ cell.setCellValue(documentMetadata.documentCodeSystem);
+
+ cell = row.createCell(offset++);
cell.setCellValue(documentMetadata.documentOrganization);
cell = row.createCell(offset++);
