diff --git a/src/main/java/com/medchart/ehr/mapper/PatientMapper.java b/src/main/java/com/medchart/ehr/mapper/PatientMapper.java
index c1fc72a..cdd9a59 100644
--- a/src/main/java/com/medchart/ehr/mapper/PatientMapper.java
+++ b/src/main/java/com/medchart/ehr/mapper/PatientMapper.java
@@ -15,6 +15,8 @@ public interface PatientMapper {
     @Mapping(target = "createdAt", ignore = true)
     @Mapping(target = "updatedAt", ignore = true)
     @Mapping(target = "version", ignore = true)
+    @Mapping(target = "active", source = "active", defaultValue = "true")
+    @Mapping(target = "deceased", source = "deceased", defaultValue = "false")
     Patient toEntity(PatientDTO dto);
 
     @Mapping(target = "id", ignore = true)