Vb/visit

src/main/java/com/iemr/common/identity/controller/IdentityController.java

@@ -593,16 +593,19 @@
 			+ "  \"sexualOrientationType\": \"String\",\r\n" + "  \"vanID\": \"Integer\",\r\n"
 			+ "  \"createdDate\": \"Timestamp\"\r\n" + "  \"faceEmbedding\": [\"Float\"]\r\n" + "}") @RequestBody String identityData) throws IEMRException {
 		logger.info("IdentityController.createIdentity - start");
-
+		System.out.println("[TRACE][Identity-API] /id/create raw request body : " + identityData);
+
 		// Bare Gson matches Common-API's RegisterBenificiaryServiceImpl, which also
 		// serializes the outgoing identity payload with a bare new Gson(). dob relies
 		// on this symmetric default format; gpsTimestamp is still parsed correctly via
 		// its field-level @JsonAdapter(GpsTimestampAdapter.class) on Address, which
 		// works regardless of which Gson instance performs the parse.
 		IdentityDTO identity = new Gson().fromJson(identityData, IdentityDTO.class);
 		logger.info("identity hit: " + identity);
+		System.out.println("[TRACE][Identity-API] /id/create parsed IdentityDTO : " + identity);
 		BeneficiaryCreateResp map;
 		map = svc.createIdentity(identity);
+		System.out.println("[TRACE][Identity-API] /id/create svc.createIdentity result : " + InputMapper.getInstance().gson().toJson(map));
 		String data = InputMapper.getInstance().gson().toJson(map);
 		String response = getSuccessResponseString(data, 200, "success", "createIdentityByAgent");
 

src/main/java/com/iemr/common/identity/controller/rmnch/RMNCHMobileAppController.java

@@ -60,7 +60,9 @@
 		OutputResponse response = new OutputResponse();
 		try {
 			if (requestOBJ != null) {
+				System.out.println("syncDataToAmrit request body : " + requestOBJ);
 				String s = rmnchDataSyncService.syncDataToAmrit(requestOBJ);
+				System.out.println("syncDataToAmrit response body : " + s);
 				response.setResponse(s);
 			} else
 				response.setError(5000, "Invalid/NULL request obj");

src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBeneficiaryDetailsRmnch.java

@@ -532,6 +532,15 @@ public class RMNCHBeneficiaryDetailsRmnch {
 	@Expose
 	private String  otherPlaceOfDeath;
 
+	@Expose
+	private String placeOfCurrentLiving;
+
+	@Expose
+	private String otherPlaceOfCurrentLiving;
+
+	@Expose
+	private String institutionName;
+
 	@Expose
 	private Boolean isSpouseAdded;
 

src/main/java/com/iemr/common/identity/data/rmnch/RMNCHHouseHoldDetails.java

@@ -114,6 +114,23 @@ public class RMNCHHouseHoldDetails {
 	@Column(name = "familyName")
 	private String familyName;
 
+	@Expose
+	@SerializedName(value = "address", alternate = "Address")
+	@Column(name = "address")
+	private String address;
+
+	@Expose
+	@Column(name = "totalHhMembers")
+	private Integer totalHhMembers;
+
+	@Expose
+	@Column(name = "registeredAtCampSite")
+	private String registeredAtCampSite;
+
+	@Expose
+	@Column(name = "registeredAtCampSiteId")
+	private Integer registeredAtCampSiteId;
+
 	@Expose
 	@Column(name = "fuelUsed")
 	private String fuelUsed;
@@ -194,6 +211,7 @@ public class RMNCHHouseHoldDetails {
 	private String other_sourceofDrinkingWater;
 
 	@Expose
+	@SerializedName(value = "pincode", alternate = "Pincode")
 	@Column(name = "pincode")
 	private Integer pincode;
 

src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiarydetail.java

@@ -214,4 +214,13 @@ public class RMNCHMBeneficiarydetail {
 	@Expose
 	@Transient
 	private Integer ProviderServiceMapID;
+
+	@Expose
+	private String placeOfCurrentLiving;
+
+	@Expose
+	private String otherPlaceOfCurrentLiving;
+
+	@Expose
+	private String institutionName;
 }

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

@@ -1492,8 +1492,10 @@
             Timestamp ts = Timestamp.valueOf(dateToStoreInDataBase);
             mDetl.setCreatedDate(ts);
         }
+        System.out.println("[TRACE][Identity-API] before detailRepo.save mDetl.getDob()=" + mDetl.getDob());
         mDetl = detailRepo.save(mDetl);
         logger.info("IdentityService.createIdentity - Details saved - id = " + mDetl.getBeneficiaryDetailsId());
+        System.out.println("[TRACE][Identity-API] after detailRepo.save mDetl.getDob()=" + mDetl.getDob() + " id=" + mDetl.getBeneficiaryDetailsId());
 
         // Update van serial no for data sync
         detailRepo.updateVanSerialNo(mDetl.getBeneficiaryDetailsId());
@@ -1687,6 +1689,7 @@
         }
         beneficiarydetail.setCommunity(dto.getCommunity());
         beneficiarydetail.setCommunityId(dto.getCommunityId());
+        System.out.println("[TRACE][Identity-API] convertIdentityDTOToMBeneficiarydetail dto.getDob()=" + dto.getDob());
         beneficiarydetail.setDob(dto.getDob());
         beneficiarydetail.setEducation(dto.getEducation());
         beneficiarydetail.setEducationId(dto.getEducationId());

src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java

@@ -123,7 +123,7 @@
 	private boolean enforceVanID;
 	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
 	@Override
 	public String syncDataToAmrit(String requestOBJ) throws Exception {
 
 		Map<String, Object> resultMap = new HashMap<String, Object>();
 
@@ -190,6 +190,10 @@
 								obj.setBenRegId(benRegID);
 								// Extract GPS from i_bendemographics
 								JsonObject demog = benGpsMap.get(obj.getBenficieryid());
+								System.out.println("[TRACE][Identity-API] syncDataToAmrit benficieryid=" + obj.getBenficieryid()
+										+ " i_bendemographics.pinCode=" + (demog != null && demog.has("pinCode") && !demog.get("pinCode").isJsonNull()
+												? demog.get("pinCode") : "ABSENT")
+										+ " entity.getPinCode()=" + obj.getPinCode());
 								if (demog != null) {
 									if (demog.has("latitude") && !demog.get("latitude").isJsonNull())
 										obj.setGpsLatitude(demog.get("latitude").getAsDouble());
@@ -243,6 +247,9 @@
 							rmnchmBeneficiarydetail.setGenderId(obj.getGenderId());
 							rmnchmBeneficiarydetail.setMaritalstatus(obj.getMaritalstatus());
 							rmnchmBeneficiarydetail.setMaritalstatusId(obj.getMaritalstatusId());
+							rmnchmBeneficiarydetail.setPlaceOfCurrentLiving(obj.getPlaceOfCurrentLiving());
+							rmnchmBeneficiarydetail.setOtherPlaceOfCurrentLiving(obj.getOtherPlaceOfCurrentLiving());
+							rmnchmBeneficiarydetail.setInstitutionName(obj.getInstitutionName());
 							benDetailsList.add(rmnchmBeneficiarydetail);
 						}
 								}