AMM-514 : 1097- Moving back to previous page take more time and image

PSMRI · Aug 12, 2024 · 18185c4 · 18185c4
1 parent f6394a7
commit 18185c4
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 22 deletions.
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBeneficiaryDetailsRmnch.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBeneficiaryDetailsRmnch.java
@@ -54,7 +54,7 @@ public class RMNCHBeneficiaryDetailsRmnch {
 
 	@Expose
 	@Column(name = "BeneficiaryRegID")
-	private Long BenRegId;
+	private BigInteger BenRegId;
 
 	@Expose
 	@Column(name = "aadhaNo")

diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBornBirthDetails.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBornBirthDetails.java
@@ -54,7 +54,7 @@ public class RMNCHBornBirthDetails {
 
 	@Expose
 	@Column(name = "BeneficiaryRegID")
-	private Long BenRegId;
+	private BigInteger BenRegId;
 
 	@Expose
 	@Column(name = "beneficiaryId")

diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHCBACdetails.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHCBACdetails.java
@@ -53,7 +53,7 @@ public class RMNCHCBACdetails {
 
 	@Expose
 	@Column(name = "BeneficiaryRegId")
-	private Long BenRegId;
+	private BigInteger BenRegId;
 
 	@Expose
 	@Column(name = "cbac_age")

diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiarymapping.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiarymapping.java
@@ -92,7 +92,7 @@ public class RMNCHMBeneficiarymapping implements Serializable {
 	private BigInteger benAccountID;
 
 	@Column(name = "BenRegId")
-	private Long benRegId;
+	private BigInteger benRegId;
 
 	@Expose
 	@Column(name = "vanID")

diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenDetailsRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenDetailsRepo.java
@@ -38,5 +38,5 @@ public RMNCHMBeneficiarydetail getByIdAndVanID(@Param("vanSerialNo") BigInteger
 
 	@Query(" SELECT t FROM RMNCHMBeneficiarydetail t WHERE t.id = " +
 			"(SELECT m.benDetailsId from RMNCHMBeneficiarymapping m where m.benRegId = :beneficiaryRegID)")
-	public RMNCHMBeneficiarydetail getByBenRegID(@Param("beneficiaryRegID") Long beneficiaryRegID);
+	public RMNCHMBeneficiarydetail getByBenRegID(@Param("beneficiaryRegID") BigInteger beneficiaryRegID);
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBeneficiaryDetailsRmnchRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBeneficiaryDetailsRmnchRepo.java
@@ -37,5 +37,5 @@ public RMNCHBeneficiaryDetailsRmnch getByIdAndVanID(@Param("vanSerialNo") BigInt
 			@Param("vanID") int vanID);
 
 	@Query(" SELECT t FROM RMNCHBeneficiaryDetailsRmnch t WHERE t.BenRegId =:benRegID ")
-	public RMNCHBeneficiaryDetailsRmnch getByRegID(@Param("benRegID") Long benRegId);
+	public RMNCHBeneficiaryDetailsRmnch getByRegID(@Param("benRegID") BigInteger benRegId);
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBornBirthDetailsRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBornBirthDetailsRepo.java
@@ -36,5 +36,5 @@ public interface RMNCHBornBirthDetailsRepo extends CrudRepository<RMNCHBornBirth
 	public RMNCHBornBirthDetails getByIdAndVanID(@Param("vanSerialNo") Long vanSerialNo, @Param("vanID") int vanID);
 
 	@Query(" SELECT t FROM RMNCHBornBirthDetails t WHERE t.BenRegId =:benRegID ")
-	public RMNCHBornBirthDetails getByRegID(@Param("benRegID") Long benRegID);
+	public RMNCHBornBirthDetails getByRegID(@Param("benRegID") BigInteger benRegID);
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHCBACDetailsRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHCBACDetailsRepo.java
@@ -37,7 +37,7 @@ public interface RMNCHCBACDetailsRepo extends CrudRepository<RMNCHCBACdetails, L
 	public RMNCHCBACdetails getByIdAndVanID(@Param("vanSerialNo") Long vanSerialNo, @Param("vanID") int vanID);
 
 	@Query(" SELECT t FROM RMNCHCBACdetails t WHERE t.BenRegId =:benRegID")
-	public RMNCHCBACdetails getByRegID(@Param("benRegID") Long benRegID);
+	public RMNCHCBACdetails getByRegID(@Param("benRegID") BigInteger benRegID);
 
 	@Query(value = "select beneficiary_visit_code,visit_category from db_iemr.i_ben_flow_outreach where beneficiary_reg_id=:benRegID AND beneficiary_visit_code is not null AND visit_category is not null order by created_date desc limit 1", nativeQuery = true)
 	public List<Object[]> getVisitDetailsbyRegID(@Param("benRegID") Long benRegID);

diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHMBenRegIdMapRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHMBenRegIdMapRepo.java
@@ -50,5 +50,5 @@ public int updateProviderServiceMapID(@Param("benRegID") BigInteger benRegID,
 			@Param("providerServiceMapID") int providerServiceMapID);
 
 	@Query(" SELECT t.benRegId FROM RMNCHMBeneficiaryregidmapping t  WHERE t.beneficiaryID = :benID ")
-	public Long getRegID(@Param("benID") BigInteger benID);
+	public BigInteger getRegID(@Param("benID") BigInteger benID);
 }
diff --git a/src/main/java/com/iemr/common/identity/service/IdentityService.java b/src/main/java/com/iemr/common/identity/service/IdentityService.java
@@ -584,7 +584,7 @@ private MBeneficiarymapping getBeneficiariesDTONew(Object[] benMapArr) {
 			benMapOBJ = mappingRepo.getMapping(getBigIntegerValueFromObject(benMapArr[9]), (Integer) benMapArr[8]);
 
 			RMNCHBeneficiaryDetailsRmnch obj = rMNCHBeneficiaryDetailsRmnchRepo
-					.getByRegID(((BigInteger) benMapArr[5]).longValue());
+					.getByRegID(((BigInteger) benMapArr[5]));
 			if (obj != null) {
 				if (obj.getHouseoldId() != null)
 					benMapOBJ.setHouseHoldID(obj.getHouseoldId());

diff --git a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
@@ -132,7 +132,7 @@ public String syncDataToAmrit(String requestOBJ) throws Exception {
 				// other tables data saving
 				// ben details RMNCH extra fields details
 
-				Long benRegID = null;
+				BigInteger benRegID = null;
 
 				if (jsnOBJ != null && jsnOBJ.has("beneficiaryDetails")) {
 					RMNCHBeneficiaryDetailsRmnch[] objArr = InputMapper.gson()

diff --git a/src/test/java/com/iemr/common/identity/service/IdentityServiceTest.java b/src/test/java/com/iemr/common/identity/service/IdentityServiceTest.java
@@ -251,7 +251,7 @@ void getBeneficiariesTest() throws NoResultException, QueryTimeoutException, Exc
 		rmnchBenDetails.setRchid("7");
 		rmnchBenDetails.toString();
 
-		when(rMNCHBeneficiaryDetailsRmnchRepo.getByRegID(new Long( elements[5].toString())))
+		when(rMNCHBeneficiaryDetailsRmnchRepo.getByRegID(new BigInteger( elements[5].toString())))
 				.thenReturn(rmnchBenDetails);
 		MBeneficiaryaddress beneficiaryaddress1 = new MBeneficiaryaddress();
 		beneficiaryaddress1.setCreatedBy(null);

diff --git a/src/test/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImplTest.java b/src/test/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImplTest.java
@@ -161,12 +161,12 @@ void testSyncDataToAmrit() throws Exception {
 		when(rMNCHHouseHoldDetailsRepo.getByHouseHoldID(Long.valueOf(987))).thenReturn(rMNCHHouseHoldDetails);
 		when(rMNCHCBACDetailsRepo.saveAll(anyList())).thenReturn(rMNCHCBACdetailslist);
 		when(rMNCHCBACDetailsRepo.getByRegID(any())).thenReturn(rMNCHCBACdetails);
-		when(rMNCHMBenRegIdMapRepo.getRegID(any())).thenReturn(Long.valueOf(987));
+		when(rMNCHMBenRegIdMapRepo.getRegID(any())).thenReturn(BigInteger.valueOf(987));
 		when(rMNCHBornBirthDetailsRepo.saveAll(anyList())).thenReturn(rMNCHBornBirthDetailslist);
 		when(rMNCHBornBirthDetailsRepo.getByRegID(any())).thenReturn(rMNCHBornBirthDetails);
-		when(rMNCHMBenRegIdMapRepo.getRegID(any())).thenReturn(Long.valueOf(987));
+		when(rMNCHMBenRegIdMapRepo.getRegID(any())).thenReturn(BigInteger.valueOf(987));
 		when(rMNCHBeneficiaryDetailsRmnchRepo.getByRegID(any())).thenReturn(rMNCHBeneficiaryDetailsRmnch);
-		when(rMNCHMBenRegIdMapRepo.getRegID(any())).thenReturn(Long.valueOf(987));
+		when(rMNCHMBenRegIdMapRepo.getRegID(any())).thenReturn(BigInteger.valueOf(987));
 		RMNCHMBeneficiarydetail rmnchBenDetails = new RMNCHMBeneficiarydetail();
 		when(rMNCHBenDetailsRepo.getByBenRegID(any())).thenReturn(rmnchBenDetails);
 
@@ -238,7 +238,7 @@ void testgetBenDataForGeneralOPDCase() throws Exception {
 		m.setBenImageId(BigInteger.valueOf(9));
 		m.setBenAddressId(BigInteger.valueOf(9));
 		m.setBenConsentId(BigInteger.valueOf(9));
-		m.setBenRegId(Long.valueOf(9));
+		m.setBenRegId(BigInteger.valueOf(9));
 		m.toString();
 		RMNCHMBeneficiarydetail benDetailsOBJ = new RMNCHMBeneficiarydetail();
 
@@ -334,7 +334,7 @@ void testgetBenDataForGeneralOPDQCCase() throws Exception {
 		m.setBenImageId(BigInteger.valueOf(9));
 		m.setBenAddressId(BigInteger.valueOf(9));
 		m.setBenConsentId(BigInteger.valueOf(9));
-		m.setBenRegId(Long.valueOf(9));
+		m.setBenRegId(BigInteger.valueOf(9));
 		m.toString();
 		RMNCHMBeneficiarydetail benDetailsOBJ = new RMNCHMBeneficiarydetail();
 		benDetailsOBJ.toString();
@@ -419,7 +419,7 @@ void testgetBenDataForPNCCase() throws Exception {
 		m.setBenImageId(BigInteger.valueOf(9));
 		m.setBenAddressId(BigInteger.valueOf(9));
 		m.setBenConsentId(BigInteger.valueOf(9));
-		m.setBenRegId(Long.valueOf(9));
+		m.setBenRegId(BigInteger.valueOf(9));
 		m.hashCode();
 		m.equals(m);
 		m.toString();
@@ -548,7 +548,7 @@ void testgetBenDataForANCCase() throws Exception {
 		m.setBenImageId(BigInteger.valueOf(9));
 		m.setBenAddressId(BigInteger.valueOf(9));
 		m.setBenConsentId(BigInteger.valueOf(9));
-		m.setBenRegId(Long.valueOf(9));
+		m.setBenRegId(BigInteger.valueOf(9));
 		m.toString();
 		RMNCHMBeneficiarydetail benDetailsOBJ = new RMNCHMBeneficiarydetail();
 		benDetailsOBJ.toString();
@@ -629,7 +629,7 @@ void testgetBenDataForNCDcare() throws Exception {
 		m.setBenImageId(BigInteger.valueOf(9));
 		m.setBenAddressId(BigInteger.valueOf(9));
 		m.setBenConsentId(BigInteger.valueOf(9));
-		m.setBenRegId(Long.valueOf(9));
+		m.setBenRegId(BigInteger.valueOf(9));
 		m.toString();
 		RMNCHMBeneficiarydetail benDetailsOBJ = new RMNCHMBeneficiarydetail();
 
@@ -729,7 +729,7 @@ void testgetBenDataForNCDscreening() throws Exception {
 		m.setBenImageId(BigInteger.valueOf(9));
 		m.setBenAddressId(BigInteger.valueOf(9));
 		m.setBenConsentId(BigInteger.valueOf(9));
-		m.setBenRegId(Long.valueOf(9));
+		m.setBenRegId(BigInteger.valueOf(9));
 		m.toString();
 		RMNCHMBeneficiarydetail benDetailsOBJ = new RMNCHMBeneficiarydetail();
 
@@ -825,7 +825,7 @@ void testgetBenDataForCOVID19Screening() throws Exception {
 		m.setBenImageId(BigInteger.valueOf(9));
 		m.setBenAddressId(BigInteger.valueOf(9));
 		m.setBenConsentId(BigInteger.valueOf(9));
-		m.setBenRegId(Long.valueOf(9));
+		m.setBenRegId(BigInteger.valueOf(9));
 		m.toString();
 		RMNCHMBeneficiarydetail benDetailsOBJ = new RMNCHMBeneficiarydetail();