LNK-4424: Encounter Creation and Test Data fix (#1234)

* Update index.mdx

* Update Program.cs

* LNK-4421: fix multiple instance running job factory

* Update JobFactory.cs

* Update Program.cs

* LNK-4424: Fix logging messages and test data

* fix logging messages and introduce encounter creation for discharge only records earlier so that correlation id is better tracked.
* fix confusing logging messages

* Update Program.cs

* Update PatientListService.cs

Author: edward-miller-lcg

DotNet/Census/Application/Services/PatientListService.cs

@@ -82,7 +82,6 @@ public async Task<List<IBaseResponse>> ProcessList(string facilityId, PatientLis
                 var existingEvent =
                     await _patientEventQueries.GetLatestEventByFacilityAndPatientId(facilityId, patientId,
                         cancellationToken);
-                string sharedCorrelationId = existingEvent?.CorrelationId ?? Guid.NewGuid().ToString();
 
                 bool shouldSkip = false;
                 if (existingEvent != null)
@@ -91,11 +90,13 @@ await _patientEventQueries.GetLatestEventByFacilityAndPatientId(facilityId, pati
                     if (skipProcessing.result)
                     {
                         _logger.LogInformation(
-                            "Skipping processing for patient {PatientId} in facility {FacilityId}. " +
-                            "Reason: Admit event processing is planned for future implementation. " +
-                            "Event type: {EventType}, List type: {ListType}",
-                            patientId, facilityId, "Admit", list.ListType);
-
+                            "{SkipMessage} PatientId: {PatientId}, FacilityId: {FacilityId}, EventType: {EventType}, ListType: {ListType}",
+                            skipProcessing.message,
+                            patientId,
+                            facilityId,
+                            "Admit",
+                            list.ListType);
+                           
                         shouldSkip = true; // Mark for skipping but don't continue yet
                     }
                 }
@@ -105,6 +106,11 @@ await _patientEventQueries.GetLatestEventByFacilityAndPatientId(facilityId, pati
                     continue; // Skip processing for this patient
                 }
 
+                var sharedCorrelationId = existingEvent != null 
+                    && existingEvent.EventType == EventType.FHIRListDischarge 
+                    && list.ListType == ListType.Admit
+                    ? Guid.NewGuid().ToString() : (existingEvent?.CorrelationId ?? Guid.NewGuid().ToString());
+
                 await EnsureAdmitEventExists(facilityId, patientId, sharedCorrelationId, list.ListType,
                     existingEvent,
                     cancellationToken);
@@ -185,13 +191,25 @@ private async Task EnsureAdmitEventExists(string facilityId, string patientId, s
         if (existingEvent == null && listType == ListType.Discharge)
         {
             //create and add an admit event
-            var admitEvent =
-                new FHIRListAdmitPayload(patientId, DateTime.UtcNow).CreatePatientEvent(facilityId, correlationId);
+            var payload = new FHIRListAdmitPayload(patientId, DateTime.UtcNow);
+            var admitEvent = payload.CreatePatientEvent(facilityId, correlationId);
+
             try
             {
                 await _patientEventManager.AddPatientEvent(admitEvent, cancellationToken);
                 _logger.LogInformation("Added admit event for patient {patientId} in facility {facilityId}", patientId,
                     facilityId);
+
+                PatientEncounter encounter =
+                        await _patientEncounterQueries.GetPatientEncounterByCorrelationIdAsync(correlationId,
+                            cancellationToken);
+
+                if (encounter == null)
+                {
+                    var patientEncounter = payload.CreatePatientEncounter(facilityId, correlationId);
+                    encounter = await _patientEncounterManager.AddPatientEncounterAsync(patientEncounter,
+                        cancellationToken);
+                }
             }
             catch (Exception ex)
             {
@@ -238,7 +256,7 @@ public async Task<List<IBaseResponse>> ProcessLists(string facilityId, List<Pati
         }
 
         List<IBaseResponse> messages = new List<IBaseResponse>();
-        foreach (var list in lists)
+        foreach (var list in lists.OrderBy(x => x.ListType))
         {
             messages.AddRange(await ProcessList(facilityId, list, cancellationToken));
         }

DotNet/Census/Program.cs

@@ -211,6 +211,7 @@ static void RegisterServices(WebApplicationBuilder builder)
         q.UseMicrosoftDependencyInjectionJobFactory();
     });
 
+    builder.Services.AddSingleton<IJobFactory, JobFactory>();
     builder.Services.AddTransient<SchedulePatientListRetrieval>();
     builder.Services.AddTransient<RetryJob>();
 

Tests/BackendE2ETests/fhir_server_data/20250527_STU3_AdhocSmokeTestList_Discharge_Between24To48Hrs.json

@@ -36,6 +36,12 @@
               "reference": "Patient/CYUcGIlSrpJxCBMeEml30YSmE0Ea7loNBPVZfhCUkv7A3",
               "display": "Caleb058 Ryan027 Vasquez055"
             }
+          },
+          {
+            "item": {
+              "reference": "Patient/9i6Xi6uG2WjuGxHTmpbin4ct2ZwevRwTWhIkJkRjVFZ4C",
+              "display": "Chloe017 Matthew058 Martinez091"
+            }
           }
         ]
       }

Tests/BackendE2ETests/fhir_server_data/20250527_STU3_AdhocSmokeTestList_Discharge_LessThan24Hrs.json

@@ -36,6 +36,12 @@
               "reference": "Patient/x25sJU80vVa51mxJ6vSDcjbNC3BcdCQujJbXQwqdppFOO",
               "display": "Robert091 Veronica020 Price042"
             }
+          },
+          {
+            "item": {
+              "reference": "Patient/jbbPDJeGWyEyudcf6EBKTgmeCLxB7jTgu5Ugm27JAO494",
+              "display": "William037 Robert002 Tapia002"
+            }
           }
         ]
       }