adjust encounter and general-consent relation

internal/domain/main-entities/encounter/entity.go

@@ -10,6 +10,7 @@ import (
 	eem "simrs-vx/internal/domain/main-entities/emergency"
 	ee "simrs-vx/internal/domain/main-entities/employee"
 	eed "simrs-vx/internal/domain/main-entities/encounter-document"
+	egc "simrs-vx/internal/domain/main-entities/general-consent"
 	eip "simrs-vx/internal/domain/main-entities/inpatient"
 	ei "simrs-vx/internal/domain/main-entities/insurance-company"
 	eir "simrs-vx/internal/domain/main-entities/internal-reference"
@@ -72,6 +73,7 @@ type Encounter struct {
 	Rehab                     *er.Basic                `json:"rehab,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
 	RehabChildren             *[]er.Basic              `json:"rehabChildren,omitempty" gorm:"foreignKey:Parent_Encounter_Id;references:Id"`
 	EncounterDocuments        *[]eed.EncounterDocument `json:"encounterDocuments,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
+	GeneralConsents           *[]egc.GeneralConsent    `json:"generalConsents,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
 }
 
 func (d Encounter) IsDone() bool {

internal/domain/main-entities/general-consent/entity.go

@@ -2,13 +2,11 @@ package general_consent
 
 import (
 	"simrs-vx/internal/domain/base-entities/core"
-	ee "simrs-vx/internal/domain/main-entities/encounter"
 )
 
 type GeneralConsent struct {
 	core.Main
-	Encounter_Id *uint         `json:"encounter_id" gorm:"not null"`
-	Encounter    *ee.Encounter `json:"encounter,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
-	Value        *string       `json:"value"`
-	FileUrl      *string       `json:"fileUrl" gorm:"size:1024"`
+	Encounter_Id *uint   `json:"encounter_id" gorm:"not null"`
+	Value        *string `json:"value"`
+	FileUrl      *string `json:"fileUrl" gorm:"size:1024"`
 }