Merge pull request #362 from DBCG/feature-report-add-patient-resource

Feature report add patient resource
cqframework · Oct 24, 2021 · 016d9da · 016d9da
2 parents b6381db + ce1515f
commit 016d9da
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/r4/src/main/java/org/opencds/cqf/r4/providers/MeasureOperationsProvider.java b/r4/src/main/java/org/opencds/cqf/r4/providers/MeasureOperationsProvider.java
@@ -737,12 +737,25 @@ public Parameters report(@OperationParam(name = "periodStart", min = 1, max = 1)
         return returnParams;
     }
 
+    private Patient ensurePatient(String patient) {
+        String patientId = patient.replace("Patient/", "");    
+        IFhirResourceDao<Patient> patientDao = this.registry.getResourceDao(Patient.class);
+        Patient patientResource = patientDao.read(new IdType(patientId));
+        if (patientResource == null) {
+            throw new RuntimeException("Could not find Patient: " + patientId);
+        }
+        return patientResource;
+    }
+
     private Parameters.ParametersParameterComponent patientReport(Date periodStart, Date periodEnd, String subject) {
+        final Map<IIdType, IAnyResource> patientResources = new HashMap<>();
+        Patient patient = ensurePatient(subject);
+        patientResources.put(patient.getIdElement(), patient);            
+
         SearchParameterMap theParams = SearchParameterMap.newSynchronous();
         ReferenceParam subjectParam = new ReferenceParam(subject);
         theParams.add("subject", subjectParam);
-        final Map<IIdType, IAnyResource> patientResources = new HashMap<>();
-
+
         Bundle patientReportBundle = new Bundle();
             patientReportBundle.setType(Bundle.BundleType.COLLECTION);
             patientReportBundle.setTimestamp(new Date());