diff --git a/internal/domain/main-entities/control-letter/dto.go b/internal/domain/main-entities/control-letter/dto.go index 4beadd69..c2bab776 100644 --- a/internal/domain/main-entities/control-letter/dto.go +++ b/internal/domain/main-entities/control-letter/dto.go @@ -12,6 +12,7 @@ import ( // internal - domain - main-entities + ed "simrs-vx/internal/domain/main-entities/doctor" ee "simrs-vx/internal/domain/main-entities/encounter" es "simrs-vx/internal/domain/main-entities/specialist" ess "simrs-vx/internal/domain/main-entities/subspecialist" @@ -23,6 +24,7 @@ type CreateDto struct { Unit_Id *uint `json:"unit_id"` Specialist_Id *uint `json:"specialist_id"` Subspecialist_Id *uint `json:"subspecialist_id"` + Doctor_Id *uint `json:"doctor_id"` Date *time.Time `json:"date"` } @@ -37,6 +39,7 @@ type FilterDto struct { Unit_Id *uint `json:"unit-id"` Specialist_Id *uint `json:"specialist-id"` Subspecialist_Id *uint `json:"subspecialist-id"` + Doctor_Id *uint `json:"doctor-id"` Date *time.Time `json:"date"` } @@ -77,6 +80,8 @@ type ResponseDto struct { Specialist *es.Specialist `json:"specialist,omitempty"` Subspecialist_Id *uint `json:"subspecialist_id"` Subspecialist *ess.Subspecialist `json:"subspecialist,omitempty"` + Doctor_Id *uint `json:"doctor_id"` + Doctor *ed.Doctor `json:"doctor,omitempty"` Date *time.Time `json:"date"` } @@ -90,6 +95,8 @@ func (d ControlLetter) ToResponse() ResponseDto { Specialist: d.Specialist, Subspecialist_Id: d.Subspecialist_Id, Subspecialist: d.Subspecialist, + Doctor_Id: d.Doctor_Id, + Doctor: d.Doctor, Date: d.Date, } resp.Main = d.Main diff --git a/internal/use-case/main-use-case/control-letter/helper.go b/internal/use-case/main-use-case/control-letter/helper.go index 9b1d3b23..5cc943c5 100644 --- a/internal/use-case/main-use-case/control-letter/helper.go +++ b/internal/use-case/main-use-case/control-letter/helper.go @@ -21,5 +21,6 @@ func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.ControlLetter) { data.Unit_Id = inputSrc.Unit_Id data.Specialist_Id = inputSrc.Specialist_Id data.Subspecialist_Id = inputSrc.Subspecialist_Id + data.Doctor_Id = inputSrc.Doctor_Id data.Date = inputSrc.Date }