From e7b921c50cd17095898ba1606e884d2d25c12548 Mon Sep 17 00:00:00 2001 From: Vanitha Date: Fri, 30 May 2025 20:53:44 +0530 Subject: [PATCH 1/2] Add language id on beneficiary details to retrieve the language --- .../identity/service/IdentityService.java | 45 ++++++++++--------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/iemr/common/identity/service/IdentityService.java b/src/main/java/com/iemr/common/identity/service/IdentityService.java index 21bfbc50..a16d9e20 100644 --- a/src/main/java/com/iemr/common/identity/service/IdentityService.java +++ b/src/main/java/com/iemr/common/identity/service/IdentityService.java @@ -1044,34 +1044,34 @@ private MBeneficiarydetail convertIdentityEditDTOToMBeneficiarydetail(IdentityEd ArrayDeque queue = new ArrayDeque<>(); - public BeneficiaryCreateResp createIdentity(IdentityDTO identity) { + public BeneficiaryCreateResp createIdentity(IdentityDTO identity) { logger.info("IdentityService.createIdentity - start"); - List list = null; - MBeneficiaryregidmapping regMap = null; - synchronized (queue) { - if (queue.isEmpty()) { - logger.info("fetching 10000 rows"); - list = regIdRepo.findTop10000ByProvisionedAndReserved(false, false); - logger.info("Adding SynchronousQueue start-- "); - for (MBeneficiaryregidmapping map : list) { - queue.add(map); + List list = null; + MBeneficiaryregidmapping regMap = null; + synchronized (queue) { + if (queue.isEmpty()) { + logger.info("fetching 10000 rows"); + list = regIdRepo.findTop10000ByProvisionedAndReserved(false, false); + logger.info("Adding SynchronousQueue start-- "); + for (MBeneficiaryregidmapping map : list) { + queue.add(map); + } + logger.info("Adding SynchronousQueue end-- "); } - logger.info("Adding SynchronousQueue end-- "); + regMap = queue.removeFirst(); + } + regMap.setReserved(true); + if (regMap.getCreatedDate() == null) { + SimpleDateFormat sdf = new SimpleDateFormat(CREATED_DATE_FORMAT); + String dateToStoreInDataBase = sdf.format(new Date()); + Timestamp ts = Timestamp.valueOf(dateToStoreInDataBase); + regMap.setCreatedDate(ts); } - regMap = queue.removeFirst(); - } - regMap.setReserved(true); - if (regMap.getCreatedDate() == null) { - SimpleDateFormat sdf = new SimpleDateFormat(CREATED_DATE_FORMAT); - String dateToStoreInDataBase = sdf.format(new Date()); - Timestamp ts = Timestamp.valueOf(dateToStoreInDataBase); - regMap.setCreatedDate(ts); - } - regIdRepo.save(regMap); + regIdRepo.save(regMap); - regMap.setProvisioned(true); + regMap.setProvisioned(true); logger.info("IdentityService.createIdentity - saving Address"); ObjectMapper objectMapper = new ObjectMapper(); @@ -1332,6 +1332,7 @@ private MBeneficiarydetail convertIdentityDTOToMBeneficiarydetail(IdentityDTO dt beneficiarydetail.setOccupationId(dto.getOccupationId()); beneficiarydetail.setPhcId(dto.getPhcId()); beneficiarydetail.setPlaceOfWork(dto.getPlaceOfWork()); + beneficiarydetail.setPreferredLanguageId(dto.getPreferredLanguageId()); beneficiarydetail.setPreferredLanguage(dto.getPreferredLanguage()); beneficiarydetail.setReligion(dto.getReligion()); if (dto.getFaceEmbedding() != null) From 9f4a7b2bb504d9e7cc8dbeaddb3e54d42b9e4fd1 Mon Sep 17 00:00:00 2001 From: Vanitha Date: Fri, 30 May 2025 20:59:35 +0530 Subject: [PATCH 2/2] Fix the alignment --- .../java/com/iemr/common/identity/service/IdentityService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/common/identity/service/IdentityService.java b/src/main/java/com/iemr/common/identity/service/IdentityService.java index a16d9e20..14582773 100644 --- a/src/main/java/com/iemr/common/identity/service/IdentityService.java +++ b/src/main/java/com/iemr/common/identity/service/IdentityService.java @@ -1044,7 +1044,7 @@ private MBeneficiarydetail convertIdentityEditDTOToMBeneficiarydetail(IdentityEd ArrayDeque queue = new ArrayDeque<>(); - public BeneficiaryCreateResp createIdentity(IdentityDTO identity) { + public BeneficiaryCreateResp createIdentity(IdentityDTO identity) { logger.info("IdentityService.createIdentity - start"); List list = null;