From 714205c68c2676a2602e2d9d74833463b551d634 Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Wed, 18 Dec 2024 10:39:29 +0530 Subject: [PATCH 1/2] AMM-1168 --- src/main/java/com/iemr/mmu/service/anc/ANCServiceImpl.java | 4 ++++ .../dataSyncLayerCentral/DataSyncRepositoryCentral.java | 6 +++--- .../tele_consultation/TeleConsultationServiceImpl.java | 5 ++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/iemr/mmu/service/anc/ANCServiceImpl.java b/src/main/java/com/iemr/mmu/service/anc/ANCServiceImpl.java index af1e5807..d9538b62 100644 --- a/src/main/java/com/iemr/mmu/service/anc/ANCServiceImpl.java +++ b/src/main/java/com/iemr/mmu/service/anc/ANCServiceImpl.java @@ -121,6 +121,10 @@ public void setCommonBenStatusFlowServiceImpl(CommonBenStatusFlowServiceImpl com this.commonBenStatusFlowServiceImpl = commonBenStatusFlowServiceImpl; } */ + @Autowired + public void setTeleConsultationServiceImpl(TeleConsultationServiceImpl teleConsultationServiceImpl) { + this.teleConsultationServiceImpl = teleConsultationServiceImpl; + } @Autowired public void setANCDoctorServiceImpl(ANCDoctorServiceImpl ancDoctorServiceImpl) { this.ancDoctorServiceImpl = ancDoctorServiceImpl; diff --git a/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/DataSyncRepositoryCentral.java b/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/DataSyncRepositoryCentral.java index b2dd2809..6b62af69 100644 --- a/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/DataSyncRepositoryCentral.java +++ b/src/main/java/com/iemr/mmu/service/dataSyncLayerCentral/DataSyncRepositoryCentral.java @@ -168,18 +168,18 @@ public List> getMasterDataFromTable(String schema, String ta if (lastDownloadDate != null) { if (masterType.equalsIgnoreCase("A")) { baseQuery += " SELECT " + columnNames + " FROM " + schema + "." + table - + " WHERE Date(LastModDate) >= ? "; + + " WHERE LastModDate >= ? "; resultSetList = jdbcTemplate.queryForList(baseQuery,lastDownloadDate); } else if (masterType.equalsIgnoreCase("V")) { baseQuery += " SELECT " + columnNames + " FROM " + schema + "." + table - + " WHERE Date(LastModDate) >= ? AND VanID = ? "; + + " WHERE LastModDate >= ? AND VanID = ? "; resultSetList = jdbcTemplate.queryForList(baseQuery,lastDownloadDate,vanID); } else if (masterType.equalsIgnoreCase("P")) { baseQuery += " SELECT " + columnNames + " FROM " + schema + "." + table - + " WHERE Date(LastModDate) >= ? AND ProviderServiceMapID = ? "; + + " WHERE LastModDate >= ? AND ProviderServiceMapID = ? "; resultSetList = jdbcTemplate.queryForList(baseQuery,lastDownloadDate,psmID); } } else { diff --git a/src/main/java/com/iemr/mmu/service/tele_consultation/TeleConsultationServiceImpl.java b/src/main/java/com/iemr/mmu/service/tele_consultation/TeleConsultationServiceImpl.java index 32f56d85..ad330767 100644 --- a/src/main/java/com/iemr/mmu/service/tele_consultation/TeleConsultationServiceImpl.java +++ b/src/main/java/com/iemr/mmu/service/tele_consultation/TeleConsultationServiceImpl.java @@ -69,8 +69,11 @@ public class TeleConsultationServiceImpl implements TeleConsultationService { private TCRequestModelRepo tCRequestModelRepo; @Autowired private BeneficiaryFlowStatusRepo beneficiaryFlowStatusRepo; - @Autowired private CommonDoctorServiceImpl commonDoctorServiceImpl; + @Autowired + public void setCommonDoctorServiceImpl(CommonDoctorServiceImpl commonDoctorServiceImpl) { + this.commonDoctorServiceImpl = commonDoctorServiceImpl; + } public int createTCRequest(TCRequestModel tCRequestModel) { TCRequestModel tCRequestModelRS = tCRequestModelRepo.save(tCRequestModel); From ba1ae50e135896333b078d41a700eae283df2df9 Mon Sep 17 00:00:00 2001 From: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com> Date: Mon, 7 Apr 2025 14:52:15 +0530 Subject: [PATCH 2/2] Update application.properties --- src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index d99551ee..86eee26c 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -48,4 +48,4 @@ logging.path=logs/ logging.file.name=logs/mmu-api.log spring.main.allow-circular-references=true - +spring.main.allow-bean-definition-overriding=true