Merge pull request #2 from Manishch22/develop

Updated code for patient resource
tf-govstack · Jan 8, 2024 · 7adf26d · 7adf26d
2 parents 4d9d1d3 + 7b6f975
commit 7adf26d
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/mediator/src/main/java/io/mosip/opencrvs/util/OpencrvsDataUtil.java b/mediator/src/main/java/io/mosip/opencrvs/util/OpencrvsDataUtil.java
@@ -6,6 +6,7 @@
 import io.mosip.kernel.core.util.StringUtils;
 import io.mosip.opencrvs.constant.LoggingConstants;
 import io.mosip.opencrvs.dto.DecryptedEventDto;
+import io.mosip.opencrvs.dto.DecryptedEventDto.Event.Context.Entry.Resource.Identifier;
 import io.mosip.opencrvs.dto.DecryptedEventDto.Event.Context.Entry.Resource.Identifier.Type.Coding;
 import io.mosip.opencrvs.dto.ReceiveDto;
 import io.mosip.opencrvs.error.ErrorCode;
@@ -71,7 +72,7 @@ public ReceiveDto buildIdJson(DecryptedEventDto opencrvsRequestBody){
                     task = entry.resource;
                 } else if(child==null && "Patient".equals(entry.resource.resourceType)){
                     child = entry.resource;
-                } else if(child!=null && "Patient".equals(entry.resource.resourceType)){
+                } else if(child!=null && "Patient".equals(entry.resource.resourceType)&&isPatientMother(entry.resource.identifier)){
                     mother = entry.resource;
                 }
                 if (child!=null && mother!=null && task!=null) break;
@@ -125,6 +126,17 @@ public ReceiveDto buildIdJson(DecryptedEventDto opencrvsRequestBody){
 
         return returner;
     }
+
+    public boolean isPatientMother(List<Identifier> identifier) {
+    	for(Identifier ident : identifier) {
+    		for(Coding coding : ident.type.coding) {
+            	if("NATIONAL_ID".equals(coding.code)){
+                    return true;
+                }
+            }
+    	}
+    	return false;
+    }
 
     public String getOpencrvsBRNFromPatientBody(DecryptedEventDto.Event.Context.Entry.Resource patient){
         for(DecryptedEventDto.Event.Context.Entry.Resource.Identifier identifier : patient.identifier){