Merge pull request #219 from cqframework/fix-datarequirements

Fixed minor issues with data requirements
cqframework · Apr 13, 2021 · 41f79f6 · 41f79f6
2 parents 76d3615 + ebeb7d2
commit 41f79f6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/org/opencds/cqf/tooling/library/r4/R4LibraryProcessor.java b/src/main/java/org/opencds/cqf/tooling/library/r4/R4LibraryProcessor.java
@@ -98,7 +98,7 @@ private void loadLibrary(Map<String, String> fileMap, List<org.hl7.fhir.r5.model
             org.hl7.fhir.r5.model.Library library = (org.hl7.fhir.r5.model.Library) VersionConvertor_40_50.convertResource(resource);
             fileMap.put(library.getId(), libraryFile.getAbsolutePath());
             libraries.add(library);
-        } catch (IOException ex) {
+        } catch (Exception ex) {
             logMessage(String.format("Error reading library: %s. Error: %s", libraryFile.getAbsolutePath(), ex.getMessage()));
         }
     }

diff --git a/src/main/java/org/opencds/cqf/tooling/measure/r4/R4MeasureProcessor.java b/src/main/java/org/opencds/cqf/tooling/measure/r4/R4MeasureProcessor.java
@@ -90,8 +90,8 @@ private void loadMeasure(Map<String, String> fileMap, List<org.hl7.fhir.r5.model
             org.hl7.fhir.r5.model.Measure measure = (org.hl7.fhir.r5.model.Measure) VersionConvertor_40_50.convertResource(resource);
             fileMap.put(measure.getId(), measureFile.getAbsolutePath());
             measures.add(measure);
-        } catch (IOException ex) {
-            logMessage(String.format("Error reading library: %s. Error: %s", measureFile.getAbsolutePath(), ex.getMessage()));
+        } catch (Exception ex) {
+            logMessage(String.format("Error reading measure: %s. Error: %s", measureFile.getAbsolutePath(), ex.getMessage()));
         }
     }
 

diff --git a/src/main/java/org/opencds/cqf/tooling/processor/DataRequirementsProcessor.java b/src/main/java/org/opencds/cqf/tooling/processor/DataRequirementsProcessor.java
@@ -222,7 +222,7 @@ private Extension toLogicDefinition(ElmRequirement req, ExpressionDef def, Strin
         e.addExtension(new Extension().setUrl("libraryName").setValue(toString(req.getLibraryIdentifier().getId())));
         e.addExtension(new Extension().setUrl("name").setValue(toString(def.getName())));
         e.addExtension(new Extension().setUrl("statement").setValue(toString(text)));
-        e.addExtension(new Extension().setUrl("sequence").setValue(toInteger(sequence)));
+        e.addExtension(new Extension().setUrl("displaySequence").setValue(toInteger(sequence)));
         return e;
     }