From 61bccfadcd7e4f080476d62dec069d1d396a81f9 Mon Sep 17 00:00:00 2001
From: Ken Chapple <ken.chapple@gmail.com>
Date: Wed, 13 Jul 2011 07:08:46 -0700
Subject: [PATCH] fixed NFQ 0041 flu season date range

---
 library/classes/ClinicalTypes/Encounter.php                   | 6 +++++-
 library/classes/rulesets/Cqm/reports/NFQ_0041/Denominator.php | 7 ++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/library/classes/ClinicalTypes/Encounter.php b/library/classes/ClinicalTypes/Encounter.php
index 8038f71c2..2d71bbc9f 100644
--- a/library/classes/ClinicalTypes/Encounter.php
+++ b/library/classes/ClinicalTypes/Encounter.php
@@ -71,7 +71,11 @@ class Encounter extends ClinicalType
     {
         $encounters = getEncounters( $patient->id, $beginMeasurement, $endMeasurement, $this->getOptionId() );
         ( empty($encounters) ) ? $totalNumberAppt = 0 : $totalNumberAppt = count( $encounters );
-        if ( $totalNumberAppt < $options[self::OPTION_ENCOUNTER_COUNT] ) {
+        $requiredCount = 1;
+        if ( isset( $options[self::OPTION_ENCOUNTER_COUNT]  ) ) {
+            $requiredCount = $options[self::OPTION_ENCOUNTER_COUNT];
+        }
+        if ( $totalNumberAppt < $requiredCount ) {
             return false;
         } else {
             return true;
diff --git a/library/classes/rulesets/Cqm/reports/NFQ_0041/Denominator.php b/library/classes/rulesets/Cqm/reports/NFQ_0041/Denominator.php
index 5f9cd39a3..edffa8fcc 100644
--- a/library/classes/rulesets/Cqm/reports/NFQ_0041/Denominator.php
+++ b/library/classes/rulesets/Cqm/reports/NFQ_0041/Denominator.php
@@ -15,9 +15,10 @@ class NFQ_0041_Denominator implements CqmFilterIF
     
     public function test( CqmPatient $patient, $beginDate, $endDate )
     {
-        $periodPlus58Days = date( 'Y-m-d 00:00:00', strtotime( '+58 day', strtotime( $endDate ) ) );
-        $periodMinus122Days = date( 'Y-m-d 00:00:00', strtotime( '-122 day', strtotime( $beginDate ) ) );
-        if ( Helper::checkEncounter( Encounter::ENC_INFLUENZA, $patient, $periodMinus122Days, $periodPlus58Days ) ) {
+        $periodPlus58Days = date( 'Y-m-d 00:00:00', strtotime( '+58 day', strtotime( $beginDate ) ) );
+        $periodMinus122Days = date( 'Y-m-d 00:00:00', strtotime( '-122 day', strtotime( $endDate ) ) );
+        if ( Helper::checkEncounter( Encounter::ENC_INFLUENZA, $patient, $beginDate, $periodPlus58Days ) || 
+            Helper::checkEncounter( Encounter::ENC_INFLUENZA, $patient, $periodMinus122Days, $endDate ) ) {
             return true;
         }
         
-- 
2.11.4.GIT