Heart failure tracking panel & New York Heart Association Functional Classification panel incorrectly marked as Lab Panels in FHIR output

[shabiel]

What happened?

Heart failure tracking panel

Sample default FHIR (R4) output that is wrong:

    "fullUrl": "urn:uuid:de3b7eef-fa5c-0a97-025c-1d736ecf8e27",
    "resource": {
      "resourceType": "DiagnosticReport",
      "id": "de3b7eef-fa5c-0a97-025c-1d736ecf8e27",
      "meta": {
        "profile": [ "http://hl7.org/fhir/us/core/StructureDefinition/us-core-diagnosticreport-lab" ]
      },     
      "status": "final",
      "category": [ {
        "coding": [ {
          "system": "http://terminology.hl7.org/CodeSystem/v2-0074",
          "code": "LAB", 
          "display": "Laboratory"
        } ]    
      } ],   
      "code": {
        "coding": [ {
          "system": "http://loinc.org",
          "code": "55405-5",
          "display": "Heart failure tracking panel"
        } ],   
        "text": "Heart failure tracking panel"
      },     

Looking at the FHIR R4 spec, it seems this is the correct page: https://www.hl7.org/fhir/R4/valueset-diagnostic-service-sections.html and the correct classification for this (and the associated tests, which are also incorrectly marked as "Laboratory") is CUS: Cardiac Ultrasound. This is the modality that would give you an Ejection Fraction.

New York Heart Association Functional Classification

This one is also currently classed as a lab, but it's not a procedure with a result. It's just a clinician's assessment. So it's closer to a Depression Screening than it is to a lab. Some searching on the internet suggests it may belong to this category: http://hl7.org/fhir/R4/riskassessment.html

Environment

Relevant log output