Merge pull request #160 from PSMRI/sn/3.6.2

Family members list is not displaying properly

Author: snehar-nd

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

@@ -1039,6 +1039,18 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
                 if (benDetails.getOther() != null) {
                     mbDetl.setOther(benDetails.getOther());
                 }
+                if (mbDetl.getOccupationId() == null && benDetails.getOccupationId() != null) {
+                    mbDetl.setOccupationId(benDetails.getOccupationId());
+                }
+                if (mbDetl.getOccupation() == null && benDetails.getOccupation() != null) {
+                    mbDetl.setOccupation(benDetails.getOccupation());
+                }
+                if (mbDetl.getEducationId() == null && benDetails.getEducationId() != null) {
+                    mbDetl.setEducationId(benDetails.getEducationId());
+                }
+                if (mbDetl.getEducation() == null && benDetails.getEducation() != null) {
+                    mbDetl.setEducation(benDetails.getEducation());
+                }
 
                 // Extract and set extra fields
 //				String identityJson = new Gson().toJson(json);

src/main/java/com/iemr/common/identity/service/familyTagging/FamilyTagServiceImpl.java

@@ -306,9 +306,8 @@ public String getFamilyDetailsByBeneficiaryId(String request) throws IEMRExcepti
 	}
 
 	private void addFamilyMembersToList(List<MBeneficiarydetail> list, List<FamilyMembers> responseList) {
-		StringBuilder name = new StringBuilder("");
 		for (MBeneficiarydetail obj : list) {
-			
+			StringBuilder name = new StringBuilder("");
 			FamilyMembers famObj = new FamilyMembers();
 			BigInteger benRegId = benMappingRepo.getBenRegId(obj.getBeneficiaryDetailsId(), obj.getVanID());
 			if (benRegId != null)