Merge pull request #85 from ravishanigarapu/develop

AMM-1225 Query change required for different demographic details

Author: helenKaryamsetty

.github/workflows/package.yml

@@ -42,7 +42,7 @@ jobs:
       run: mvn -B package --file pom.xml
 
     - name: Upload WAR file as artifact
-      uses: actions/upload-artifact@v3 
+      uses: actions/upload-artifact@v4 
       with:
         name: Identity-API
         path: target/identity-0.0.1.war  

src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java

@@ -122,6 +122,19 @@ Long getBeneficiaryCountsByVillageIDAndLastModifyDate(@Param("villageIDs") List<
 			@Param("lastModDate") Timestamp lastModifiedDate);
 
 
-	@Query("SELECT t FROM MBeneficiarymapping t WHERE t.vanSerialNo =:vanSerialNo AND t.vanID=:vanID")
+	//@Query("SELECT t FROM MBeneficiarymapping t WHERE t.vanSerialNo =:vanSerialNo AND t.vanID=:vanID")
+	@Query(value = "select bm FROM  MBeneficiarymapping bm "
+			+"LEFT JOIN MBeneficiaryregidmapping brm ON brm.benRegId=bm.benRegId and brm.vanID=bm.vanID "
+			+"LEFT JOIN MBeneficiarycontact bc ON bc.vanSerialNo = bm.benContactsId and bm.vanID=bc.vanID "
+			+"LEFT JOIN MBeneficiarydetail bd on bm.benDetailsId = bd.vanSerialNo and bm.vanID=bd.vanID "
+			+"LEFT JOIN MBeneficiaryaddress ba ON ba.vanSerialNo = bm.benAddressId and bm.vanID=ba.vanID "
+			+"LEFT JOIN MBeneficiaryconsent bt on bt.vanSerialNo=bm.benConsentId and bm.vanID=bt.vanID "
+			//+"LEFT JOIN MBensecurestack bs on bs.benSecureStackId=bm.benSecureStackId and bm.vanID=bs.vanID "
+			+"LEFT JOIN MBeneficiaryImage bi on bi.vanSerialNo=bm.benImageId and bm.vanID=bi.vanID "
+			+"LEFT JOIN MBeneficiaryAccount bac on bac.vanSerialNo=bm.benAccountID and bm.vanID=bac.vanID "
+			+"LEFT JOIN MBeneficiaryidentity bid on bid.vanSerialNo=bm.benMapId and bm.vanID=bid.vanID "
+			+"LEFT JOIN MBeneficiaryfamilymapping bfm on bfm.vanSerialNo=bm.benMapId and bm.vanID=bfm.vanID "
+			+"LEFT JOIN MBeneficiaryservicemapping bsm on bsm.vanSerialNo=bm.benMapId and bm.vanID=bsm.vanID "
+			+"where bm.vanSerialNo=:vanSerialNo and bm.vanID=:vanID")
 	MBeneficiarymapping getMapping(@Param("vanSerialNo") BigInteger vanSerialNo,@Param("vanID") Integer vanID);
 }

src/main/java/com/iemr/common/identity/service/IdentityService.java

@@ -95,6 +95,7 @@
 import jakarta.persistence.NoResultException;
 import jakarta.persistence.QueryTimeoutException;
 
+
 @Service
 public class IdentityService {
 	private static final Logger logger = LoggerFactory.getLogger(IdentityService.class);
@@ -578,7 +579,8 @@ private MBeneficiarymapping getBeneficiariesDTONew(Object[] benMapArr) {
 			benMapOBJ.setCreatedBy(String.valueOf(benMapArr[10]));
 			benMapOBJ.setCreatedDate((Timestamp) benMapArr[11]);
 			benMapOBJ = mappingRepo.getMapping(getBigIntegerValueFromObject(benMapArr[9]), (Integer) benMapArr[8]);
- 
+		
+			
 
 			BigInteger benRegId = new BigInteger(benMapArr[5].toString());
 			RMNCHBeneficiaryDetailsRmnch obj = rMNCHBeneficiaryDetailsRmnchRepo