From 70caef2602f4976c3f4184cd80af369d815619bb Mon Sep 17 00:00:00 2001 From: vanilia Date: Mon, 10 Nov 2025 08:55:01 +0700 Subject: [PATCH 1/2] adjustment new entity --- internal/use-case/main-use-case/ambulatory/helper.go | 1 - internal/use-case/main-use-case/rehab/helper.go | 1 - 2 files changed, 2 deletions(-) diff --git a/internal/use-case/main-use-case/ambulatory/helper.go b/internal/use-case/main-use-case/ambulatory/helper.go index a8a00e0d..912211c0 100644 --- a/internal/use-case/main-use-case/ambulatory/helper.go +++ b/internal/use-case/main-use-case/ambulatory/helper.go @@ -22,7 +22,6 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Ambulatory) { data.Encounter_Id = inputSrc.Encounter_Id data.Class_Code = inputSrc.Class_Code - data.VisitMode_Code = inputSrc.VisitMode_Code } func CheckClassCode(input *string) (ere.AmbulatoryClassCode, error) { diff --git a/internal/use-case/main-use-case/rehab/helper.go b/internal/use-case/main-use-case/rehab/helper.go index 5c06ca0a..c5774400 100644 --- a/internal/use-case/main-use-case/rehab/helper.go +++ b/internal/use-case/main-use-case/rehab/helper.go @@ -18,6 +18,5 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.Rehab) { } data.Encounter_Id = inputSrc.Encounter_Id - data.Doctor_Id = inputSrc.Doctor_Id data.AllocatedVisitCount = inputSrc.AllocatedVisitCount } From f4268efc3fd756f24a44ced90ffe9fa2e8d87e9b Mon Sep 17 00:00:00 2001 From: vanilia Date: Mon, 10 Nov 2025 13:26:13 +0700 Subject: [PATCH 2/2] add encounter document --- .../main-entities/encounter-document/entity.go | 17 +++++++++++++++++ .../domain/main-entities/encounter/entity.go | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 internal/domain/main-entities/encounter-document/entity.go diff --git a/internal/domain/main-entities/encounter-document/entity.go b/internal/domain/main-entities/encounter-document/entity.go new file mode 100644 index 00000000..2aaec209 --- /dev/null +++ b/internal/domain/main-entities/encounter-document/entity.go @@ -0,0 +1,17 @@ +package encounter_document + +import ( + ecore "simrs-vx/internal/domain/base-entities/core" + ee "simrs-vx/internal/domain/main-entities/employee" +) + +type EncounterDocument struct { + ecore.Main + Encounter_Id *uint `json:"encounter_id"` + Name string `json:"name"` + DocumentType string `json:"documentType"` + FilePath *string `json:"filePath"` + FileName *string `json:"fileName"` + Upload_Employee_Id *string `json:"upload_employee_id"` + Upload_Employee *ee.Employee `json:"upload_employee,omitempty" gorm:"foreignKey:Upload_Employee_Id;references:Id"` +} diff --git a/internal/domain/main-entities/encounter/entity.go b/internal/domain/main-entities/encounter/entity.go index bfd70333..b62cd383 100644 --- a/internal/domain/main-entities/encounter/entity.go +++ b/internal/domain/main-entities/encounter/entity.go @@ -9,6 +9,7 @@ import ( ed "simrs-vx/internal/domain/main-entities/doctor" 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" 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" @@ -70,6 +71,7 @@ type Encounter struct { Inpatient *eip.Inpatient `json:"inpatient,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"` 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"` + EncounterDocument *[]eed.EncounterDocument `json:"encounterDocument,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"` } func (d Encounter) IsDone() bool {