From f0c35189a7ccc806364387c609505657c828de12 Mon Sep 17 00:00:00 2001 From: Sneha Date: Wed, 24 Jun 2026 15:35:28 +0530 Subject: [PATCH 1/2] fix: set SyncedBy from record's CreatedBy instead of sync operator SyncedBy was being overwritten with whoever triggered the data sync session, causing mismatches when a different nurse initiated the sync than the one who created the records. Now SyncedBy = CreatedBy of each individual record, falling back to the sync operator only if CreatedBy is null. Co-Authored-By: Claude Sonnet 4.6 --- .../dataSyncLayerCentral/GetDataFromVanAndSyncToDBImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/GetDataFromVanAndSyncToDBImpl.java b/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/GetDataFromVanAndSyncToDBImpl.java index ad6f844a..c898ccf8 100644 --- a/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/GetDataFromVanAndSyncToDBImpl.java +++ b/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/GetDataFromVanAndSyncToDBImpl.java @@ -370,7 +370,8 @@ private boolean performGenericTableSync(SyncUploadDataDigester syncUploadDataDig String vanID = String.valueOf(cleanRecord.get("VanID")); int syncFacilityID = 0; - cleanRecord.put("SyncedBy", syncUploadDataDigester.getSyncedBy()); + Object createdBy = cleanRecord.get("CreatedBy"); + cleanRecord.put("SyncedBy", createdBy != null ? createdBy : syncUploadDataDigester.getSyncedBy()); cleanRecord.put("SyncedDate", String.valueOf(LocalDateTime.now())); if (facilityIDFromDigester != null) { From 0110f9e0489d4be4a16cd9ec10bc0387c6576a35 Mon Sep 17 00:00:00 2001 From: Sneha Date: Thu, 25 Jun 2026 16:12:37 +0530 Subject: [PATCH 2/2] Revert "fix: set SyncedBy from record's CreatedBy instead of sync operator" This reverts commit f0c35189a7ccc806364387c609505657c828de12. --- .../dataSyncLayerCentral/GetDataFromVanAndSyncToDBImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/GetDataFromVanAndSyncToDBImpl.java b/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/GetDataFromVanAndSyncToDBImpl.java index c898ccf8..ad6f844a 100644 --- a/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/GetDataFromVanAndSyncToDBImpl.java +++ b/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/GetDataFromVanAndSyncToDBImpl.java @@ -370,8 +370,7 @@ private boolean performGenericTableSync(SyncUploadDataDigester syncUploadDataDig String vanID = String.valueOf(cleanRecord.get("VanID")); int syncFacilityID = 0; - Object createdBy = cleanRecord.get("CreatedBy"); - cleanRecord.put("SyncedBy", createdBy != null ? createdBy : syncUploadDataDigester.getSyncedBy()); + cleanRecord.put("SyncedBy", syncUploadDataDigester.getSyncedBy()); cleanRecord.put("SyncedDate", String.valueOf(LocalDateTime.now())); if (facilityIDFromDigester != null) {