diff --git a/internal/domain/main-entities/nurse/dto.go b/internal/domain/main-entities/nurse/dto.go
index 7b7b283c..11047235 100644
--- a/internal/domain/main-entities/nurse/dto.go
+++ b/internal/domain/main-entities/nurse/dto.go
@@ -56,9 +56,9 @@ type ResponseDto struct {
 	Employee_Id *uint        `json:"employee_id"`
 	Employee    *ee.Employee `json:"employee,omitempty"`
 	IHS_Number  *string      `json:"ihs_number"`
-	Unit_Id     *uint16      `json:"unit_id"`
+	Unit_Code   *string      `json:"unit_code"`
 	Unit        *eu.Unit     `json:"unit,omitempty"`
-	Infra_Id    *uint16      `json:"infra_id"`
+	Infra_Code  *string      `json:"infra_code"`
 	Infra       *ei.Infra    `json:"infra,omitempty"`
 }
 
@@ -68,9 +68,9 @@ func (d Nurse) ToResponse() ResponseDto {
 		Employee_Id: d.Employee_Id,
 		Employee:    d.Employee,
 		IHS_Number:  d.IHS_Number,
-		Unit_Id:     d.Unit_Id,
+		Unit_Code:   d.Unit_Code,
 		Unit:        d.Unit,
-		Infra_Id:    d.Infra_Id,
+		Infra_Code:  d.Infra_Code,
 		Infra:       d.Infra,
 	}
 	resp.Main = d.Main
diff --git a/internal/domain/main-entities/nurse/entity.go b/internal/domain/main-entities/nurse/entity.go
index 54f06fd1..cb1df0a8 100644
--- a/internal/domain/main-entities/nurse/entity.go
+++ b/internal/domain/main-entities/nurse/entity.go
@@ -13,10 +13,8 @@ type Nurse struct {
 	Employee_Id *uint        `json:"employee_id"`
 	Employee    *ee.Employee `json:"employee,omitempty" gorm:"foreignKey:Employee_Id;references:Id"`
 	IHS_Number  *string      `json:"ihs_number" gorm:"unique;size:20"`
-	Unit_Id     *uint16      `json:"unit_id"`
 	Unit_Code   *string      `json:"unit_code" gorm:"size:10"`
-	Unit        *eu.Unit     `json:"unit,omitempty" gorm:"foreignKey:Unit_Id;references:Id"`
-	Infra_Id    *uint16      `json:"infra_id"`
+	Unit        *eu.Unit     `json:"unit,omitempty" gorm:"foreignKey:Unit_Code;references:Code"`
 	Infra_Code  *string      `json:"infra_code" gorm:"size:10"`
-	Infra       *ei.Infra    `json:"infra,omitempty" gorm:"foreignKey:Infra_Id;references:Id"`
+	Infra       *ei.Infra    `json:"infra,omitempty" gorm:"foreignKey:Infra_Code;references:Code"`
 }