Merge pull request #1357 from hiqedme/surge_fix

added week fix
AMPATH · Jan 11, 2024 · ac65d79 · ac65d79
2 parents d9a4883 + 9b90798
commit ac65d79
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/service/surge-reports/surge-report.service.js b/service/surge-reports/surge-report.service.js
@@ -163,7 +163,14 @@ export class SurgeService extends SurgeMultiDatasetPatientlistReport {
 
   determineSurgeReportSourceTables(yearWeek) {
     const self = this;
-    if (yearWeek >= moment().year() + '' + moment().week() - 1) {
+    var currentYear = moment().year();
+    var currentWeek = moment().week() - 1;
+    if (currentWeek < 10) {
+      currentWeek = '0' + currentWeek;
+    }
+
+    const diffWeek = currentYear + '' + currentWeek;
+    if (yearWeek >= diffWeek) {
       return (self.params.surgeWeeklyDatasetSource =
         'etl.surge_weekly_report_dataset_2022');
     } else {