Filters modified for Problem & Health Concern

- Filter warning specific to resource type

src/app/components/resources/resources-table-container/resources-table-container.component.ts

@@ -226,12 +226,12 @@ export class ResourcesTableContainerComponent implements OnInit, OnDestroy {
     if (!this.useSpecificDateParam && !!startDate)
     {
       if (!dateParams) dateParams = {};
-      dateParams['$ge'] = startDate;
+      dateParams['$gt'] = startDate;
     }
     if (!this.useSpecificDateParam && !!endDate)
     {
       if (!dateParams) dateParams = {};
-      dateParams['$le'] = endDate;
+      dateParams['$lt'] = endDate;
     }
 
     if (!!dateParams)

src/app/components/resources/resources-table/resources-table.component.html

@@ -3,7 +3,7 @@
     <mat-list *ngIf="bundle">
       <div>Total Number of resources on the Server:{{bundle.total}}</div>
       <div *ngIf="bundle.entry">Number of resources returned by the Query:{{bundle.entry.length}}</div>
-      <div *ngIf="note">{{note}}</div>
+      <div *ngIf="note" [innerHTML]="note"></div>
       <div *ngFor="let entry of bundle.entry">
         <div *ngIf="entry.resource.resourceType !== 'OperationOutcome'">
           <mat-list-item>

src/app/data/ccds-resource-filters.ts

@@ -4,12 +4,13 @@ import { ResourceFilter } from '../models/ccds-resource-filter';
 export class ProblemFilter implements ResourceFilter {
     static filterOptions = [
         {
-            System: 'http://hl7.org/fhir/condition-clinical',
-            Code: 'problem',
+            System: 'http://hl7.org/fhir/condition-category',
+            Code: 'problem-list-item',
         },
     ];
 
-    FilterNote = 'The result set has been filtered to show items relevant to the selected CCDS type.';
+    FilterNote = 'The result set has been filtered to show items relevant to the selected CCDS type.<br>'
+        + 'Filter used: http://hl7.org/fhir/condition-category|problem-list-item';
 
     Filter(singleResourceEntry: any): boolean {
         let found = false;
@@ -36,7 +37,8 @@ export class HealthConcernFilter implements ResourceFilter {
         },
     ];
 
-    FilterNote = 'The result set has been filtered to show items relevant to the selected CCDS type.';
+    FilterNote = 'The result set has been filtered to show items relevant to the selected CCDS type.<br>'
+        + 'Filter used: http://hl7.org/fhir/us/core/codesystem/condition-category|health-concern';
 
     Filter(singleResourceEntry: any): boolean {
         let found = false;
@@ -65,7 +67,8 @@ export class MedicationAllergyFilter implements ResourceFilter {
 
     static urlAllergy = 'https://fhir.chbase.com/fhir/stu3/structureddefinition/allergy';
 
-    FilterNote = 'The result set has been filtered to show items relevant to the selected CCDS type.';
+    FilterNote = 'The result set has been filtered to show items relevant to the selected CCDS type.<br>'
+        + 'Filter used: allergentype = "med"';
 
     Filter(singleResourceEntry: any): boolean {
         let found = false;