Updates to roll up statistics
modified statistics to pull out document type under consol
diff --git a/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/GenerateCDADataHandler.java b/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/GenerateCDADataHandler.java
index fb18a60..c246759 100644
--- a/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/GenerateCDADataHandler.java
+++ b/cda/plugins/org.eclipse.mdht.cda.xml.ui/src/org/eclipse/mdht/cda/xml/ui/handlers/GenerateCDADataHandler.java
@@ -1422,12 +1422,15 @@
statsheet = rollupStats.createSheet("File Statistics");
Row hrow = statsheet.createRow(statsheet.getPhysicalNumberOfRows());
hrow.createCell(0).setCellValue("File Name");
- ;
+
hrow.createCell(1).setCellValue("Totals");
hrow.createCell(2).setCellValue("Consolidated");
- hrow.createCell(3).setCellValue("C32");
- hrow.createCell(4).setCellValue("NonXML");
- hrow.createCell(5).setCellValue("Errors");
+ hrow.createCell(3).setCellValue("Outpatient Progress note");
+ hrow.createCell(4).setCellValue("Summary of episode note");
+ hrow.createCell(5).setCellValue("Other");
+ hrow.createCell(6).setCellValue("C32");
+ hrow.createCell(7).setCellValue("NonXML");
+ hrow.createCell(8).setCellValue("Errors");
;
}
@@ -1446,13 +1449,17 @@
int statfilectr = 0;
int consoldocumentsprocessed = 0;
+ int outpatientprogressnoteprocessed = 0;
+ int dischargesummaryprocessed = 0;
+ int continuityofcareprocessed = 0;
+ int otherdocumentprocessed = 0;
int c32documentsprocessed = 0;
+
int nonxmldocuments = 0;
int documenterrors = 0;
int totalFiles = folder.members().length;
while (documentsIterator.hasNext()) {
statfilectr++;
- // = documents.iterator(); IFile file : documents
IFile file = documentsIterator.next();
stopwatch.reset();
stopwatch.start();
@@ -1485,10 +1492,6 @@
", Estimated Time to finish : " + ((int) estimatedTimeLeft) + " Seconds ");
}
- // monitor.subTask(
- // "Processing File " + StringUtils.leftPad(String.valueOf(filectr++), 5) + " of " +
- // StringUtils.leftPad(String.valueOf(totalFiles), 5) + " General Performance" +
- // fileSize / (currentProcessingTime / 1000.0) + " Bytes per Second ");
try {
console.println(getMemoryUssage());
@@ -1559,11 +1562,35 @@
getDMHash(clinicalDocument.eClass().getClassifierID(), splitOption).put(file, documentMetadata);
+ /*
+ * Outpatient Progress note
+ * Summary of episode note
+ */
+
if (clinicalDocument instanceof GeneralHeaderConstraints) {
console.println("Start Processing ");
consoldocumentsprocessed++;
+ switch (clinicalDocument.eClass().getClassifierID()) {
+ case ConsolPackage.PROGRESS_NOTE:
+ case ConsolPackage.PROGRESS_NOTE2:
+ outpatientprogressnoteprocessed++;
+ break;
+ case ConsolPackage.DISCHARGE_SUMMARY:
+ case ConsolPackage.DISCHARGE_SUMMARY2:
+ dischargesummaryprocessed++;
+ break;
+ case ConsolPackage.CONTINUITY_OF_CARE_DOCUMENT:
+ case ConsolPackage.CONTINUITY_OF_CARE_DOCUMENT2:
+ continuityofcareprocessed++;
+ break;
+
+ default:
+ otherdocumentprocessed++;
+ break;
+ }
+
CDAMetrics metrics = applyMetrics(clinicalDocument);
SpreadsheetSerializer.appendToMetricsSheet(
@@ -1584,8 +1611,6 @@
for (Section section : clinicalDocument.getSections()) {
- // EClass theSectionEClass = section.eClass();
-
if (!sectionFilter.isEmpty() && !sectionFilter.contains(section.eClass())) {
boolean found = false;
@@ -1606,22 +1631,6 @@
pss.doSwitch(section);
console.println("End Section " + stopwatch.elapsed(TimeUnit.MILLISECONDS));
- // String sheetIndex = getSheet(
- // clinicalDocument.eClass(), String.valueOf(theSectionEClass.getClassifierID()),
- // sheetName(theSectionEClass), splitOption);
- // if (!(section instanceof EncountersSectionEntriesOptional)) {
- // SectionSwitch sectionSwitch = new SectionSwitch(
- // query, wb.getSheet(sheetIndex), documentMetadata, patientRole, serviceEvent,
- // encounters, file.getName());
- // sectionSwitch.doSwitch(section);
- // wb.getSheet(sheetIndex).flushRows();
- // }
- // if (shouldCountSection(section)) {
- // getSectionHash(
- // clinicalDocument.eClass().getClassifierID(), sheetIndex, splitOption).add(file);
- //
- // }
-
}
long t = stopwatch.elapsed(TimeUnit.MILLISECONDS);
@@ -1702,9 +1711,13 @@
statrow.createCell(1).setCellValue(statfilectr);
statrow.createCell(2).setCellValue(consoldocumentsprocessed);
- statrow.createCell(3).setCellValue(c32documentsprocessed);
- statrow.createCell(4).setCellValue(nonxmldocuments);
- statrow.createCell(5).setCellValue(documenterrors);
+ statrow.createCell(3).setCellValue(continuityofcareprocessed);
+ statrow.createCell(4).setCellValue(outpatientprogressnoteprocessed);
+ statrow.createCell(5).setCellValue(dischargesummaryprocessed);
+ statrow.createCell(6).setCellValue(otherdocumentprocessed);
+ statrow.createCell(7).setCellValue(c32documentsprocessed);
+ statrow.createCell(8).setCellValue(nonxmldocuments);
+ statrow.createCell(9).setCellValue(documenterrors);
stopwatch.stop();
}
