Merge pull request synthetichealth#1288 from synthetichealth/csv_orde…

…ring CSV sort patient expenses and payer transitions by time.
iaBIH · May 25, 2023 · 9ad8bbb · 9ad8bbb
2 parents 5c87fbc + 9b2f24d
commit 9ad8bbb
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/src/main/java/org/mitre/synthea/export/CSVExporter.java b/src/main/java/org/mitre/synthea/export/CSVExporter.java
@@ -436,9 +436,13 @@ public void exportPayers() throws IOException {
    *
    * @throws IOException if any IO errors occur.
    */
-  private void exportPayerTransitions(Person person, long stopTime) throws IOException {
-    for (PlanRecord planRecord : person.coverage.getPlanHistory()) {
-      if (planRecord.getStartTime() <= stopTime) {
+  private void exportPayerTransitions(Person person, long cutOffTime, long stopTime)
+      throws IOException {
+    List<PlanRecord> sortedPlanRecords = person.coverage.getPlanHistory().stream()
+        .sorted(Comparator.comparingLong(PlanRecord::getStartTime))
+        .collect(Collectors.toList());
+    for (PlanRecord planRecord : sortedPlanRecords) {
+      if ((planRecord.getStartTime() <= stopTime) && (planRecord.getStopTime() >= cutOffTime)) {
         payerTransition(person, planRecord);
       }
     }
@@ -451,9 +455,13 @@ private void exportPayerTransitions(Person person, long stopTime) throws IOExcep
    *
    * @throws IOException if any IO errors occur.
    */
-  private void exportPatientExpenses(Person person, long stopTime) throws IOException {
-    for (PlanRecord planRecord : person.coverage.getPlanHistory()) {
-      if (planRecord.getStartTime() <= stopTime) {
+  private void exportPatientExpenses(Person person, long cutOffTime, long stopTime)
+      throws IOException {
+    List<PlanRecord> sortedPlanRecords = person.coverage.getPlanHistory().stream()
+        .sorted(Comparator.comparingLong(PlanRecord::getStartTime))
+        .collect(Collectors.toList());
+    for (PlanRecord planRecord : sortedPlanRecords) {
+      if ((planRecord.getStartTime() <= stopTime) && (planRecord.getStopTime() >= cutOffTime)) {
         patientExpense(person, planRecord);
       }
     }
@@ -529,14 +537,14 @@ public void export(Person person, long time) throws IOException {
         supply(personID, encounterID, encounter, supply);
       }
     }
-    CSVExporter.getInstance().exportPayerTransitions(person, time);
-    CSVExporter.getInstance().exportPatientExpenses(person, time);
     int yearsOfHistory = Integer.parseInt(Config.get("exporter.years_of_history"));
     Calendar cutOff = new GregorianCalendar(1900, 0, 1);
     if (yearsOfHistory > 0) {
       cutOff = Calendar.getInstance();
       cutOff.set(cutOff.get(Calendar.YEAR) - yearsOfHistory, 0, 1);
     }
+    CSVExporter.getInstance().exportPayerTransitions(person, cutOff.getTimeInMillis(), time);
+    CSVExporter.getInstance().exportPatientExpenses(person, cutOff.getTimeInMillis(), time);
     Calendar now = Calendar.getInstance();
     Calendar birthDay = Calendar.getInstance();
     birthDay.setTimeInMillis((long) person.attributes.get(Person.BIRTHDATE));