From a70d9a216ce59d5cef380104c5cd543cd39cbb1a Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Mon, 4 Nov 2024 20:47:31 +0530 Subject: [PATCH 1/3] missed file --- .../common/repo/customization/SectionAndFieldsMappingRepo.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/iemr/common/repo/customization/SectionAndFieldsMappingRepo.java b/src/main/java/com/iemr/common/repo/customization/SectionAndFieldsMappingRepo.java index 038e34ef..e58f220b 100644 --- a/src/main/java/com/iemr/common/repo/customization/SectionAndFieldsMappingRepo.java +++ b/src/main/java/com/iemr/common/repo/customization/SectionAndFieldsMappingRepo.java @@ -16,8 +16,7 @@ public interface SectionAndFieldsMappingRepo extends CrudRepository findBySectionIdAndSectionNameAndServiceProviderId( // @Param("sectionId") Integer sectionId, @Param("serviceProviderId") Integer serviceProviderId); - - @Query("SELECT sfm FROM SectionAndFieldsMapping sfm WHERE sfm.fieldName = :fieldName AND (sfm.serviceProviderId = :serviceProviderId OR sfm.serviceProviderId = 0) AND (sfm.projectId = :projectId OR sfm.projectId = 0)") + @Query("SELECT sfm FROM SectionAndFieldsMapping sfm WHERE sfm.sectionId = :sectionId AND (sfm.serviceProviderId = :serviceProviderId OR sfm.serviceProviderId= 0) AND (sfm.projectId = :projectId OR sfm.projectId= 0)") List findSectionIdAndSectionNameAndServiceProviderId( @Param("sectionId") Integer sectionId, @Param("serviceProviderId") Integer serviceProviderId, @Param("projectId") Integer projectId); From 76f1d39c256b5f5bf112872d9189deb42985929f Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Mon, 18 Nov 2024 10:01:44 +0530 Subject: [PATCH 2/3] FieldName Patching --- .../java/com/iemr/common/dto/identity/BeneficiariesDTO.java | 2 +- .../java/com/iemr/common/dto/identity/IdentityEditDTO.java | 1 + .../com/iemr/common/model/beneficiary/BeneficiaryModel.java | 3 ++- .../common/service/beneficiary/IEMRSearchUserServiceImpl.java | 2 ++ .../service/beneficiary/RegisterBenificiaryServiceImpl.java | 1 + 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/iemr/common/dto/identity/BeneficiariesDTO.java b/src/main/java/com/iemr/common/dto/identity/BeneficiariesDTO.java index 18c498c4..c2aeef35 100644 --- a/src/main/java/com/iemr/common/dto/identity/BeneficiariesDTO.java +++ b/src/main/java/com/iemr/common/dto/identity/BeneficiariesDTO.java @@ -78,7 +78,7 @@ public class BeneficiariesDTO { private String otherFields; private String genderName; private String maritalStatusName; - + private String community; // End Outreach // Start 1097 diff --git a/src/main/java/com/iemr/common/dto/identity/IdentityEditDTO.java b/src/main/java/com/iemr/common/dto/identity/IdentityEditDTO.java index e0ddde39..44cd0a88 100644 --- a/src/main/java/com/iemr/common/dto/identity/IdentityEditDTO.java +++ b/src/main/java/com/iemr/common/dto/identity/IdentityEditDTO.java @@ -168,4 +168,5 @@ public class IdentityEditDTO { private boolean emergencyRegistration; private String otherFields; // private Object otherFields; + private String communityName; } diff --git a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java index 800db14e..45064f55 100644 --- a/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java +++ b/src/main/java/com/iemr/common/model/beneficiary/BeneficiaryModel.java @@ -280,7 +280,8 @@ public class BeneficiaryModel implements Comparable { private String monthlyFamilyIncome; @Expose private boolean emergencyRegistration; - + @Expose + private String communityName; @Expose private Boolean passToNurse = false; private String otherFields; diff --git a/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java index ba0b1872..2936dac0 100644 --- a/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java +++ b/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java @@ -372,6 +372,8 @@ public List getBeneficiaryListFromMapper(List { BeneficiaryModel beneficiary = benCompleteMapper.benDetailForOutboundDTOToIBeneficiary(beneficiaryModel); + if(null != beneficiaryModel.getBeneficiaryDetails().getCommunity()) + beneficiary.setCommunityName(beneficiaryModel.getBeneficiaryDetails().getCommunity()); if (beneficiary.getAge() == null) { beneficiary.setAge(beneficiary.getActualAge()); } diff --git a/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java index 06f67a61..1580a4c8 100644 --- a/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java +++ b/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java @@ -114,6 +114,7 @@ public Integer updateBenificiary(BeneficiaryModel benificiaryDetails, String aut Integer updatedRows = 0; IdentityEditDTO identityEditDTO = identityBenEditMapper.BenToIdentityEditMapper(benificiaryDetails); + identityEditDTO.setCommunity(benificiaryDetails.getI_bendemographics().getCommunityName()); if (benificiaryDetails.getBeneficiaryIdentities() != null && benificiaryDetails.getBeneficiaryIdentities().size() > 0) { identityEditDTO.setIdentities(Identity.createIdentity(benificiaryDetails.getBeneficiaryIdentities(), From 01e98714014fc9151d994c603ebb6db8836fb960 Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Mon, 18 Nov 2024 10:21:40 +0530 Subject: [PATCH 3/3] Null Conditions added --- .../common/service/beneficiary/IEMRSearchUserServiceImpl.java | 2 +- .../service/beneficiary/RegisterBenificiaryServiceImpl.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java index 2936dac0..8432d7e7 100644 --- a/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java +++ b/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java @@ -372,7 +372,7 @@ public List getBeneficiaryListFromMapper(List { BeneficiaryModel beneficiary = benCompleteMapper.benDetailForOutboundDTOToIBeneficiary(beneficiaryModel); - if(null != beneficiaryModel.getBeneficiaryDetails().getCommunity()) + if(null != beneficiaryModel.getBeneficiaryDetails() && null != beneficiaryModel.getBeneficiaryDetails().getCommunity()) beneficiary.setCommunityName(beneficiaryModel.getBeneficiaryDetails().getCommunity()); if (beneficiary.getAge() == null) { beneficiary.setAge(beneficiary.getActualAge()); diff --git a/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java index 1580a4c8..e591d1f6 100644 --- a/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java +++ b/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java @@ -114,7 +114,8 @@ public Integer updateBenificiary(BeneficiaryModel benificiaryDetails, String aut Integer updatedRows = 0; IdentityEditDTO identityEditDTO = identityBenEditMapper.BenToIdentityEditMapper(benificiaryDetails); - identityEditDTO.setCommunity(benificiaryDetails.getI_bendemographics().getCommunityName()); + if(null != benificiaryDetails.getI_bendemographics()) + identityEditDTO.setCommunity(benificiaryDetails.getI_bendemographics().getCommunityName()); if (benificiaryDetails.getBeneficiaryIdentities() != null && benificiaryDetails.getBeneficiaryIdentities().size() > 0) { identityEditDTO.setIdentities(Identity.createIdentity(benificiaryDetails.getBeneficiaryIdentities(),