Feature/v 4 lib upgrade

.node-version

@@ -1 +1 @@
-8.11.3
+12.20.0

.nvmrc

@@ -0,0 +1 @@
+12.*

.rescriptsrc.js

@@ -141,4 +141,4 @@ module.exports = [
   addHtmlWebpackPluginForLaunch,
   stubUnneededFiles
   // ,logConfig
-];
+];

README.md

@@ -8,7 +8,7 @@ The Pain Management Summary SMART on FHIR application was developed to support t
 
 The Pain Management Summary SMART on FHIR application was piloted during Summer 2018.  Local modifications and development were needed to fully support this application in the pilot environment.  For example, custom development was needed to expose pain assessments via the FHIR API. See the pilot reports for more information.
 
-This application was originally piloted with support for FHIR DSTU2.  The app has been updated since the pilot to also support FHIR R4, although pilot R4 support has not been piloted in a clinical setting.
+This application was originally piloted with support for FHIR DSTU2.  The app has been updated since the pilot to also support FHIR R4, although pilot R4 support has not been piloted in a clinical setting.  In addition, value sets and standardized codes have been updated since the pilot.  See the comments in the bundled CQL for details.
 
 This prototype application is part of the [CDS Connect](https://cds.ahrq.gov/cdsconnect) project, sponsored by the [Agency for Healthcare Research and Quality](https://www.ahrq.gov/) (AHRQ), and developed under contract with AHRQ by [MITRE's CAMH](https://www.mitre.org/centers/cms-alliances-to-modernize-healthcare/who-we-are) FFRDC.
 
@@ -30,11 +30,6 @@ This CDS logic queries for several concepts that do not yet have standardized co
 
 | Code | System | Display |
 | --- | --- | --- |
-| PEGASSESSMENT | http://cds.ahrq.gov/cdsconnect/pms | Pain Enjoyment General Activity (PEG) Assessment |
-| PEGPAIN | http://cds.ahrq.gov/cdsconnect/pms | Pain |
-| PEGENJOYMENT | http://cds.ahrq.gov/cdsconnect/pms | Enjoyment of life |
-| PEGGENERALACTIVITY | http://cds.ahrq.gov/cdsconnect/pms | General activity |
-| STARTBACK | http://cds.ahrq.gov/cdsconnect/pms | STarT Back Screening Tool |
 | SQETOHUSE | http://cds.ahrq.gov/cdsconnect/pms | Single question r/t ETOH use |
 | SQDRUGUSE | http://cds.ahrq.gov/cdsconnect/pms | Single question r/t drug use |
 | MME | http://cds.ahrq.gov/cdsconnect/pms | Morphine Milligram Equivalent (MME) |
@@ -43,7 +38,7 @@ Systems integrating the Pain Management Summary will need to expose the correspo
 
 ### To build and run in development:
 
-1. Install [Node.js](https://nodejs.org/en/download/) (LTS edition, currently 8.x)
+1. Install [Node.js](https://nodejs.org/en/download/) (LTS edition, currently 12.x)
 2. Install [Yarn](https://yarnpkg.com/en/docs/install) (1.3.x or above)
 3. Install dependencies by executing `yarn` from the project's root directory
 4. If you have a SMART-on-FHIR client ID, edit `public/launch-context.json` to specify it
@@ -55,7 +50,7 @@ Systems integrating the Pain Management Summary will need to expose the correspo
 
 The Pain Management Summary can be deployed as static web resources on any HTTP server.  There are several customizations, however, that need to be made based on the site where it is deployed.
 
-1. Install [Node.js](https://nodejs.org/en/download/) (LTS edition, currently 8.x)
+1. Install [Node.js](https://nodejs.org/en/download/) (LTS edition, currently 12.x)
 2. Install [Yarn](https://yarnpkg.com/en/docs/install) (1.3.x or above)
 3. Install dependencies by executing `yarn` from the project's root directory
 4. Modify the `homepage` value in `package.json` to reflect the path (after the hostname) at which it will be deployed
@@ -71,12 +66,39 @@ The Pain Management Summary can be deployed as static web resources on any HTTP
 
 Optionally to step 9, you can run the static build contents in a simple Node http-server via the command: `yarn start-static`.
 
+### To update the valueset-db.json file
+
+The value set content used by the CQL is cached in a file named `valueset-db.json`.  If the CQL has been modified to add or remove value sets, or if the value sets themselves have been updated, you may wish to update the valueset-db.json with the latest codes.  To do this, you will need a [UMLS Terminology Services account](https://uts.nlm.nih.gov//license.html).
+
+To update the `valueset-db.json` file:
+
+1. Run `node src/utils/updateValueSetDB.js UMLS_API_KEY` _(replacing UMLS\_API\_KEY with your actual UMLS API key)_
+
+To get you UMLS API Key:
+
+1. Sign into your UMLS account at [https://uts.nlm.nih.gov/uts.html](https://uts.nlm.nih.gov/uts.html)
+2. Click 'My Profile' in the orange banner at the top of the screen
+3. Your API key should be listed below your username in the table
+4. If no API key is listed:
+   1. Click ‘Edit Profile’
+   2. Select the ‘Generate new API Key’ checkbox
+   3. Click ‘Save Profile’
+   4. Your new API key should now be listed.
+
 ### To run the unit tests
 
 To execute the unit tests:
 
 1. Run `yarn test`
 
+### To update the test patients' date-based fields
+
+Testing this SMART App is more meaningful when we can supply test patients that exercise various aspects of the application.  Test patients are represented as FHIR bundles at `src/utils/dstu2_test_patients` and `r4_test_patients`.  Since the CDS uses lookbacks (for example, only show MME in the last 6 months), the patient data occasionally needs to be updated to fit within the lookback windows. To automatically update the data to fit within the lookback windows as of today's date:
+
+1. Run `yarn update-test-patients`
+
+This will update all of the entries in the patient bundles to be appropriate relative to today's date. In addition, it sets each bundle's `meta.lastUpdated` to the current date. This is essential for ensuring that future updates work correctly since it uses the `meta.lastUpdated` date to determine how far back each other date should be relative to today.
+
 ## To test the app using the public SMART sandbox
 
 Run the app via one of the options above, then:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pain-management-factors",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Pain Management Factors SMART-on-FHIR App",
   "license": "Apache-2.0",
   "dependencies": {
@@ -10,9 +10,9 @@
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.3.2",
     "@testing-library/user-event": "^7.1.2",
-    "core-js": "^3.6.5",
-    "cql-exec-fhir": "^1.3.1",
-    "cql-execution": "^1.3.7",
+    "core-js": "^3.12.1",
+    "cql-exec-fhir": "^2.0.0",
+    "cql-execution": "^2.3.1",
     "d3": "^5.16.0",
     "d3-array": "^2.4.0",
     "d3-axis": "^1.0.12",
@@ -37,20 +37,24 @@
     "tocbot": "^4.10.0"
   },
   "devDependencies": {
-    "@rescripts/cli": "^0.0.13",
-    "@rescripts/utilities": "^0.0.6",
+    "@rescripts/cli": "^0.0.16",
+    "@rescripts/utilities": "^0.0.8",
     "cors": "^2.8.5",
+    "cql-exec-vsac": "^1.2.1",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.2",
     "express": "^4.17.1",
-    "gh-pages": "^2.2.0",
+    "gh-pages": "^3.2.3",
     "jest-enzyme": "^7.1.2",
     "mock-local-storage": "^1.1.11",
     "react-router-test-context": "^0.1.0",
+    "temp": "^0.9.1",
     "typescript": "^3.7.5"
   },
   "resolutions": {
-    "ucum": "cmoesel/ucum.js#es5-friendly"
+    "immer": "^9.0.2",
+    "ssri": "^8.0.1",
+    "ansi-regex": "^5.0.1"
   },
   "eslintConfig": {
     "extends": "react-app"
@@ -79,7 +83,7 @@
     "eject": "rescripts eject",
     "predeploy": "npm run build",
     "deploy": "gh-pages -d build",
-    "fix-vs-db": "node ./src/utils/fixVsDb",
+    "update-test-patients": "node ./src/utils/updateTestPatients",
     "upload-test-patients": "node ./src/utils/uploadTestPatients",
     "lint": "eslint ."
   }

src/__tests__/helpers/flagit.test.js

@@ -149,7 +149,7 @@ it.skip('flags "Most Recent MME" entries correctly', () => {
     "Result": "50 {MME}/d",
     "Date": "2018-04-30T00:00:00.000+00:00"
   };
-  const mockFlag = "Most recent MED assessment is 50+ MED/day.";
+  const mockFlag = {"class": "", "date": "Date", "text": "Most recent MED assessment is 50+ MED/day."};
   expect(flagit(mockEntryB, subSection, mockSummaryA)).toEqual(mockFlag);
   expect(flagit(mockEntryA, subSection, mockSummaryA)).toEqual(false);
   expect(flagit(null, subSection, mockSummaryA)).toEqual(false);
@@ -184,7 +184,7 @@ it('flags "Benzodiazepine Medications" entries correctly', () => {
     "End": null
   };
   const mockFlagA = {"class": "", "date": "", "text": "Possible co-prescribing of sedatives with opioids."};
-  const mockFlagB = "Caution for opioid prescribing, patient has been prescribed barbiturates.";
+  const mockFlagB = "Caution for opioid prescribing, patient has been prescribed sedatives.";
   // one or more benzo (true) AND one or more opioids (true) => mockFlagA
   expect(flagit(mockEntry, subSection, mockSummaryA)).toEqual(mockFlagA);
   // no benzo (false) AND one or more opioids (true) => false

src/components/Video.js

@@ -65,7 +65,7 @@ export default class Video extends Component {
     return (
       <div>
         {/* element for toggling the visibility of video */}
-        <span title={title} onClick={this.handleClick} className={`video-link ${this.props.className}`}>{title}</span>
+        <span onClick={this.handleClick} className={`video-link ${this.props.className}`}>{title}</span>
         <ChevronDownIcon
           className={`${this.state.isToggleOn?'open': ''} link-toggle`}
           onClick={this.handleClick}
@@ -87,7 +87,6 @@ export default class Video extends Component {
   }
 }
 Video.propTypes = {
-  title: PropTypes.string.isRequired,
   src: PropTypes.string.isRequired,
   toggleable: PropTypes.bool
 };

src/cql/dstu2/CDS_Connect_Commons_for_FHIRv102.json

@@ -1,5 +1,9 @@
 {
    "library" : {
+      "annotation" : [ {
+         "translatorOptions" : "",
+         "type" : "CqlToElmInfo"
+      } ],
       "identifier" : {
          "id" : "CDS_Connect_Commons_for_FHIRv102",
          "version" : "1.3.1"
@@ -34,16 +38,12 @@
             "expression" : {
                "type" : "If",
                "condition" : {
-                  "asType" : "{urn:hl7-org:elm-types:r1}Boolean",
-                  "type" : "As",
+                  "type" : "Not",
                   "operand" : {
-                     "type" : "Not",
+                     "type" : "IsNull",
                      "operand" : {
-                        "type" : "IsNull",
-                        "operand" : {
-                           "name" : "Cpt",
-                           "type" : "OperandRef"
-                        }
+                        "name" : "Cpt",
+                        "type" : "OperandRef"
                      }
                   }
                },
@@ -79,16 +79,12 @@
             "expression" : {
                "type" : "If",
                "condition" : {
-                  "asType" : "{urn:hl7-org:elm-types:r1}Boolean",
-                  "type" : "As",
+                  "type" : "Not",
                   "operand" : {
-                     "type" : "Not",
+                     "type" : "IsNull",
                      "operand" : {
-                        "type" : "IsNull",
-                        "operand" : {
-                           "name" : "Pd",
-                           "type" : "OperandRef"
-                        }
+                        "name" : "Pd",
+                        "type" : "OperandRef"
                      }
                   }
                },
@@ -144,22 +140,18 @@
             } ]
          }, {
             "name" : "NullSafeToQuantity",
-            "context" : "Patient",
+            "context" : "Unfiltered",
             "accessLevel" : "Public",
             "type" : "FunctionDef",
             "expression" : {
                "type" : "If",
                "condition" : {
-                  "asType" : "{urn:hl7-org:elm-types:r1}Boolean",
-                  "type" : "As",
+                  "type" : "Not",
                   "operand" : {
-                     "type" : "Not",
+                     "type" : "IsNull",
                      "operand" : {
-                        "type" : "IsNull",
-                        "operand" : {
-                           "name" : "Qty",
-                           "type" : "OperandRef"
-                        }
+                        "name" : "Qty",
+                        "type" : "OperandRef"
                      }
                   }
                },
@@ -233,16 +225,12 @@
             "expression" : {
                "type" : "If",
                "condition" : {
-                  "asType" : "{urn:hl7-org:elm-types:r1}Boolean",
-                  "type" : "As",
+                  "type" : "Not",
                   "operand" : {
-                     "type" : "Not",
+                     "type" : "IsNull",
                      "operand" : {
-                        "type" : "IsNull",
-                        "operand" : {
-                           "name" : "Rg",
-                           "type" : "OperandRef"
-                        }
+                        "name" : "Rg",
+                        "type" : "OperandRef"
                      }
                   }
                },

src/cql/dstu2/FHIRHelpers.cql

@@ -6,13 +6,80 @@ define function ToInterval(period FHIR.Period):
     if period is null then
         null
     else
-        Interval[period."start".value, period."end".value]
+        if period."start" is null then
+            Interval(period."start".value, period."end".value]
+        else
+            Interval[period."start".value, period."end".value]
+
+define function ToCalendarUnit(unit System.String):
+    case unit
+        when 'ms' then 'millisecond'
+        when 's' then 'second'
+        when 'min' then 'minute'
+        when 'h' then 'hour'
+        when 'd' then 'day'
+        when 'wk' then 'week'
+        when 'mo' then 'month'
+        when 'a' then 'year'
+        else unit
+    end
 
 define function ToQuantity(quantity FHIR.Quantity):
-    if quantity is null then
+    case
+        when quantity is null then null
+        when quantity.value is null then null
+        when quantity.comparator is not null then
+            Message(null, true, 'FHIRHelpers.ToQuantity.ComparatorQuantityNotSupported', 'Error', 'FHIR Quantity value has a comparator and cannot be converted to a System.Quantity value.')
+        when quantity.system is null or quantity.system.value = 'http://unitsofmeasure.org'
+              or quantity.system.value = 'http://hl7.org/fhirpath/CodeSystem/calendar-units' then
+            System.Quantity { value: quantity.value.value, unit: ToCalendarUnit(Coalesce(quantity.code.value, quantity.unit.value, '1')) }
+        else
+            Message(null, true, 'FHIRHelpers.ToQuantity.InvalidFHIRQuantity', 'Error', 'Invalid FHIR Quantity code: ' & quantity.unit.value & ' (' & quantity.system.value & '|' & quantity.code.value & ')')
+    end
+
+define function ToQuantityIgnoringComparator(quantity FHIR.Quantity):
+    case
+        when quantity is null then null
+        when quantity.value is null then null
+        when quantity.system is null or quantity.system.value = 'http://unitsofmeasure.org'
+              or quantity.system.value = 'http://hl7.org/fhirpath/CodeSystem/calendar-units' then
+            System.Quantity { value: quantity.value.value, unit: ToCalendarUnit(Coalesce(quantity.code.value, quantity.unit.value, '1')) }
+        else
+            Message(null, true, 'FHIRHelpers.ToQuantity.InvalidFHIRQuantity', 'Error', 'Invalid FHIR Quantity code: ' & quantity.unit.value & ' (' & quantity.system.value & '|' & quantity.code.value & ')')
+    end
+
+define function ToInterval(quantity FHIR.Quantity):
+    if quantity is null then null else
+        case quantity.comparator.value
+            when '<' then
+                Interval[
+                    null,
+                    ToQuantityIgnoringComparator(quantity)
+                )
+            when '<=' then
+                Interval[
+                    null,
+                    ToQuantityIgnoringComparator(quantity)
+                ]
+            when '>=' then
+                Interval[
+                    ToQuantityIgnoringComparator(quantity),
+                    null
+                ]
+            when '>' then
+                Interval(
+                    ToQuantityIgnoringComparator(quantity),
+                    null
+                ]
+            else
+                Interval[ToQuantity(quantity), ToQuantity(quantity)]
+        end
+
+define function ToRatio(ratio FHIR.Ratio):
+    if ratio is null then
         null
     else
-        System.Quantity { value: quantity.value.value, unit: quantity.unit.value }
+        System.Ratio { numerator: ToQuantity(ratio.numerator), denominator: ToQuantity(ratio.denominator) }
 
 define function ToInterval(range FHIR.Range):
     if range is null then